commit: 088192653d4735a0fa555445c7945c77d24d1525 Author: Zamarin Arthur <arthurzam <AT> gmail <DOT> com> AuthorDate: Sat Jul 27 06:30:40 2019 +0000 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> CommitDate: Sat Jul 27 14:41:48 2019 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=08819265
lxqt-base/liblxqt: add IUSE="backlight" to live use new option to disable polkit instead of patch Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Zamarin Arthur <arthurzam <AT> gmail.com> Closes: https://github.com/gentoo/qt/pull/198 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> .../files/liblxqt-make-polkit-optional.patch | 42 ---------------------- lxqt-base/liblxqt/liblxqt-9999.ebuild | 15 ++------ lxqt-base/liblxqt/metadata.xml | 3 ++ 3 files changed, 6 insertions(+), 54 deletions(-) diff --git a/lxqt-base/liblxqt/files/liblxqt-make-polkit-optional.patch b/lxqt-base/liblxqt/files/liblxqt-make-polkit-optional.patch deleted file mode 100644 index 834b310d..00000000 --- a/lxqt-base/liblxqt/files/liblxqt-make-polkit-optional.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 2b805344d81362237a21dcbed097f2fdd36cb4a4 Sat Jun 15 00:00:00 2019 -From: Arthur Zamarin <[email protected]> -Date: Sun, 21 Jul 2019 14:26:13 +0200 -Subject: [PATCH] build: Make PolkitQt5-1 optional - ---- - CMakeLists.txt | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6a26f19..14e592b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,11 +41,17 @@ find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED) - find_package(Qt5 ${QT_MINIMUM_VERSION} CONFIG REQUIRED Widgets DBus LinguistTools) - find_package(Qt5Xdg ${QTXDG_MINIMUM_VERSION} REQUIRED) - find_package(KF5WindowSystem ${KF5_MINIMUM_VERSION} REQUIRED) --find_package(PolkitQt5-1 REQUIRED) - if (NOT APPLE) - find_package(Qt5 ${QT_MINIMUM_VERSION} CONFIG REQUIRED X11Extras) - find_package(X11 REQUIRED) - endif() -+ -+# Optionally include the PolkitQt5-1 module. -+option(BUILD_POLKIT "Install the PolkitQt5-1 files." ON) -+if(BUILD_POLKIT) -+ find_package(PolkitQt5-1 REQUIRED) -+endif () -+ - message(STATUS "Building ${PROJECT_NAME} with Qt ${Qt5Core_VERSION}") - - include(CMakePackageConfigHelpers) -@@ -395,7 +401,9 @@ install(FILES ${LXQT_CONFIG_FILES} - COMPONENT Runtime - ) - -+if (PolkitQt5-1_FOUND) - install(FILES ${POLKIT_FILES} DESTINATION "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}") -+endif () - - #************************************************ - # Create and install pkgconfig file diff --git a/lxqt-base/liblxqt/liblxqt-9999.ebuild b/lxqt-base/liblxqt/liblxqt-9999.ebuild index 33b33e9e..12f74412 100644 --- a/lxqt-base/liblxqt/liblxqt-9999.ebuild +++ b/lxqt-base/liblxqt/liblxqt-9999.ebuild @@ -18,7 +18,7 @@ fi LICENSE="LGPL-2.1+ BSD" SLOT="0/$(ver_cut 1-2)" -IUSE="+policykit" +IUSE="+backlight" BDEPEND=" dev-qt/linguist-tools:5 @@ -38,21 +38,12 @@ RDEPEND=" !lxqt-base/lxqt-l10n " DEPEND="${RDEPEND} - policykit? ( sys-auth/polkit-qt ) + backlight? ( sys-auth/polkit-qt ) " -PATCHES=( "$FILESDIR/${PN}-make-polkit-optional.patch" ) - src_configure() { local mycmakeargs=( - $(usex !policykit '-DBUILD_POLKIT=OFF') + -DBUILD_BACKLIGHT_LINUX_BACKEND=$(usex backlight) ) cmake-utils_src_configure } - -pkg_postinst() { - if ! use policykit; then - ewarn "Please do not report issues caused by USE=\"-policykit\" to upstream," - ewarn "as they do not support such a build at this time." - fi -} diff --git a/lxqt-base/liblxqt/metadata.xml b/lxqt-base/liblxqt/metadata.xml index 68951bb1..6ca94aa7 100644 --- a/lxqt-base/liblxqt/metadata.xml +++ b/lxqt-base/liblxqt/metadata.xml @@ -5,6 +5,9 @@ <email>[email protected]</email> <name>LXQt</name> </maintainer> + <use> + <flag name="backlight">Build the Linux backend for the backlight</flag> + </use> <upstream> <remote-id type="github">lxqt/liblxqt</remote-id> </upstream>
