millerson.name/gentoo
2
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2025-12-08 00:05:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

x11-themes/qtcurve: Fix build w/ Qt 6.10, raise min Qt6 to >=6.9.0

Browse Source 
See also:
https://invent.kde.org/system/qtcurve/-/merge_requests/3#note_1353344

Closes: https://bugs.gentoo.org/966408
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner 2025-11-24 19:39:40 +01:00
parent 83e478de62
commit 7cef9a585f
No known key found for this signature in database
GPG Key ID: AE591BBC73E4DD5E
2 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
x11-themes/qtcurve/files/qtcurve-1.9.0_p20250314-qt-6.10.patch Normal file
View File

@ -0,0 +1,39 @@
From 5a5566ffdb7c672f73788426aab8a8604ff7dc87 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gmx.de>
Date: Fri, 21 Nov 2025 01:29:26 +0100
Subject: [PATCH] Fix build with qt-6.10
Successfully tested with qt-6.9.3 as well
---
qt6/CMakeLists.txt | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/qt6/CMakeLists.txt b/qt6/CMakeLists.txt
index 27b6bf7e..31f31ba6 100644
--- a/qt6/CMakeLists.txt
+++ b/qt6/CMakeLists.txt
@@ -4,9 +4,9 @@ set(CMAKE_AUTOUIC True)
include(CMakePrintHelpers)
if(QTC_QT6_ENABLE_QTQUICK2)
- set(QTC_QT6_MODULES Core Gui Widgets Svg Quick DBus)
+ set(QTC_QT6_MODULES Core Gui GuiPrivate Widgets WidgetsPrivate Svg Quick DBus)
else()
- set(QTC_QT6_MODULES Core Gui Widgets Svg DBus)
+ set(QTC_QT6_MODULES Core Gui GuiPrivate Widgets WidgetsPrivate Svg DBus)
endif()
if(QTC_QT6_ENABLE_KDE)
list(APPEND QTC_QT6_MODULES PrintSupport)
@@ -18,9 +18,6 @@ set(QTC_QT6_ENABLE_KWIN Off)
find_package(Qt6 REQUIRED COMPONENTS ${QTC_QT6_MODULES})
list(TRANSFORM QTC_QT6_MODULES PREPEND "Qt6::" OUTPUT_VARIABLE QTC_QT6_LINK_LIBS)
-if(QTC_ENABLE_X11)
- list(APPEND QTC_QT6_LINK_LIBS Qt6::CorePrivate)
-endif()
foreach(QtModule ${QTC_QT6_OPT_MODULES})
find_package(Qt6${QtModule})
if(Qt6${QtModule}_FOUND)
--
GitLab

11
x11-themes/qtcurve/qtcurve-1.9.0_p20250314-r1.ebuild → x11-themes/qtcurve/qtcurve-1.9.0_p20250314-r2.ebuild
View File

@ -52,9 +52,9 @@ DEPEND="
X? ( dev-qt/qtx11extras:5 )
)
qt6? (
dev-qt/qtbase:6[dbus,gui,widgets]
dev-qt/qtsvg:6
X? ( dev-qt/qtbase:6=[X] )
>=dev-qt/qtbase-6.9.0:6[dbus,gui,widgets]
>=dev-qt/qtsvg-6.9.0:6
X? ( >=dev-qt/qtbase-6.9.0:6=[X] )
)
X? (
x11-libs/libX11
@ -72,7 +72,10 @@ BDEPEND="
DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
PATCHES=( "${FILESDIR}/${P}-manhandle-cmake.patch" ) # bug 959633
PATCHES=(
"${FILESDIR}/${P}-manhandle-cmake.patch" # bug 959633
"${FILESDIR}/${P}-qt-6.10.patch" # bug 966408
)
src_configure() {
local mycmakeargs=(