diff options
| author |   Jimi Huotari <chiitoo@gentoo.org> | 2018-05-21 20:11:05 +0300 |
|---|---|---|
| committer | Jimi Huotari <chiitoo@gentoo.org> | 2018-05-21 20:11:39 +0300 |
| commit | 164da104c43c71833a52d740966ea27904fc9189 (patch) | |
| tree | b0231ea4b4f3ff05f700ff53bce1185b9e286834 | |
| parent | travis: update (diff) | |
| download | qt-164da104c43c71833a52d740966ea27904fc9189.tar.gz qt-164da104c43c71833a52d740966ea27904fc9189.tar.bz2 qt-164da104c43c71833a52d740966ea27904fc9189.zip | |
lxqt-base/liblxqt: make polkit optional
Upstream changed the method of installing 'POLKIT_FILES', which
unconditionally creates a build-time dependency. We can avoid this
by adding a USE-flag for it, and patch the 'CMakeLists.txt' to handle it
as an option instead.
https://github.com/lxqt/liblxqt/commit/6570771dbf31f21f7cd5d6abc18d1bbb0f9b039a
Package-Manager: Portage-2.3.38, Repoman-2.3.9
| -rw-r--r-- | lxqt-base/liblxqt/files/liblxqt-make-polkit-optional.patch | 29 | ||||
| -rw-r--r-- | lxqt-base/liblxqt/liblxqt-9999.ebuild | 11 |
2 files changed, 38 insertions, 2 deletions
diff --git a/lxqt-base/liblxqt/files/liblxqt-make-polkit-optional.patch b/lxqt-base/liblxqt/files/liblxqt-make-polkit-optional.patch new file mode 100644 index 00000000..7444318d --- /dev/null +++ b/lxqt-base/liblxqt/files/liblxqt-make-polkit-optional.patch @@ -0,0 +1,29 @@ +--- 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 @@ + 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(PolkitQt5-1 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 @@ + 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}") ++endif () + + #************************************************ + # Create and install pkgconfig file diff --git a/lxqt-base/liblxqt/liblxqt-9999.ebuild b/lxqt-base/liblxqt/liblxqt-9999.ebuild index 5ff0b33e..79420a8f 100644 --- a/lxqt-base/liblxqt/liblxqt-9999.ebuild +++ b/lxqt-base/liblxqt/liblxqt-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,6 +17,7 @@ fi LICENSE="|| ( BSD LGPL-2.1+ )" SLOT="0" +IUSE="policykit" RDEPEND=" >=dev-libs/libqtxdg-3.0.0 @@ -32,8 +33,11 @@ RDEPEND=" DEPEND="${RDEPEND} dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.4.0 + policykit? ( sys-auth/polkit-qt ) " +PATCHES=( "$FILESDIR/${PN}-make-polkit-optional.patch" ) + pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then tc-is-gcc && [[ $(gcc-version) < 4.8 ]] && \ @@ -42,6 +46,9 @@ pkg_pretend() { } src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) + local mycmakeargs=( + $(usex !policykit '-DBUILD_POLKIT=OFF') + -DPULL_TRANSLATIONS=OFF + ) cmake-utils_src_configure } |