commit: a10da08a2dccd41eb5449acaa5dad3036eee6469 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Wed Dec 5 19:18:51 2018 +0000 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> CommitDate: Wed Dec 5 19:21:14 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a10da08a
lxqt-base/liblxqt: update polkit optional making patch Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> Package-Manager: Portage-2.3.52, Repoman-2.3.12 .../files/liblxqt-make-polkit-optional.patch | 31 +++++++++++++++------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/lxqt-base/liblxqt/files/liblxqt-make-polkit-optional.patch b/lxqt-base/liblxqt/files/liblxqt-make-polkit-optional.patch index 7444318d..75ec71ec 100644 --- a/lxqt-base/liblxqt/files/liblxqt-make-polkit-optional.patch +++ b/lxqt-base/liblxqt/files/liblxqt-make-polkit-optional.patch @@ -1,29 +1,42 @@ ---- a/CMakeLists.txt 2018-05-21 16:51:42.359463205 +0300 -+++ b/CMakeLists.txt 2018-05-21 16:36:26.767259223 +0300 -@@ -160,7 +160,14 @@ +From f1b587d2d0f77ed8ea95bcf28880d231f048e0ee Mon Sep 17 00:00:00 2001 +From: Jimi Huotari <[email protected]> +Date: Wed, 5 Dec 2018 21:16: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 56d16c6..dfe90fe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,8 +41,14 @@ find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED) find_package(Qt5 ${QT_MINIMUM_VERSION} CONFIG REQUIRED Widgets DBus X11Extras LinguistTools) find_package(Qt5Xdg ${QTXDG_MINIMUM_VERSION} REQUIRED) - find_package(KF5WindowSystem REQUIRED) + find_package(KF5WindowSystem ${KF5_MINIMUM_VERSION} REQUIRED) -find_package(PolkitQt5-1 REQUIRED) + find_package(X11 REQUIRED) + +# 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}") - QT5_ADD_DBUS_INTERFACE(DBUS_INTERFACE_SRCS -@@ -367,7 +374,9 @@ + include(CMakePackageConfigHelpers) +@@ -363,7 +369,9 @@ install(FILES ${LXQT_CONFIG_FILES} COMPONENT Runtime ) --install(FILES ${POLKIT_FILES} DESTINATION "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}") +if (PolkitQt5-1_FOUND) -+ install(FILES ${POLKIT_FILES} DESTINATION "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}") + install(FILES ${POLKIT_FILES} DESTINATION "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}") +endif () #************************************************ # Create and install pkgconfig file +-- +2.19.2 +
