gentoo auto-resync : 08:02:2024 - 15:59:10

3 files changed, 52 insertions, 4 deletions

diff --git a/app-misc/ddcui/Manifest b/app-misc/ddcui/Manifest
index eca4e4d58101..7813958cc509 100644
--- a/app-misc/ddcui/Manifest
+++ b/app-misc/ddcui/Manifest
@@ -1,12 +1,13 @@
 AUX ddcui-0.2.1-build.patch 639 BLAKE2B 0485050d4e57aff2261b210e55b96baaeb3271060ccc05a0f88aed2c678c99c8b4e0485153e924b3dcc0f8a2faabf0991bac4b698f66f6547f925189ff85344a SHA512 cb4d61500c083ed18cb5264e02997fc88416baea7676a92f1aedaa400007aaa7931993ec32a8b1baa7fd9bb552553a4dbc77393c2501fbe1618e4150c9c0d87c
 AUX ddcui-0.2.1-drop-qthelp-dep.patch 1398 BLAKE2B 6deb7e574f997f81e13834fa32b4dc435366231592a2a7e13e716252e475ae3d1301fd6678385522cc216f3924eaf7fa834b2ef92ee7d19714c4846e672d8d13 SHA512 a6432ba9d44f58f864a9f0c92770191afead20d28e527cc14056f494525e97f4f1978abc33cf03cdb20bd8a5fec78b4de19d4f46505322c98a7bd861751750c4
 AUX ddcui-0.4.2-drop-qthelp-dep.patch 1531 BLAKE2B e675ca6dfed846a77734f9d2ddb2120ac836d5c2b2d82e7d7d3ad29cae8a01955cee897a8bd5f356bafc1a377e013cd3a8c51de2453e05e10c62bd67b14be3ae SHA512 c626b27a06578d2e41077ac5683fcf742018f9af53b6d23fefbe70efa9ba4a16b9a132656a6c56ebcc0145af809d7e2072b818d42508704b49e61419c46ff375
+AUX ddcui-0.5.3-drop-qthelp-dep.patch 2147 BLAKE2B fbebf71b918bfad546f68f265e163891efb0e091cb5f4835f9f316e7ac51f1b47f7abece640d8771d686ee5510d10b0eb673a8c1abfeae78539d57c19c188bf3 SHA512 c98ee08206d89dd933e6a0628cc8a25256e31314022eb6daceb8a9a704face4ae7eb896489db1fa3e5b86cd2705e884111f97a1c3734b916c4d9fbb7af623943
 DIST ddcui-0.2.1.tar.gz 601220 BLAKE2B 18af4ee4db741a612565260ed812f7274695472e9dc6e32c6670efcbdaeafcac9b0b45e44d02188d23e0f379f57b062270ecad58bdcfa8e8c2bf99c2775b1dfe SHA512 0df363dbf17750e3920e0afc5fc29b42271bbf06dcf52cddf46f3660155c0954ee39e8e356e9caebe1a6a679ab0b3a4ebb2e501a9bb9ac2cd47da3f522fb3169
 DIST ddcui-0.3.0.tar.gz 601534 BLAKE2B d91d7467879c684cbb8571da48dfd170afa60d63832b44515d6d19187792f6c3c2c178e907ad8693cdba8df44b448eb4393a91e4439dcda13ac096ad6e97a594 SHA512 fab1ea757aad90fa68d2f6f5c128d7917e81f287a0a9e432461c7b2119c3f0d9da0e28a013510d1b0cb300b40c3f4dd745f3e1732c52f671c4d6e39b3ef0c368
 DIST ddcui-0.4.2.tar.gz 613765 BLAKE2B 2479570d9a79c298d8823c8a658c190e230ec83afc1b1deb9e3659e723c30bd0f2c1d55bc0aa5dcdf975adbab5792afd8ef5d350247eef5710cee4c99f4b56a6 SHA512 7f4339d292e42feb5912570be3b5629d61433a51bfdf0197deb10f8c0bc0e568dbc72f8e117c82dade30f01e3f00b5e805c4458e2bf9e6cc5932e33b7e7e51aa
