pool/kauth
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kauth?expand=0&rev=33

Browse Source
This commit is contained in:
Hrvoje Senjan 2014-07-10 18:21:17 +00:00 committed by Git OBS Bridge
parent ed6731b3bc
commit d355213350
2 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kauth.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jul 10 18:19:58 UTC 2014 - hrvoje.senjan@gmail.com
- Update polkit-qt5-support.patch to work with latest polkit-qt5-1
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 1 21:36:06 UTC 2014 - hrvoje.senjan@gmail.com Tue Jul 1 21:36:06 UTC 2014 - hrvoje.senjan@gmail.com

43
polkit-qt5-support.patch
View File

@ -1,8 +1,23 @@
From 09c745976fd75ac3330776cb14255de33500dc5b Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Mon, 7 Jul 2014 21:39:46 +0200
Subject: [PATCH 1/2] Switch to PolkitQt5-1
This will avoid problems where people
linked to Qt4 version of polkit-qt-1
REVIEW: 118264
BUG: 337143
---
cmake/KF5AuthMacros.cmake | 2 +-
src/ConfigureChecks.cmake | 50 +++++++++++++++++++++++------------------------
2 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/cmake/KF5AuthMacros.cmake b/cmake/KF5AuthMacros.cmake diff --git a/cmake/KF5AuthMacros.cmake b/cmake/KF5AuthMacros.cmake
index 4cdf3ab..1bff105 100644 index 66ba949..ab0b30a 100644
--- a/cmake/KF5AuthMacros.cmake --- a/cmake/KF5AuthMacros.cmake
+++ b/cmake/KF5AuthMacros.cmake +++ b/cmake/KF5AuthMacros.cmake
@@ -37,7 +37,7 @@ function(KAUTH_INSTALL_ACTIONS HELPER_ID ACTIONS_FILE) @@ -42,7 +42,7 @@ function(KAUTH_INSTALL_ACTIONS HELPER_ID ACTIONS_FILE)
if(KAUTH_BACKEND_NAME STREQUAL "APPLE") if(KAUTH_BACKEND_NAME STREQUAL "APPLE")
get_target_property(kauth_policy_gen KF5::kauth-policy-gen LOCATION) get_target_property(kauth_policy_gen KF5::kauth-policy-gen LOCATION)
install(CODE "execute_process(COMMAND ${kauth_policy_gen} ${ACTIONS_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})") install(CODE "execute_process(COMMAND ${kauth_policy_gen} ${ACTIONS_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})")
@ -12,7 +27,7 @@ index 4cdf3ab..1bff105 100644
get_filename_component(_input ${ACTIONS_FILE} ABSOLUTE) get_filename_component(_input ${ACTIONS_FILE} ABSOLUTE)
diff --git a/src/ConfigureChecks.cmake b/src/ConfigureChecks.cmake diff --git a/src/ConfigureChecks.cmake b/src/ConfigureChecks.cmake
index aff05ed..fcd26d5 100644 index 9e13546..ff0d486 100644
--- a/src/ConfigureChecks.cmake --- a/src/ConfigureChecks.cmake
+++ b/src/ConfigureChecks.cmake +++ b/src/ConfigureChecks.cmake
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
@ -111,13 +126,13 @@ index aff05ed..fcd26d5 100644
) )
- if (NOT POLKITQT-1_FOUND) - if (NOT POLKITQT-1_FOUND)
- message ("WARNING: You chose the PolkitQt-1 KAuth backend but you don't have PolkitQt-1 installed. - message ("WARNING: You chose the PolkitQt-1 KAuth backend but you don't have PolkitQt-1 installed.
+ if (NOT POLKITQT5-1_FOUND) + if (NOT PolkitQt5-1_FOUND)
+ message ("WARNING: You chose the PolkitQt5-1 KAuth backend but you don't have PolkitQt5-1 installed. + message ("WARNING: You chose the PolkitQt5-1 KAuth backend but you don't have PolkitQt5-1 installed.
Falling back to Fake backend") Falling back to Fake backend")
set (KAUTH_BACKEND "FAKE") set (KAUTH_BACKEND "FAKE")
- endif (NOT POLKITQT-1_FOUND) - endif (NOT POLKITQT-1_FOUND)
- endif (KAUTH_BACKEND STREQUAL "POLKITQT-1") - endif (KAUTH_BACKEND STREQUAL "POLKITQT-1")
+ endif (NOT POLKITQT5-1_FOUND) + endif (NOT PolkitQt5-1_FOUND)
+ endif (KAUTH_BACKEND STREQUAL "POLKITQT5-1") + endif (KAUTH_BACKEND STREQUAL "POLKITQT5-1")
endif(NOT KAUTH_BACKEND) endif(NOT KAUTH_BACKEND)
@ -127,18 +142,27 @@ index aff05ed..fcd26d5 100644
appropriate backend for your system" FORCE) appropriate backend for your system" FORCE)
# Add the correct libraries depending on the backend, and eventually set the policy files install location # Add the correct libraries depending on the backend, and eventually set the policy files install location
@@ -139,8 +139,8 @@ elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT") @@ -139,16 +139,14 @@ elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT")
set(KAUTH_POLICY_FILES_INSTALL_DIR ${POLKITQT_POLICY_FILES_INSTALL_DIR} CACHE STRING set(KAUTH_POLICY_FILES_INSTALL_DIR ${POLKITQT_POLICY_FILES_INSTALL_DIR} CACHE STRING
"Where policy files generated by KAuth will be installed" FORCE) "Where policy files generated by KAuth will be installed" FORCE)
-elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT-1") -elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT-1")
- message(STATUS "Building PolkitQt-1 KAuth backend") - message(STATUS "Building PolkitQt-1 KAuth backend")
-
- include_directories(${POLKITQT-1_INCLUDE_DIR})
+elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT5-1") +elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT5-1")
+ message(STATUS "Building PolkitQt5-1 KAuth backend") + message(STATUS "Building PolkitQt5-1 KAuth backend")
include_directories(${POLKITQT-1_INCLUDE_DIR}) set(KAUTH_BACKEND_SRCS
backends/polkit-1/Polkit1Backend.cpp
)
@@ -177,7 +177,7 @@ if(KAUTH_BACKEND_NAME STREQUAL "OSX") - set(KAUTH_BACKEND_LIBS ${POLKITQT-1_CORE_LIBRARY} Qt5::DBus Qt5::Widgets)
+ set(KAUTH_BACKEND_LIBS PolkitQt5-1::Core Qt5::DBus Qt5::Widgets)
# POLKITQT-1_POLICY_FILES_INSTALL_DIR has an absolute pathname, fix that.
string(REPLACE ${POLKITQT-1_INSTALL_DIR}
@@ -177,7 +175,7 @@ if(KAUTH_BACKEND_NAME STREQUAL "OSX")
elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT") elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT")
set(KAUTH_POLICY_GEN_SRCS ${KAUTH_POLICY_GEN_SRCS} set(KAUTH_POLICY_GEN_SRCS ${KAUTH_POLICY_GEN_SRCS}
backends/policykit/kauth-policy-gen-polkit.cpp ) backends/policykit/kauth-policy-gen-polkit.cpp )
@ -147,3 +171,6 @@ index aff05ed..fcd26d5 100644
set(KAUTH_POLICY_GEN_SRCS ${KAUTH_POLICY_GEN_SRCS} set(KAUTH_POLICY_GEN_SRCS ${KAUTH_POLICY_GEN_SRCS}
backends/polkit-1/kauth-policy-gen-polkit1.cpp ) backends/polkit-1/kauth-policy-gen-polkit1.cpp )
set(KAUTH_POLICY_GEN_LIBRARIES ${KAUTH_POLICY_GEN_LIBRARIES} set(KAUTH_POLICY_GEN_LIBRARIES ${KAUTH_POLICY_GEN_LIBRARIES}
--
2.0.0