[gentoo-commits] repo/gentoo:master commit in: app-misc/ddcui/files/, app-misc/ddcui/

["Andrew Ammerlaan" <andrewammerlaan@gentoo.org>]

commit:     5591760162d030d8cb909f058d1aff701e5fb488
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  8 08:57:23 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Feb  8 09:05:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55917601

app-misc/ddcui: add 0.5.3

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 app-misc/ddcui/Manifest                            |  1 +
 app-misc/ddcui/ddcui-0.5.3.ebuild                  | 45 ++++++++++++++++++++++
 .../ddcui/files/ddcui-0.5.3-drop-qthelp-dep.patch  | 38 ++++++++++++++++++
 3 files changed, 84 insertions(+)

diff --git a/app-misc/ddcui/Manifest b/app-misc/ddcui/Manifest
index 575673cb0ea6..51b8fef9bf7c 100644
--- a/app-misc/ddcui/Manifest
+++ b/app-misc/ddcui/Manifest
@@ -2,3 +2,4 @@ DIST ddcui-0.2.1.tar.gz 601220 BLAKE2B 18af4ee4db741a612565260ed812f7274695472e9
 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

diff --git a/app-misc/ddcui/ddcui-0.5.3.ebuild b/app-misc/ddcui/ddcui-0.5.3.ebuild
new file mode 100644
index 000000000000..9858454df36b
--- /dev/null
+++ b/app-misc/ddcui/ddcui-0.5.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2019-2024 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.1.3:0/5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.5.3-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
+}
+
+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})
+