-DIST ddcui-0.5.2.tar.gz 616616 BLAKE2B 0f27c5498aabbd067cd89dec1708fde69a5f1e5d8219144a69d5d4d22a95351e84a6c61c297c0efeac7ac9873549a40ad85858ee2bcadfc4ec79f1bd04dfefaa SHA512 466447bb71ae35f16f82250ba38d2b9f036eade49446a5db20f77ab8266c3bb28d4467a61dbf78b7297bd13860e60eb84f566868d28ad9a2feb1a414e6628a88
+DIST ddcui-0.5.3.tar.gz 617155 BLAKE2B f620aa0cbd4f7fa152e4c1b056bf95209b5608555d386e9ef8e5f0f7baefd5e0e7c0c92810d00389053362bafbf2b717700c9d09b20760a91ab7377a57fe32c5 SHA512 39f51a96ff0ef286b13c29a2a38531f37e6b93b969112fc508739488733309521683f234abdaf6cae6d0d76608abfcff6dd890b203fff59f13bc828f5a3edd5a
 EBUILD ddcui-0.2.1-r1.ebuild 817 BLAKE2B a0100685eea7621ab5b366e76798db8cbbb2ab15a0b665a13c807e755e10922a7a0b042ba1ea5064418d8a2999ce66fa133cbc4e6da201a427e2cee777eb543c SHA512 f6afdfda567341cfe0fd7e87caf9f8534de142f1a584aa36dd5f1a48a4f0a103389bd6ce2b6ecf8d06181995548a450376fc54e274579db01a23f1ec518c7e89
 EBUILD ddcui-0.3.0-r1.ebuild 792 BLAKE2B 4063de5d50691a1d39a8a167ed90d8e18e59fcd982438a679b5fa0cac4434883b8e836ee9be0d4f5ae4f5bd006ce2fd942070639edca6b226a68ab18f6ffed16 SHA512 b3e362f287fd8fdf8beef5596f33ceeb9124e8e1ee94d74f70a65ea4ec73f66a083861566deea64b547fe1ae3f67fdbda984ff3266d02717917deeca386ab55a
 EBUILD ddcui-0.4.2.ebuild 792 BLAKE2B 325db53f5ceb0bb14b257c7d0fced20ac5c4c81c3ea9483b771e508e02a37439455b327b7704f1671f2eccca28df52a4d3b9dbc8cea6ddb08d81248ababb91fb SHA512 c0f77bf4d5b6196a4a6082f94dff9a0ffcd4d390db242ef6a9a979a2db165bcc0aff914df570fc6ec84109d4779bf2a86e4e9e7f6452ec5ec800b31b738ba165
-EBUILD ddcui-0.5.2.ebuild 792 BLAKE2B fd055a465482feb0c4b3f1cecd3856a21f95849372a30aa408361b06d2bbecdba8b69f84b268a08879d0943aeabffc11d0b71c5ac02e552b2293eb6a5747c9fa SHA512 7500c987758b505114f98978fe2d0b2f73fd3c89c5c3947da4ff9609f536a58e28fe3f89c8ff6f78d751f5f3316264618c6131bac41320d71b09fe778434b1cf
+EBUILD ddcui-0.5.3.ebuild 913 BLAKE2B dad7372cec84c6987171e7ca829320eccd67d038d0f8818c467e7484a78948073c1488981167ced5ed9225c1d1a885cbbdd5e1676e50fbf62f50f6ad05807110 SHA512 58968a1240b612cf925d0e6fe93459448be19a2435f37832c4758c61fb4b48be1783d12124daeafb3ae9aeb7232320973e0705ee9aaff94c773242b564380850
 MISC metadata.xml 507 BLAKE2B 4f458118ad0f48137ac6b50871d7bc07f3b4416cbb82b264edd00726a6b9655d9ce986618da3c53a8e8855054a1e1e68045353589fdde1541c17e3f4b2e29828 SHA512 6a5c378319fc110e1338f4f6aeb5ce41c76ac521e95311c8b368b5357a2fd362038b21e46ff59dafc2cd8b0baeb55b7530b64c9f4f25513eb3eb66e528fd1e28
diff --git a/app-misc/ddcui/ddcui-0.5.2.ebuild b/app-misc/ddcui/ddcui-0.5.3.ebuild
index 7ccd8bf554ef..9858454df36b 100644
--- a/app-misc/ddcui/ddcui-0.5.2.ebuild
+++ b/app-misc/ddcui/ddcui-0.5.3.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 
 DEPEND="
 	dev-libs/glib
