[gentoo-commits] repo/gentoo:master commit in: x11-misc/kdocker/files/, x11-misc/kdocker/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/kdocker/files/, x11-misc/kdocker/

[Sam James]

commit:     70dabe22e8a4cc3b12c326620ab1e17a8c6e5330
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Wed Mar 19 10:50:41 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 24 05:58:18 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70dabe22

x11-misc/kdocker: add 6.2, qt6

port qt6/cmake

it works without any custom phase

libXmu and libXpm are no longer required

Closes: https://bugs.gentoo.org/947614
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Closes: https://github.com/gentoo/gentoo/pull/41169
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-misc/kdocker/Manifest                          |  1 +
 x11-misc/kdocker/files/kdocker-6.2-fix_clang.patch | 24 ++++++++++++++++++
 x11-misc/kdocker/kdocker-6.2.ebuild                | 29 ++++++++++++++++++++++
 3 files changed, 54 insertions(+)

diff --git a/x11-misc/kdocker/Manifest b/x11-misc/kdocker/Manifest
index 10ae4225980b..f058f7769a8a 100644
--- a/x11-misc/kdocker/Manifest
+++ b/x11-misc/kdocker/Manifest
@@ -1 +1,2 @@
 DIST KDocker-5.4.tar.gz 181166 BLAKE2B 7a301cd36f73112f5a6df6ce65fc11c30b16089ccec98f46d435694b2bfb373eac11c2ba3be5c4e56a56cec1f5fad9bc17b014e47e55f886f0685b6f11707c51 SHA512 1bc1bc445ccc2406f3fe21deb68d9654b3d384ab88bce4bc49f123c343ece3dcc3dfdc49b796f6ad5251d050e57b4ad13e1900851519b3643263137550f0ccc9
+DIST KDocker-6.2.tar.gz 352810 BLAKE2B d299c71c53a4c519da2ee038878a689bcc074fbf49ad69eda74f38ebd9b7734fa7a8ef9e6cbdbaa20fcce18814d5a397ba0fd2e6bdbf71790271d46603b136d8 SHA512 0e3ef8235e2ecb95bfaec704fb3cc9dfc15be5955ab12155e78128628e00dc3398f179b7e3393b1f0898b3c43d681b1b5bb1828bfc92629136f818773b650caf

diff --git a/x11-misc/kdocker/files/kdocker-6.2-fix_clang.patch b/x11-misc/kdocker/files/kdocker-6.2-fix_clang.patch
new file mode 100644
index 000000000000..84aba1550192
--- /dev/null
+++ b/x11-misc/kdocker/files/kdocker-6.2-fix_clang.patch
@@ -0,0 +1,24 @@
+https://github.com/user-none/KDocker/pull/142.patch
+From 114d1f3ac0f78569c1c0a6e8deac141c0efddff0 Mon Sep 17 00:00:00 2001
+From: Reilly Brogan <reilly@reillybrogan.com>
+Date: Sat, 7 Dec 2024 00:49:16 -0600
+Subject: [PATCH] Fix clang compilation
+
+Signed-off-by: Reilly Brogan <reilly@reillybrogan.com>
+---
+ src/xlibutil.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/xlibutil.cpp b/src/xlibutil.cpp
+index b18f20a..d899bb5 100644
+--- a/src/xlibutil.cpp
++++ b/src/xlibutil.cpp
+@@ -654,7 +654,7 @@ void XLibUtil::raiseWindow(windowid_t window)
+ // found icon.
+ static bool imageMeetsMinimumOpaque(size_t num_opaque, size_t width, size_t height)
+ {
+-    if (static_cast<double>(num_opaque) / static_cast<double>(width * height) > 0.1d)
++    if (static_cast<double>(num_opaque) / static_cast<double>(width * height) > 0.1)
+         return true;
+     return false;
+ }

