gentoo auto-resync : 23:08:2024 - 14:56:14

3 files changed, 74 insertions, 4 deletions

diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 017474730a4f..ebe60ab255ca 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,6 +1,7 @@
 AUX phonon-4.11.1-clang-16.patch 1356 BLAKE2B 2adbe00797db0efab8a065c455b8122bea99ffdca9317939c85e54c65cf9292f1de7531bff89fbed227cdab035547680291c6d20d02a374bfe7e28ef9ec9706d SHA512 5ef9e3bcefd607036e47cd6578be5bb98a384bb4cd4820aab90cd7adf1eb0ae54ad001550909a93513e1d622ef4101f95fce733e3fa7a95d5df8454290ef92aa
+AUX phonon-4.12.0-cmake.patch 2806 BLAKE2B 3c71db1e4fd0b74c651ceb52830792f1cb5e9db207b3881cc03614ac2c0e8e8f737e545e17060d2055e19ffb1dd458efac05795d80dc566c96a91d21244d4766 SHA512 0f4d10d14a8a1a3d7259b5719c19820142fcf9e4363187bf08be53d5b15f581a5876962bcea84ea8f1de2d298c1a872d2814f2cce7f82841ae457c7d3171121e
 DIST phonon-4.11.1.tar.xz 314732 BLAKE2B 9be341f8df643b352392a208c7f24d799edcc94146b71c73d93974a7ef02cc75b5baa1e2ddd037e7e2d3afeb52347d96caaa8b3a2319631802261735a3a751df SHA512 858b2b0d7b0336af76d226b30f3acd1914e7297e0879d5a417fa1b87b13c812f9aab7e20adcad33ce1a03624ce78323dd9968b4b277caf85f800ca60aa134f74
 DIST phonon-4.12.0.tar.xz 408996 BLAKE2B 568af4aec5247759e49db2137978b9f1828256f817bcb321f02e69d597d78e97c9ce437e89cd63b5a8b15c312f74ccee11b34270e74be2dc24c2af9ee97490f0 SHA512 0dbd88464985051f4c43e64a4d0b7e2d65e7f6b54fd2bae4ec1790fbdf9f79348aa91d4839c72a4f66297d5a9c7b379cc34923b99b97130a5443e5b2c0cc8a9a
 EBUILD phonon-4.11.1-r2.ebuild 1307 BLAKE2B 69c75e346c77710c52591a8debe93bb09c34217584a520622dbfcfb2b4442b3039f1705ee5550f4b35edef1fc65a33286517deb24373264adceef2d365679ebd SHA512 daae7f938573ea831c299c0ef584ae4526570e64e3cb0790cfc7dae34b364fb4bb72ac0f312d0733fb17de6bcc3f74e3dbd9a08247c5d43e2776bae5deb8ec3b
-EBUILD phonon-4.12.0-r3.ebuild 2303 BLAKE2B 1f76ef8d15ca91067a28ec5bd15d04dd551f5ff87f3b30b3482a1da61a7a986df19d5b45a11714329195cc71e607e665c2a1abf940dd407293dcd93fe411eb0d SHA512 1825f7d8316d5f5d784b9758e8faeef4dac53affc5fa29c289740c0fff61035d1c3934bc432aee473afeb4e954fe2b0c7b8a64fb74f849e19cee07576e5bbb1b
+EBUILD phonon-4.12.0-r3.ebuild 2357 BLAKE2B 89276f8d310c9b482f9f94a26508718efa0799a9fb74b0f727cf945aedca3454077b9d022ef31bc89c497704fb465608cb70e2c6c5dd0841857f0119b261cd6d SHA512 62a1ded9aca0d08eedb9a33f9b6b7ea958eba310abab2f732af262e81f27c80cc37770ff32b20dce03f7823bb3a10bc211cb6623f52229a8dccc165b2185b024
 MISC metadata.xml 463 BLAKE2B 856a539bfa489dac4d6550f9fb4104b419dc6dd12a5d6ec67ac7d9f743fa31d96c3323937558704b7941a914c1ca342b5a6030e9f16b7d84f2339f93d2a1fb9f SHA512 c6aa1e0f8f11e813c228619f9c857bfa3e15d3278a1b5af3910f8f789a7d93f889a9adb9121f19b4b52abbfa0b4a67d89a037679ae0eab00b0db04ed5e16526e