-	>=app-misc/ddcutil-2.1.0:0/5
+	>=app-misc/ddcutil-2.1.3:0/5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.4.2-drop-qthelp-dep.patch"
+	"${FILESDIR}/${PN}-0.5.3-drop-qthelp-dep.patch"
 )
 
 src_prepare() {
@@ -34,3 +34,12 @@ src_prepare() {
 	sed -i -e "s%share/doc/ddcui%share/doc/${PF}%g" CMakeLists.txt || die
 	cmake_src_prepare
 }
+
+src_configure() {
+	local mycmakeargs=(
+		# Not quite there yet, so force off
+		-DUSE_QT6=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/app-misc/ddcui/files/ddcui-0.5.3-drop-qthelp-dep.patch b/app-misc/ddcui/files/ddcui-0.5.3-drop-qthelp-dep.patch
new file mode 100644
index 000000000000..6771781cea65
--- /dev/null
+++ b/app-misc/ddcui/files/ddcui-0.5.3-drop-qthelp-dep.patch
@@ -0,0 +1,38 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 023f8d0..29ae38d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -130,21 +130,19 @@ message( ${VERBOSE} "  CMAKE_AUTORCC:           ${CMAKE_AUTORCC}")
+ if (USE_QT6)
+    set(QT6_LIBRARIES Qt6::Widgets )
+    # Ensures all Qt componenets have same version: 
+-   find_package(Qt6 ${ddcui_qt6_min_version} COMPONENTS Core Widgets Gui Help REQUIRED)
++   find_package(Qt6 ${ddcui_qt6_min_version} COMPONENTS Core Widgets Gui REQUIRED)
+    message( ${VERBOSE} "Qt directories:")
+    message( ${VERBOSE} "  Qt6Widgets_INCLUDE_DIRS:  ${Qt6Widgets_INCLUDE_DIRS}" )
+    message( ${VERBOSE} "  Qt6Core_INCLUDE_DIRS:     ${Qt6Core_INCLUDE_DIRS}"    )
+    message( ${VERBOSE} "  Qt6Gui_INCLUDE_DIRS:      ${Qt6Gui_INCLUDE_DIRS}"     )
+-   message( ${VERBOSE} "  Qt6Help_INCLUDE_DIRS:     ${Qt6Help_INCLUDE_DIRS}"    )
+ else()
+    set(QT5_LIBRARIES Qt5::Widgets )
+    # Ensures all Qt componenets have same version: 
+-   find_package(Qt5 ${ddcui_qt5_min_version} COMPONENTS Core Widgets Gui Help REQUIRED)
++   find_package(Qt5 ${ddcui_qt5_min_version} COMPONENTS Core Widgets Gui REQUIRED)
+    message( ${VERBOSE} "Qt directories:")
+    message( ${VERBOSE} "  Qt5Widgets_INCLUDE_DIRS:  ${Qt5Widgets_INCLUDE_DIRS}" )
+    message( ${VERBOSE} "  Qt5Core_INCLUDE_DIRS:     ${Qt5Core_INCLUDE_DIRS}"    )
+    message( ${VERBOSE} "  Qt5Gui_INCLUDE_DIRS:      ${Qt5Gui_INCLUDE_DIRS}"     )
+-   message( ${VERBOSE} "  Qt5Help_INCLUDE_DIRS:     ${Qt5Help_INCLUDE_DIRS}"    )
+ endif()
+ 
+ find_package (PkgConfig REQUIRED )
+@@ -297,7 +295,8 @@ target_compile_options(ddcui PUBLIC "-fPIC" ${coverity_cflags} ${asan_flags})
+ # redundant: ${Qt5Gui_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}. 
+ #            ${Qt5Help_INCLUDE_DIRS} is a superset of them all 
+ target_include_directories(ddcui SYSTEM PRIVATE
+-                                 ${Qt5Help_INCLUDE_DIRS}
++                                 ${Qt5Gui_INCLUDE_DIRS}
++                                 ${Qt5Widgets_INCLUDE_DIRS}
+                                  ${GLIB2_INCLUDE_DIRS} 
+                                  ${DDCUTIL_INCLUDE_DIRS})
+