diff --git a/x11-misc/kdocker/kdocker-6.2.ebuild b/x11-misc/kdocker/kdocker-6.2.ebuild
new file mode 100644
index 000000000000..90e55eb29de1
--- /dev/null
+++ b/x11-misc/kdocker/kdocker-6.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+MY_P=KDocker-${PV}
+DESCRIPTION="Helper to dock any application into the system tray"
+HOMEPAGE="https://github.com/user-none/KDocker"
+SRC_URI="https://github.com/user-none/KDocker/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-qt/qtbase:6[dbus,gui,widgets,X]
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	x11-libs/libxcb
+"
+
+PATCHES=(
+	# Merged. To be removed at next version 6.3.
+	"${FILESDIR}"/${P}-fix_clang.patch
+)

[gentoo-commits] repo/gentoo:master commit in: x11-misc/kdocker/files/, x11-misc/kdocker/

[Andreas Sturmlechner]

commit:     a3976f8b771939a59857f3f6e5f7557aa49cb65f
Author:     Nikos Chantziaras <realnc <AT> gmail <DOT> com>
AuthorDate: Mon Dec 30 14:22:51 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan  1 07:55:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3976f8b

x11-misc/kdocker: fix Qt 5.14 build, EAPI 7

Closes: https://bugs.gentoo.org/703882
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Nikos Chantziaras <realnc <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14181
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 x11-misc/kdocker/files/qt-5.14.patch | 38 ++++++++++++++++++++++++++++++++++++
 x11-misc/kdocker/kdocker-5.2.ebuild  | 18 +++++++----------
 2 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/x11-misc/kdocker/files/qt-5.14.patch b/x11-misc/kdocker/files/qt-5.14.patch
new file mode 100644
index 00000000000..ca1237965aa
--- /dev/null
+++ b/x11-misc/kdocker/files/qt-5.14.patch
@@ -0,0 +1,38 @@
+From 1579ee388749a7b056ccdd8ef2d4deafe21bd3e7 Mon Sep 17 00:00:00 2001
+From: Nikos Chantziaras <realnc@gmail.com>
+Date: Mon, 30 Dec 2019 16:03:16 +0200
+Subject: [PATCH] Fix building with Qt 5.14
+
+Qt 5.14 introduced QActionGroup::ExclusionPolicy::None, but <X.h> defines a
+'None' macro. Work around the resulting mess by temporarily undefining the
+macro.
+---
+ src/trayitem.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/trayitem.h b/src/trayitem.h
+index 7698ea4..4b54cdd 100644
+--- a/src/trayitem.h
++++ b/src/trayitem.h
+@@ -21,6 +21,10 @@
+ #ifndef _TRAYITEM_H
+ #define	_TRAYITEM_H
+ 
++// Qt 5.14 introduced QActionGroup::ExclusionPolicy::None, but <X.h> defines a 'None' macro.
++#pragma push_macro("None")
++#undef None
++
+ #include <QAction>
+ #include <QEvent>
+ #include <QIcon>
+@@ -32,6 +36,10 @@
+ 
+ #include "xlibutil.h"
+ 
++#ifndef None
++#pragma pop_macro("None")
++#endif
++
+ #define DEFAULT_CustomIcon        QString()
+ #define DEFAULT_BalloonTimeout    4000       // 4 seconds
+ #define DEFAULT_SkipTaskbar       false

diff --git a/x11-misc/kdocker/kdocker-5.2.ebuild b/x11-misc/kdocker/kdocker-5.2.ebuild
index 43c6d71eef6..a97ab33e91e 100644
--- a/x11-misc/kdocker/kdocker-5.2.ebuild
+++ b/x11-misc/kdocker/kdocker-5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit bash-completion-r1 gnome2-utils qmake-utils
+inherit bash-completion-r1 qmake-utils xdg
 
 MY_P=KDocker-${PV}
 DESCRIPTION="Helper to dock any application into the system tray"
@@ -29,6 +29,10 @@ RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS BUGS ChangeLog CREDITS README.md TODO )
 
+PATCHES=(
+	"${FILESDIR}"/qt-5.14.patch
+)
+
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
@@ -46,11 +50,3 @@ src_install() {
 	emake INSTALL_ROOT="${D}" install
 	einstalldocs
 }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}