gentoo auto-resync : 09:01:2025 - 06:41:15

4 files changed, 58 insertions, 45 deletions

diff --git a/app-misc/ddcui/Manifest b/app-misc/ddcui/Manifest
index cbd659f7fc7a..546401968954 100644
--- a/app-misc/ddcui/Manifest
+++ b/app-misc/ddcui/Manifest
@@ -1,7 +1,6 @@
 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.4.2.tar.gz 613765 BLAKE2B 2479570d9a79c298d8823c8a658c190e230ec83afc1b1deb9e3659e723c30bd0f2c1d55bc0aa5dcdf975adbab5792afd8ef5d350247eef5710cee4c99f4b56a6 SHA512 7f4339d292e42feb5912570be3b5629d61433a51bfdf0197deb10f8c0bc0e568dbc72f8e117c82dade30f01e3f00b5e805c4458e2bf9e6cc5932e33b7e7e51aa
+AUX ddcui-0.5.4-qt6.patch 1535 BLAKE2B a69df74eb385ac8cde1e903025b58963caaa54e8f5797565ecac3f8a2c5d95ef5ae1023813e09b4e0d8dbf71817af13c21682f7c08b637185d0334d89d2ccd90 SHA512 d08fd17cf2186d070a30c21abc235ea6c3dab4f7b1c34a61af6ccab91be62e8a76c0010288868e8b7fc58c8c15dd3e6d7246a0fcd4e6fa0ebef6f97ad7223ea7
 DIST ddcui-0.5.4.tar.gz 617279 BLAKE2B a8a4fe8ad938efdee4baed1f8d450cc9aa0e8687fbe35bc2f4593a2214413e1b00ad1ee9884f4ef1eaebc3d7173a6aa01b0ace1b0ee99afc7b06f83fffd06da1 SHA512 f6e044f99419e0841663034ee84c1ad038ed64f8287fd48bbe5ba19b1dea3b714e4952cb11e04a04548e7c31e476459554b75748b2c0f844ed7b68fa5bb543e6
-EBUILD ddcui-0.4.2.ebuild 792 BLAKE2B 325db53f5ceb0bb14b257c7d0fced20ac5c4c81c3ea9483b771e508e02a37439455b327b7704f1671f2eccca28df52a4d3b9dbc8cea6ddb08d81248ababb91fb SHA512 c0f77bf4d5b6196a4a6082f94dff9a0ffcd4d390db242ef6a9a979a2db165bcc0aff914df570fc6ec84109d4779bf2a86e4e9e7f6452ec5ec800b31b738ba165
-EBUILD ddcui-0.5.4.ebuild 913 BLAKE2B dad7372cec84c6987171e7ca829320eccd67d038d0f8818c467e7484a78948073c1488981167ced5ed9225c1d1a885cbbdd5e1676e50fbf62f50f6ad05807110 SHA512 58968a1240b612cf925d0e6fe93459448be19a2435f37832c4758c61fb4b48be1783d12124daeafb3ae9aeb7232320973e0705ee9aaff94c773242b564380850
+EBUILD ddcui-0.5.4-r1.ebuild 932 BLAKE2B ec6d54e0b643e2c8b542e2785691a1fff2d6f190cbf1ce7476e99aa5eda32f629481d135e71a00ec141b457689c83a24c83459ea551c5c47afe8bf317bb50f11 SHA512 858950a0600fe7c7112093772d44f1a6767bdb262e7d545420497f8d969f698336f910301f1e822979d66afb5c0f14a1f059f25613803aa226d16a1c3c3ef6ba
 MISC metadata.xml 494 BLAKE2B 1825704bf25cc8aaf1960d8999666681cf522af7f4f46a8fc09e6ca5c375391326b7cd2a3464723aad832c13f7d5489404f93968efcf67baf836b4c90db516eb SHA512 f6fb0255fb556a164f7e33f8630639f3001814b35968477322e21163cf7ff376bbacaedafe2894f2c053e59334ef5d9330be9097cf409c20b0107760ce02583d
