From e4bd387e8270f232cb2f76357d5672dfcf752e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 6 Aug 2014 19:51:35 +0200 Subject: [PATCH] Update upstream patch to find PolkitQt5 --- kauth-find-polkit-qt5.patch | 94 ------------------------------------ kauth-include-polkitqt.patch | 15 ++++++ kf5-kauth.spec | 9 ++-- 3 files changed, 21 insertions(+), 97 deletions(-) delete mode 100644 kauth-find-polkit-qt5.patch create mode 100644 kauth-include-polkitqt.patch diff --git a/kauth-find-polkit-qt5.patch b/kauth-find-polkit-qt5.patch deleted file mode 100644 index abb05bb..0000000 --- a/kauth-find-polkit-qt5.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff --git a/cmake/FindPolkitQt-1.cmake b/cmake/FindPolkitQt-1.cmake -index 4e90537..6503ec1 100644 ---- a/cmake/FindPolkitQt-1.cmake -+++ b/cmake/FindPolkitQt-1.cmake -@@ -23,15 +23,16 @@ if ( NOT PolkitQt-1_FIND_VERSION AND POLKITQT-1_MIN_VERSION ) - endif ( NOT PolkitQt-1_FIND_VERSION AND POLKITQT-1_MIN_VERSION ) - - set( _PolkitQt-1_FIND_QUIETLY ${PolkitQt-1_FIND_QUIETLY} ) --find_package( PolkitQt-1 ${PolkitQt-1_FIND_VERSION} QUIET NO_MODULE PATHS ${LIB_INSTALL_DIR}/PolkitQt-1/cmake ) -+find_package( PolkitQt5-1 ${PolkitQt-1_FIND_VERSION} QUIET NO_MODULE PATHS ${LIB_INSTALL_DIR}/PolkitQt5-1/cmake ) - set( PolkitQt-1_FIND_QUIETLY ${_PolkitQt-1_FIND_QUIETLY} ) - -+ - include( FindPackageHandleStandardArgs ) --find_package_handle_standard_args( PolkitQt-1 DEFAULT_MSG PolkitQt-1_CONFIG ) -+find_package_handle_standard_args( PolkitQt5-1 DEFAULT_MSG PolkitQt5-1_CONFIG ) - --if (POLKITQT-1_FOUND) -+if (POLKITQT5-1_FOUND) - if (NOT POLKITQT-1_INSTALL_DIR STREQUAL CMAKE_INSTALL_PREFIX) - message("WARNING: Installation prefix does not match PolicyKit install prefixes. You probably will need to move files installed " - "in POLICY_FILES_INSTALL_DIR and by dbus_add_activation_system_service to the ${PC_POLKITQT-1_PREFIX} prefix") - endif (NOT POLKITQT-1_INSTALL_DIR STREQUAL CMAKE_INSTALL_PREFIX) --endif (POLKITQT-1_FOUND) -+endif (POLKITQT5-1_FOUND) -diff --git a/src/ConfigureChecks.cmake b/src/ConfigureChecks.cmake -index f3dc6a6..6042b97 100644 ---- a/src/ConfigureChecks.cmake -+++ b/src/ConfigureChecks.cmake -@@ -14,19 +14,19 @@ if(NOT KAUTH_BACKEND) - if (APPLE) - set (KAUTH_BACKEND "OSX") - elseif (UNIX) -- find_package(PolkitQt-1 0.99.0) -+ find_package(PolkitQt5-1 0.103.0) - -- if (PolkitQt-1_FOUND) -+ if (PolkitQt5-1_FOUND) - set (KAUTH_BACKEND "PolkitQt-1") - -- set_package_properties(PolkitQt-1 PROPERTIES -+ set_package_properties(PolkitQt5-1 PROPERTIES - URL "http://techbase.kde.org/Polkit-Qt-1" - DESCRIPTION "PolicyKit API for Qt" - TYPE RECOMMENDED - PURPOSE "Support for executing priviledged actions in a controlled way (KAuth)" - ) - -- else (PolkitQt-1_FOUND) -+ else (PolkitQt5-1_FOUND) - find_package(PolkitQt) - - if (POLKITQT_FOUND) -@@ -40,7 +40,7 @@ if(NOT KAUTH_BACKEND) - - else (POLKITQT_FOUND) - # Nothing was found: notify and log the missing features -- set_package_properties(PolkitQt-1 PROPERTIES -+ set_package_properties(PolkitQt5-1 PROPERTIES - URL "http://techbase.kde.org/Polkit-Qt-1" - DESCRIPTION "PolicyKit API for Qt" - TYPE RECOMMENDED -@@ -54,7 +54,7 @@ if(NOT KAUTH_BACKEND) - ) - set (KAUTH_BACKEND "Fake") - endif (POLKITQT_FOUND) -- endif (PolkitQt-1_FOUND) -+ endif (PolkitQt5-1_FOUND) - else(UNIX) - set (KAUTH_BACKEND "Fake") - endif(APPLE) -@@ -94,18 +94,18 @@ else(NOT KAUTH_BACKEND) - endif (NOT POLKITQT_FOUND) - endif (KAUTH_BACKEND STREQUAL "POLKITQT") - if (KAUTH_BACKEND STREQUAL "POLKITQT-1") -- find_package(PolkitQt-1 0.99.0) -- set_package_properties(PolkitQt-1 PROPERTIES -+ find_package(PolkitQt5-1 0.103.0) -+ set_package_properties(PolkitQt5-1 PROPERTIES - URL "http://techbase.kde.org/Polkit-Qt-1" - DESCRIPTION "PolicyKit API for Qt" - TYPE RECOMMENDED - PURPOSE "Support for executing priviledged actions in a controlled way (KAuth). Either this or PolkitQt is required to make KAuth work, and hence enable certain workspace functionalities" - ) -- if (NOT POLKITQT-1_FOUND) -+ if (NOT POLKITQT5-1_FOUND) - message ("WARNING: You chose the PolkitQt-1 KAuth backend but you don't have PolkitQt-1 installed. - Falling back to Fake backend") - set (KAUTH_BACKEND "FAKE") -- endif (NOT POLKITQT-1_FOUND) -+ endif (NOT POLKITQT5-1_FOUND) - endif (KAUTH_BACKEND STREQUAL "POLKITQT-1") - endif(NOT KAUTH_BACKEND) - diff --git a/kauth-include-polkitqt.patch b/kauth-include-polkitqt.patch new file mode 100644 index 0000000..44fd931 --- /dev/null +++ b/kauth-include-polkitqt.patch @@ -0,0 +1,15 @@ +diff --git a/src/ConfigureChecks.cmake b/src/ConfigureChecks.cmake +index 70b9f7d..01346e4 100644 +--- a/src/ConfigureChecks.cmake ++++ b/src/ConfigureChecks.cmake +@@ -146,7 +146,9 @@ elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT5-1") + backends/polkit-1/Polkit1Backend.cpp + ) + +- set(KAUTH_BACKEND_LIBS PolkitQt5-1::Core Qt5::DBus Qt5::Widgets) ++ include_directories(${POLKITQT-1_INCLUDE_DIR}) ++ ++ set(KAUTH_BACKEND_LIBS polkit-qt5-core-1 Qt5::DBus Qt5::Widgets) + + # POLKITQT-1_POLICY_FILES_INSTALL_DIR has an absolute pathname, fix that. + string(REPLACE ${POLKITQT-1_INSTALL_DIR} diff --git a/kf5-kauth.spec b/kf5-kauth.spec index 1e608ab..7677c17 100644 --- a/kf5-kauth.spec +++ b/kf5-kauth.spec @@ -3,7 +3,7 @@ Name: kf5-%{framework} Version: 5.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 2 integration module to perform actions as privileged user License: LGPLv2+ @@ -14,7 +14,7 @@ URL: http://www.kde.org #Source0: %{name}-%{version}-%{snapshot}git.tar.bz2 Source0: http://download.kde.org/stable/frameworks/%{version}/%{framework}-%{version}.tar.xz -Patch0: kauth-find-polkit-qt5.patch +Patch0: kauth-include-polkitqt.patch BuildRequires: polkit-qt5-1-devel @@ -43,7 +43,7 @@ developing applications that use %{name}. %prep %setup -q -n %{framework}-%{version} -%patch0 -p1 -b .polkitqt5 +%patch0 -p1 -b .polkitqt %build mkdir -p %{_target_platform} @@ -83,6 +83,9 @@ make %{?_smp_mflags} -C %{_target_platform} %changelog +* Wed Aug 06 2014 Daniel Vrátil - 5.1.0-2 +- Update upstream patch to find PolkitQt5 + * Wed Aug 06 2014 Daniel Vrátil - 5.1.0-1 - KDE Frameworks 5.1.0