diff --git a/gui-libs/kddockwidgets/files/kddockwidgets-2.2.5-qt610.patch b/gui-libs/kddockwidgets/files/kddockwidgets-2.2.5-qt610.patch new file mode 100644 index 0000000000000..5ce0e595a0c52 --- /dev/null +++ b/gui-libs/kddockwidgets/files/kddockwidgets-2.2.5-qt610.patch @@ -0,0 +1,14 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -184,2 +184,5 @@ + find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONENTS Widgets) ++ if (Qt${QT_VERSION_MAJOR}_VERSION VERSION_GREATER_EQUAL 6.10) ++ find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONENTS WidgetsPrivate) ++ endif() + set(KDDW_FRONTEND_QTWIDGETS ON) +@@ -189,2 +192,5 @@ + find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONENTS Quick QuickControls2) ++ if (Qt${QT_VERSION_MAJOR}_VERSION VERSION_GREATER_EQUAL 6.10) ++ find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONENTS QuickPrivate) ++ endif() + set(KDDW_FRONTEND_QTQUICK ON) diff --git a/gui-libs/kddockwidgets/kddockwidgets-2.2.5-r1.ebuild b/gui-libs/kddockwidgets/kddockwidgets-2.2.5-r1.ebuild index 7728edd7b0544..0eb37b9e96185 100644 --- a/gui-libs/kddockwidgets/kddockwidgets-2.2.5-r1.ebuild +++ b/gui-libs/kddockwidgets/kddockwidgets-2.2.5-r1.ebuild @@ -17,9 +17,10 @@ IUSE="qml" # building tests require developer mode which is messy to enable here RESTRICT="test" +# uses Qt private APIs wrt := RDEPEND=" - dev-qt/qtbase:6[widgets] - qml? ( dev-qt/qtdeclarative:6 ) + dev-qt/qtbase:6=[widgets] + qml? ( dev-qt/qtdeclarative:6= ) " DEPEND=" ${DEPEND} @@ -28,6 +29,7 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-2.2.1-include-paths.patch + "${FILESDIR}"/${PN}-2.2.5-qt610.patch ) src_configure() { @@ -45,5 +47,6 @@ src_configure() { src_install() { cmake_src_install - rm -r -- "${ED}"/usr/share/doc/${P}-qt6 || die + # only has licenses and duplicate files + rm -r -- "${ED}"/usr/share/doc/${PF}-qt6 || die }