diff --git a/media-libs/phonon/files/phonon-4.12.0-cmake.patch b/media-libs/phonon/files/phonon-4.12.0-cmake.patch
new file mode 100644
index 000000000000..f212567777f1
--- /dev/null
+++ b/media-libs/phonon/files/phonon-4.12.0-cmake.patch
@@ -0,0 +1,69 @@
+From 02bde730f0750ca751da81a7077a0f70bf9dd056 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 22 Aug 2024 21:19:07 +0200
+Subject: [PATCH] Hide QtDesigner cmake finding and workarounds behind existing
+ option
+
+Otherwise, `add_library(Qt::OpenGLWidgets ALIAS Qt6::OpenGLWidgets)` will
+potentially fail even if PHONON_BUILD_DESIGNER_PLUGIN was not requested.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 32 ++++++++++++++++++--------------
+ 1 file changed, 18 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c00760fc..babeb392 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+-project(Phonon VERSION "4.12.0")
++project(Phonon VERSION "4.11.1")
+ 
+ include(FeatureSummary)
+ 
+@@ -116,23 +116,27 @@ foreach(version ${VERSIONS})
+     # https://bugreports.qt.io/browse/QTBUG-114706
+     add_library(Qt::Widgets ALIAS Qt${QT_MAJOR_VERSION}::Widgets)
+ 
+-    # Designer Plugin
+-    find_package(Qt${QT_MAJOR_VERSION}Designer ${REQUIRED_QT_VERSION})
+-    set_package_properties(Qt${QT_MAJOR_VERSION}Designer PROPERTIES
+-        TYPE RECOMMENDED
+-        DESCRIPTION "Needed to build the Qt Designer plugin"
+-        URL "https://www.qt.io/download")
+-    # https://bugreports.qt.io/browse/QTBUG-114706
+-    if(Qt${QT_MAJOR_VERSION}Xml_FOUND)
+-        add_library(Qt::Xml ALIAS Qt${QT_MAJOR_VERSION}::Xml)
++    if(PHONON_BUILD_DESIGNER_PLUGIN)
++        # Designer Plugin
++        find_package(Qt${QT_MAJOR_VERSION}Designer ${REQUIRED_QT_VERSION})
++        set_package_properties(Qt${QT_MAJOR_VERSION}Designer PROPERTIES
++            TYPE RECOMMENDED
++            DESCRIPTION "Needed to build the Qt Designer plugin"
++            URL "https://www.qt.io/download")
++        # https://bugreports.qt.io/browse/QTBUG-114706
++        if(Qt${QT_MAJOR_VERSION}Xml_FOUND)
++            add_library(Qt::Xml ALIAS Qt${QT_MAJOR_VERSION}::Xml)
++        endif()
++        if(QT_MAJOR_VERSION STREQUAL "6")
++            # Qt6Designer links to OpenGLWidgets but doesnt find it
++            find_package(Qt6OpenGLWidgets ${REQUIRED_QT_VERSION})
++            # https://bugreports.qt.io/browse/QTBUG-114706
++            add_library(Qt::OpenGLWidgets ALIAS Qt6::OpenGLWidgets)
++        endif()
+     endif()
+ 
+     if(QT_MAJOR_VERSION STREQUAL "6")
+         find_package(Qt6Core5Compat REQUIRED)
+-        # Qt6Designer links to OpenGLWidgets but doesnt find it
+-        find_package(Qt6OpenGLWidgets ${REQUIRED_QT_VERSION})
+-        # https://bugreports.qt.io/browse/QTBUG-114706
+-        add_library(Qt::OpenGLWidgets ALIAS Qt6::OpenGLWidgets)
+     endif()
+ 
+     set(BUILDSYSTEM_INSTALL_DIR ${CMAKE_INSTALL_FULL_DATAROOTDIR}/${PHONON_LIB_SONAME}/buildsystem/)
+-- 
+2.46.0
+
diff --git a/media-libs/phonon/phonon-4.12.0-r3.ebuild b/media-libs/phonon/phonon-4.12.0-r3.ebuild
index 5ccc7cf1b081..545735c83895 100644
--- a/media-libs/phonon/phonon-4.12.0-r3.ebuild
+++ b/media-libs/phonon/phonon-4.12.0-r3.ebuild
@@ -49,9 +49,9 @@ BDEPEND="
 	qt5? ( dev-qt/linguist-tools:5 )
 	qt6? ( dev-qt/qttools:6[linguist] )
 "
-PDEPEND="
-	!minimal? ( >=media-libs/phonon-vlc-0.12.0[qt5?,qt6?] )
-"
+PDEPEND="!minimal? ( >=media-libs/phonon-vlc-0.12.0[qt5?,qt6?] )"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # bug 938315
 
 pkg_setup() {
 	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )