summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gui-apps/qt6ct/files/qt6ct-0.10-qt610.patch20
-rw-r--r--gui-apps/qt6ct/qt6ct-0.10.ebuild4
-rw-r--r--gui-libs/kddockwidgets/kddockwidgets-2.2.5-r1.ebuild (renamed from gui-libs/kddockwidgets/kddockwidgets-2.2.5.ebuild)0
3 files changed, 24 insertions, 0 deletions
diff --git a/gui-apps/qt6ct/files/qt6ct-0.10-qt610.patch b/gui-apps/qt6ct/files/qt6ct-0.10-qt610.patch
new file mode 100644
index 000000000000..2dbebded79ca
--- /dev/null
+++ b/gui-apps/qt6ct/files/qt6ct-0.10-qt610.patch
@@ -0,0 +1,20 @@
+Backport of [1] plus a quick cmake build fix.
+[1] https://www.opencode.net/trialuser/qt6ct/-/commit/2d99bd0881aeac0a0eab9595159009ff750a1889
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,2 +34,5 @@
+ find_package(Qt6 6.2 CONFIG REQUIRED COMPONENTS BuildInternals Core Widgets OPTIONAL_COMPONENTS LinguistTools)
++if (Qt6_VERSION VERSION_GREATER_EQUAL 6.10)
++ find_package(Qt6 6.2 CONFIG REQUIRED COMPONENTS GuiPrivate WidgetsPrivate)
++endif()
+
+--- a/src/qt6ct-qtplugin/qt6ctplatformtheme.h
++++ b/src/qt6ct-qtplugin/qt6ctplatformtheme.h
+@@ -32,3 +32,7 @@
+ #include <qpa/qplatformtheme.h>
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++#include <private/qgenericunixtheme_p.h>
++#else
+ #include <private/qgenericunixthemes_p.h>
++#endif
+ #include <QObject>
diff --git a/gui-apps/qt6ct/qt6ct-0.10.ebuild b/gui-apps/qt6ct/qt6ct-0.10.ebuild
index 6de7bc3e4671..ee2530788e2a 100644
--- a/gui-apps/qt6ct/qt6ct-0.10.ebuild
+++ b/gui-apps/qt6ct/qt6ct-0.10.ebuild
@@ -13,6 +13,10 @@ LICENSE="BSD-2"
SLOT="0"
KEYWORDS="amd64"
+PATCHES=(
+ "${FILESDIR}"/${P}-qt610.patch
+)
+
# uses Qt private APIs wrt :=
# dlopen: qtsvg
DEPEND="
diff --git a/gui-libs/kddockwidgets/kddockwidgets-2.2.5.ebuild b/gui-libs/kddockwidgets/kddockwidgets-2.2.5-r1.ebuild
index 7728edd7b054..7728edd7b054 100644
--- a/gui-libs/kddockwidgets/kddockwidgets-2.2.5.ebuild
+++ b/gui-libs/kddockwidgets/kddockwidgets-2.2.5-r1.ebuild