diff --git a/app-misc/ddcui/ddcui-0.4.2.ebuild b/app-misc/ddcui/ddcui-0.4.2.ebuild
deleted file mode 100644
index 94f61da45cdd..000000000000
--- a/app-misc/ddcui/ddcui-0.4.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Check for bumps & cleanup with app-misc/ddcutil
-
-inherit cmake xdg
-
-DESCRIPTION="Graphical user interface for ddcutil - control monitor settings"
-HOMEPAGE="https://www.ddcutil.com/ddcui_main/"
-SRC_URI="https://github.com/rockowitz/ddcui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2+"
-SLOT="0"
-
-DEPEND="
-	dev-libs/glib
-	>=app-misc/ddcutil-2.0.0:0/5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.2-drop-qthelp-dep.patch"
-)
-
-src_prepare() {
-	# move docs to correct dir
-	sed -i -e "s%share/doc/ddcui%share/doc/${PF}%g" CMakeLists.txt || die
-	cmake_src_prepare
-}
diff --git a/app-misc/ddcui/ddcui-0.5.4.ebuild b/app-misc/ddcui/ddcui-0.5.4-r1.ebuild
index 9858454df36b..0319174c3ebb 100644
--- a/app-misc/ddcui/ddcui-0.5.4.ebuild
+++ b/app-misc/ddcui/ddcui-0.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,22 +11,21 @@ DESCRIPTION="Graphical user interface for ddcutil - control monitor settings"
 HOMEPAGE="https://www.ddcutil.com/ddcui_main/"
 SRC_URI="https://github.com/rockowitz/ddcui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64"
 LICENSE="GPL-2+"
 SLOT="0"
+KEYWORDS="~amd64"
 
 DEPEND="
 	dev-libs/glib
 	>=app-misc/ddcutil-2.1.3:0/5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
+	>=dev-qt/qtbase-6.1:6[gui,widgets]
 "
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.5.3-drop-qthelp-dep.patch"
+	"${FILESDIR}/${PN}-0.5.4-qt6.patch"
 )
 
 src_prepare() {
@@ -38,7 +37,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		# Not quite there yet, so force off
-		-DUSE_QT6=OFF
+		-DUSE_QT6=ON
 	)
 
 	cmake_src_configure
diff --git a/app-misc/ddcui/files/ddcui-0.5.4-qt6.patch b/app-misc/ddcui/files/ddcui-0.5.4-qt6.patch
new file mode 100644
index 000000000000..efc363a17086
--- /dev/null
+++ b/app-misc/ddcui/files/ddcui-0.5.4-qt6.patch
@@ -0,0 +1,51 @@
+From d1773d3625388f4e56f0debabff3a3b6bd4100cb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lu=C3=ADs=20Pereira?= <luis.artur.pereira@gmail.com>
+Date: Tue, 15 Oct 2024 18:22:50 +0100
+Subject: [PATCH] Fixes a FTBFS using Qt6
+
+Also builds with Qt5.
+The use of "universal" headers allows source compatibility between Qt5 and
+Qt6.
+---
+ src/main/mainwindow.cpp  |  2 +-
+ src/main/mainwindow_ui.h | 14 +++++++-------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/main/mainwindow.cpp b/src/main/mainwindow.cpp
+index fbf3fc5..4b42ea1 100644
+--- a/src/main/mainwindow.cpp
++++ b/src/main/mainwindow.cpp
+@@ -15,7 +15,7 @@
+ #include <QtGui/QKeyEvent>
+ #include <QtWidgets/QMessageBox>
+ #include <QtWidgets/QWidget>
+-#include <QtWidgets/QShortcut>     // 5.9
++#include <QShortcut>     // 5.9
+ 
+ #include <ddcutil_c_api.h>
+ #include <ddcutil_status_codes.h>
+diff --git a/src/main/mainwindow_ui.h b/src/main/mainwindow_ui.h
+index edd7d88..2665fe4 100644
+--- a/src/main/mainwindow_ui.h
++++ b/src/main/mainwindow_ui.h
+@@ -9,13 +9,13 @@
+ #include <iostream>
+ 
+ #include <QtGui/QFont>
+-#include <QtWidgets/QAction>
+-#include <QtWidgets/QApplication>
+-#include <QtWidgets/QMainWindow>
+-#include <QtWidgets/QMenuBar>
+-#include <QtWidgets/QStackedWidget>
+-#include <QtWidgets/QStatusBar>
+-#include <QtWidgets/QToolBar>
++#include <QAction>
++#include <QApplication>
++#include <QMainWindow>
++#include <QMenuBar>
++#include <QStackedWidget>
++#include <QStatusBar>
++#include <QToolBar>
+ #include <QtGui/QKeyEvent>
+ 
+ #include "base/ddcui_core.h"