* [gentoo-commits] repo/gentoo:master commit in: app-misc/ddcui/, app-misc/ddcui/files/
@ 2023-09-10 14:40 Andrew Ammerlaan
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2023-09-10 14:40 UTC (permalink / raw
To: gentoo-commits
commit: 860c465e1d146b208ce47db6f6fbd5c84c15839c
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 10 14:37:45 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Sep 10 14:39:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=860c465e
app-misc/ddcui: patch configure to not look for qthelp
Bug: https://bugs.gentoo.org/877303
Closes: https://bugs.gentoo.org/913943
Co-authored-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
app-misc/ddcui/ddcui-0.2.1-r1.ebuild | 1 +
app-misc/ddcui/ddcui-0.3.0-r1.ebuild | 4 ++++
.../ddcui/files/ddcui-0.2.1-drop-qthelp-dep.patch | 28 ++++++++++++++++++++++
3 files changed, 33 insertions(+)
diff --git a/app-misc/ddcui/ddcui-0.2.1-r1.ebuild b/app-misc/ddcui/ddcui-0.2.1-r1.ebuild
index 9417270f3965..f8e4a4f945f3 100644
--- a/app-misc/ddcui/ddcui-0.2.1-r1.ebuild
+++ b/app-misc/ddcui/ddcui-0.2.1-r1.ebuild
@@ -27,6 +27,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${P}-build.patch"
+ "${FILESDIR}/${P}-drop-qthelp-dep.patch"
)
src_prepare() {
diff --git a/app-misc/ddcui/ddcui-0.3.0-r1.ebuild b/app-misc/ddcui/ddcui-0.3.0-r1.ebuild
index 62a5eda6aa94..c32a66e52f95 100644
--- a/app-misc/ddcui/ddcui-0.3.0-r1.ebuild
+++ b/app-misc/ddcui/ddcui-0.3.0-r1.ebuild
@@ -25,6 +25,10 @@ DEPEND="
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.2.1-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
diff --git a/app-misc/ddcui/files/ddcui-0.2.1-drop-qthelp-dep.patch b/app-misc/ddcui/files/ddcui-0.2.1-drop-qthelp-dep.patch
new file mode 100644
index 000000000000..607777d5715b
--- /dev/null
+++ b/app-misc/ddcui/files/ddcui-0.2.1-drop-qthelp-dep.patch
@@ -0,0 +1,28 @@
+--- a/CMakeLists.txt 2022-08-01 15:19:36.000000000 +0200
++++ b/CMakeLists.txt 2022-10-16 14:08:37.422550810 +0200
+@@ -93,12 +93,11 @@
+
+ set(QT5_LIBRARIES Qt5::Widgets )
+ # Ensures all Qt componenets have same version:
+-find_package(Qt5 ${ddcui_qt_version} COMPONENTS Core Widgets Gui Help REQUIRED)
++find_package(Qt5 ${ddcui_qt_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}" )
+
+ find_package (PkgConfig REQUIRED )
+ pkg_check_modules(GLIB2 REQUIRED glib-2.0>=${ddcui_glib_version})
+@@ -215,9 +214,9 @@
+ # add_compile_options(-Og -H V=1)
+
+ # 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})
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/ddcui/, app-misc/ddcui/files/
@ 2023-11-24 9:37 Andrew Ammerlaan
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2023-11-24 9:37 UTC (permalink / raw
To: gentoo-commits
commit: e065922601acf708006c45e22961ff01c67131c2
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 16 14:33:13 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 09:36:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0659226
app-misc/ddcui: add 0.4.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/33847
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
app-misc/ddcui/Manifest | 1 +
app-misc/ddcui/ddcui-0.4.2.ebuild | 36 ++++++++++++++++++++++
.../ddcui/files/ddcui-0.4.2-drop-qthelp-dep.patch | 30 ++++++++++++++++++
3 files changed, 67 insertions(+)
diff --git a/app-misc/ddcui/Manifest b/app-misc/ddcui/Manifest
index 050bea05e702..f95e283a2f22 100644
--- a/app-misc/ddcui/Manifest
+++ b/app-misc/ddcui/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/app-misc/ddcui/ddcui-0.4.2.ebuild b/app-misc/ddcui/ddcui-0.4.2.ebuild
new file mode 100644
index 000000000000..94f61da45cdd
--- /dev/null
+++ b/app-misc/ddcui/ddcui-0.4.2.ebuild
@@ -0,0 +1,36 @@
+# 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/files/ddcui-0.4.2-drop-qthelp-dep.patch b/app-misc/ddcui/files/ddcui-0.4.2-drop-qthelp-dep.patch
new file mode 100644
index 000000000000..d7552b323ba1
--- /dev/null
+++ b/app-misc/ddcui/files/ddcui-0.4.2-drop-qthelp-dep.patch
@@ -0,0 +1,30 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aa68d60..522c9f3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -98,12 +98,11 @@ message( ${VERBOSE} " CMAKE_AUTORCC: ${CMAKE_AUTORCC}")
+
+ set(QT5_LIBRARIES Qt5::Widgets )
+ # Ensures all Qt componenets have same version:
+-find_package(Qt5 ${ddcui_qt_version} COMPONENTS Core Widgets Gui Help REQUIRED)
++find_package(Qt5 ${ddcui_qt_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}" )
+
+ find_package (PkgConfig REQUIRED )
+ pkg_check_modules(GLIB2 REQUIRED glib-2.0>=${ddcui_glib_version})
+@@ -239,9 +238,9 @@ target_compile_options(ddcui PUBLIC "-fPIC" ${coverity_cflags})
+ # add_compile_options(-Og -H V=1)
+
+ # 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})
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/ddcui/, app-misc/ddcui/files/
@ 2024-12-31 9:08 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2024-12-31 9:08 UTC (permalink / raw
To: gentoo-commits
commit: 877e9e0a6e93c3cd574f541a77d7ce5df2cf8ad4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 18:55:31 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 09:07:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=877e9e0a
app-misc/ddcui: drop 0.2.1-r1, 0.3.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-misc/ddcui/Manifest | 2 --
app-misc/ddcui/ddcui-0.2.1-r1.ebuild | 37 ----------------------
app-misc/ddcui/ddcui-0.3.0-r1.ebuild | 36 ---------------------
app-misc/ddcui/files/ddcui-0.2.1-build.patch | 13 --------
.../ddcui/files/ddcui-0.2.1-drop-qthelp-dep.patch | 28 ----------------
5 files changed, 116 deletions(-)
diff --git a/app-misc/ddcui/Manifest b/app-misc/ddcui/Manifest
index 3bc2ba38d621..1bf36ecc1e93 100644
--- a/app-misc/ddcui/Manifest
+++ b/app-misc/ddcui/Manifest
@@ -1,4 +1,2 @@
-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.4.tar.gz 617279 BLAKE2B a8a4fe8ad938efdee4baed1f8d450cc9aa0e8687fbe35bc2f4593a2214413e1b00ad1ee9884f4ef1eaebc3d7173a6aa01b0ace1b0ee99afc7b06f83fffd06da1 SHA512 f6e044f99419e0841663034ee84c1ad038ed64f8287fd48bbe5ba19b1dea3b714e4952cb11e04a04548e7c31e476459554b75748b2c0f844ed7b68fa5bb543e6
diff --git a/app-misc/ddcui/ddcui-0.2.1-r1.ebuild b/app-misc/ddcui/ddcui-0.2.1-r1.ebuild
deleted file mode 100644
index f8e4a4f945f3..000000000000
--- a/app-misc/ddcui/ddcui-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,37 +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-1.2.0:0/4
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${P}-build.patch"
- "${FILESDIR}/${P}-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.3.0-r1.ebuild b/app-misc/ddcui/ddcui-0.3.0-r1.ebuild
deleted file mode 100644
index c32a66e52f95..000000000000
--- a/app-misc/ddcui/ddcui-0.3.0-r1.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-1.3.0:0/4
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.2.1-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/files/ddcui-0.2.1-build.patch b/app-misc/ddcui/files/ddcui-0.2.1-build.patch
deleted file mode 100644
index e27018206c1d..000000000000
--- a/app-misc/ddcui/files/ddcui-0.2.1-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/feature_value_widgets/value_special_widget_x62.cpp b/src/feature_value_widgets/value_special_widget_x62.cpp
-index 1fb8118..e7169d2 100644
---- a/src/feature_value_widgets/value_special_widget_x62.cpp
-+++ b/src/feature_value_widgets/value_special_widget_x62.cpp
-@@ -185,7 +185,7 @@ void ValueSpecialWidgetX62::combobox_activated(int index) {
- bool debug = false;
- debug = debug || debugWidget;
- TRACEMCF(debug, "feature 0x%02x, index=%d", _featureCode, index);
-- assert(_cb->currentIndex == index);
-+ assert(_cb->currentIndex() == index);
-
- // QVariant qv = _cb->itemData(ndx);
- // uint i = qv.toUInt();
diff --git a/app-misc/ddcui/files/ddcui-0.2.1-drop-qthelp-dep.patch b/app-misc/ddcui/files/ddcui-0.2.1-drop-qthelp-dep.patch
deleted file mode 100644
index 607777d5715b..000000000000
--- a/app-misc/ddcui/files/ddcui-0.2.1-drop-qthelp-dep.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/CMakeLists.txt 2022-08-01 15:19:36.000000000 +0200
-+++ b/CMakeLists.txt 2022-10-16 14:08:37.422550810 +0200
-@@ -93,12 +93,11 @@
-
- set(QT5_LIBRARIES Qt5::Widgets )
- # Ensures all Qt componenets have same version:
--find_package(Qt5 ${ddcui_qt_version} COMPONENTS Core Widgets Gui Help REQUIRED)
-+find_package(Qt5 ${ddcui_qt_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}" )
-
- find_package (PkgConfig REQUIRED )
- pkg_check_modules(GLIB2 REQUIRED glib-2.0>=${ddcui_glib_version})
-@@ -215,9 +214,9 @@
- # add_compile_options(-Og -H V=1)
-
- # 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})
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/ddcui/, app-misc/ddcui/files/
@ 2025-01-08 9:37 Nowa Ammerlaan
0 siblings, 0 replies; 4+ messages in thread
From: Nowa Ammerlaan @ 2025-01-08 9:37 UTC (permalink / raw
To: gentoo-commits
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.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"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-01-08 9:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-31 9:08 [gentoo-commits] repo/gentoo:master commit in: app-misc/ddcui/, app-misc/ddcui/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-01-08 9:37 Nowa Ammerlaan
2023-11-24 9:37 Andrew Ammerlaan
2023-09-10 14:40 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox