commit: 69ac06b90a7a6cd7226ec66b963db7c7fbad65fe
Author: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 8 09:34:10 2025 +0000
Commit: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Wed Jan 8 09:36:37 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69ac06b9
app-misc/ddcui: port to qt6, patch build for qt6
Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>
.../{ddcui-0.5.4.ebuild => ddcui-0.5.4-r1.ebuild} | 11 +++--
app-misc/ddcui/files/ddcui-0.5.4-qt6.patch | 51 ++++++++++++++++++++++
2 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/app-misc/ddcui/ddcui-0.5.4.ebuild
b/app-misc/ddcui/ddcui-0.5.4-r1.ebuild
similarity index 86%
rename from app-misc/ddcui/ddcui-0.5.4.ebuild
rename to 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.pere...@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"
