diff --git a/recipes-kde/framework-tier2/kauth/files/0001-Make-autotests-optional.patch b/recipes-kde/framework-tier2/kauth/files/0001-Make-autotests-optional.patch index c2d278d2..6ee8e228 100644 --- a/recipes-kde/framework-tier2/kauth/files/0001-Make-autotests-optional.patch +++ b/recipes-kde/framework-tier2/kauth/files/0001-Make-autotests-optional.patch @@ -1,4 +1,4 @@ -From 65f884c12821ae487be28601a7f3b3fc25c963e9 Mon Sep 17 00:00:00 2001 +From 694631e179e9cd279aa07c972c8aec96a8bbd0b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 27 Nov 2014 09:19:51 +0100 Subject: [PATCH 1/3] Make autotests optional @@ -14,7 +14,7 @@ Signed-off-by: Andreas Müller 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index e047a94..4dc666f 100644 +index 8078528..98248c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,6 +28,9 @@ ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KAUTH diff --git a/recipes-kde/framework-tier2/kauth/files/0002-Force-building-kauth-policy-gen-with-for-polkit-qt-1.patch b/recipes-kde/framework-tier2/kauth/files/0002-Force-building-kauth-policy-gen-with-for-polkit-qt-1.patch deleted file mode 100644 index 8b523eb2..00000000 --- a/recipes-kde/framework-tier2/kauth/files/0002-Force-building-kauth-policy-gen-with-for-polkit-qt-1.patch +++ /dev/null @@ -1,77 +0,0 @@ -From a6bf4b1f4596194f5ba45c5af8680e703729a256 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 9 Dec 2014 07:49:18 +0100 -Subject: [PATCH 2/3] Force building kauth-policy-gen with for polkit-qt-1 - backend -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -we need that for native build - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Andreas Müller ---- - src/CMakeLists.txt | 14 ++++++-------- - src/ConfigureChecks.cmake | 17 ++++------------- - 2 files changed, 10 insertions(+), 21 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 946d042..0f9b8c7 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -52,16 +52,14 @@ ecm_generate_headers(KAuth_HEADERS - - # Compile only if fake backend has not been selected - --if (NOT "${KAUTH_BACKEND_NAME}" STREQUAL "FAKE") -- # KAUTH_POLICY_GEN_SRCS has been generated from ConfigureChecks.cmake -- add_executable(kauth-policy-gen ${KAUTH_POLICY_GEN_SRCS}) -- add_executable(KF5::kauth-policy-gen ALIAS kauth-policy-gen) -+# KAUTH_POLICY_GEN_SRCS has been generated from ConfigureChecks.cmake -+add_executable(kauth-policy-gen ${KAUTH_POLICY_GEN_SRCS}) -+add_executable(KF5::kauth-policy-gen ALIAS kauth-policy-gen) - -- # KAUTH_POLICY_GEN_LIBRARIES has been generated from ConfigureChecks.cmake -- target_link_libraries( kauth-policy-gen PRIVATE ${KAUTH_POLICY_GEN_LIBRARIES} ) -+# KAUTH_POLICY_GEN_LIBRARIES has been generated from ConfigureChecks.cmake -+target_link_libraries( kauth-policy-gen PRIVATE ${KAUTH_POLICY_GEN_LIBRARIES} ) - -- install( TARGETS kauth-policy-gen EXPORT KF5AuthTargets DESTINATION ${KAUTH_HELPER_INSTALL_DIR}) --endif () -+install( TARGETS kauth-policy-gen EXPORT KF5AuthTargets DESTINATION ${KAUTH_HELPER_INSTALL_DIR}) - - # KAuth backend plugin - -diff --git a/src/ConfigureChecks.cmake b/src/ConfigureChecks.cmake -index d46761a..48f33a2 100644 ---- a/src/ConfigureChecks.cmake -+++ b/src/ConfigureChecks.cmake -@@ -169,19 +169,10 @@ set(KAUTH_POLICY_GEN_SRCS - policy-gen/policy-gen.cpp ) - set(KAUTH_POLICY_GEN_LIBRARIES) - --if(KAUTH_BACKEND_NAME STREQUAL "OSX") -- set(KAUTH_POLICY_GEN_SRCS ${KAUTH_POLICY_GEN_SRCS} -- backends/mac/kauth-policy-gen-mac.cpp) -- set(KAUTH_POLICY_GEN_LIBRARIES ${KAUTH_POLICY_GEN_LIBRARIES} ${CORE_FOUNDATION_LIBRARY} ${SECURITY_LIBRARY} Qt5::Core) --elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT") -- set(KAUTH_POLICY_GEN_SRCS ${KAUTH_POLICY_GEN_SRCS} -- backends/policykit/kauth-policy-gen-polkit.cpp ) --elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT5-1") -- set(KAUTH_POLICY_GEN_SRCS ${KAUTH_POLICY_GEN_SRCS} -- backends/polkit-1/kauth-policy-gen-polkit1.cpp ) -- set(KAUTH_POLICY_GEN_LIBRARIES ${KAUTH_POLICY_GEN_LIBRARIES} -- Qt5::Core) --endif() -+set(KAUTH_POLICY_GEN_SRCS ${KAUTH_POLICY_GEN_SRCS} -+ backends/polkit-1/kauth-policy-gen-polkit1.cpp ) -+set(KAUTH_POLICY_GEN_LIBRARIES ${KAUTH_POLICY_GEN_LIBRARIES} -+ Qt5::Core) - - ######################## - # Helper backend probing --- -1.8.3.1 - diff --git a/recipes-kde/framework-tier2/kauth/files/0003-align-installation-location-for-helpers.patch b/recipes-kde/framework-tier2/kauth/files/0002-align-installation-location-for-helpers.patch similarity index 84% rename from recipes-kde/framework-tier2/kauth/files/0003-align-installation-location-for-helpers.patch rename to recipes-kde/framework-tier2/kauth/files/0002-align-installation-location-for-helpers.patch index 379ae207..819c497a 100644 --- a/recipes-kde/framework-tier2/kauth/files/0003-align-installation-location-for-helpers.patch +++ b/recipes-kde/framework-tier2/kauth/files/0002-align-installation-location-for-helpers.patch @@ -1,7 +1,7 @@ -From 53e5bcaf4d30c4837ea048e99bcc627d48c40d2b Mon Sep 17 00:00:00 2001 +From 013bd6451624d6deb23e64485a552ce92d09a4ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 9 Dec 2014 08:49:14 +0100 -Subject: [PATCH 3/3] align installation location for helpers +Subject: [PATCH 2/3] align installation location for helpers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -14,7 +14,7 @@ Signed-off-by: Andreas Müller 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4dc666f..0353292 100644 +index 98248c7..5e37f30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ option(AUTOTESTS "Perform autotests" ON) diff --git a/recipes-kde/framework-tier2/kauth/files/0003-build-kauth-policy-gen-only-with-for-polkit-qt-1-bac.patch b/recipes-kde/framework-tier2/kauth/files/0003-build-kauth-policy-gen-only-with-for-polkit-qt-1-bac.patch new file mode 100644 index 00000000..30e5fac3 --- /dev/null +++ b/recipes-kde/framework-tier2/kauth/files/0003-build-kauth-policy-gen-only-with-for-polkit-qt-1-bac.patch @@ -0,0 +1,128 @@ +From 8c46905e3a2183fef583adb28f92c8b2d16d0698 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 12 Dec 2014 12:32:55 +0100 +Subject: [PATCH 3/3] build kauth-policy-gen only with for polkit-qt-1 backend +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +we need that for native build + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 4 +++- + src/CMakeLists.txt | 12 ++++++++---- + src/ConfigureChecks.cmake | 17 ++++------------- + 3 files changed, 15 insertions(+), 18 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5e37f30..360ab24 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,7 +6,7 @@ find_package(ECM 1.5.0 REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) + + set(REQUIRED_QT_VERSION 5.2.0) +-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus) ++find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) + include(KDEInstallDirs) + include(KDEFrameworkCompilerSettings) + include(KDECMakeSettings) +@@ -44,6 +44,7 @@ if(AUTOTESTS) + add_subdirectory(autotests) + endif() + ++if(False) + # create a Config.cmake and a ConfigVersion.cmake file and install them + set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Auth") + +@@ -69,3 +70,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kauth_version.h + + + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ++endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 946d042..e6fab04 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,5 +1,5 @@ + +-find_package(Qt5 5.2.0 CONFIG REQUIRED Widgets DBus) ++find_package(Qt5 5.2.0 CONFIG REQUIRED DBus) + + # This file handles all the logic for compiling KAuth's backends + include(ConfigureChecks.cmake) +@@ -9,6 +9,7 @@ configure_file(BackendsConfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/BackendsConfig + + ecm_create_qm_loader(KAuth_QM_LOADER kauth5_qt) + ++if(False) + set(libkauth_SRCS + kauthaction.cpp + kauthactionreply.cpp +@@ -47,12 +48,13 @@ ecm_generate_headers(KAuth_HEADERS + + REQUIRED_HEADERS KAuth_HEADERS + ) ++endif() + + # KAuth policy generator executable + + # Compile only if fake backend has not been selected + +-if (NOT "${KAUTH_BACKEND_NAME}" STREQUAL "FAKE") ++#if (NOT "${KAUTH_BACKEND_NAME}" STREQUAL "FAKE") + # KAUTH_POLICY_GEN_SRCS has been generated from ConfigureChecks.cmake + add_executable(kauth-policy-gen ${KAUTH_POLICY_GEN_SRCS}) + add_executable(KF5::kauth-policy-gen ALIAS kauth-policy-gen) +@@ -60,9 +62,10 @@ if (NOT "${KAUTH_BACKEND_NAME}" STREQUAL "FAKE") + # KAUTH_POLICY_GEN_LIBRARIES has been generated from ConfigureChecks.cmake + target_link_libraries( kauth-policy-gen PRIVATE ${KAUTH_POLICY_GEN_LIBRARIES} ) + +- install( TARGETS kauth-policy-gen EXPORT KF5AuthTargets DESTINATION ${KAUTH_HELPER_INSTALL_DIR}) +-endif () ++ install( TARGETS kauth-policy-gen DESTINATION ${KAUTH_HELPER_INSTALL_DIR}) ++#endif () + ++if(False) + # KAuth backend plugin + + if (NOT "${KAUTH_BACKEND_NAME}" STREQUAL "FAKE") +@@ -111,3 +114,4 @@ string(REPLACE "-pedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + include(ECMGeneratePriFile) + ecm_generate_pri_file(BASE_NAME KAuth LIB_NAME KF5Auth DEPS "core KCoreAddons" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KF5_INCLUDE_INSTALL_DIR}/KAuth) + install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) ++endif() +diff --git a/src/ConfigureChecks.cmake b/src/ConfigureChecks.cmake +index d46761a..48f33a2 100644 +--- a/src/ConfigureChecks.cmake ++++ b/src/ConfigureChecks.cmake +@@ -169,19 +169,10 @@ set(KAUTH_POLICY_GEN_SRCS + policy-gen/policy-gen.cpp ) + set(KAUTH_POLICY_GEN_LIBRARIES) + +-if(KAUTH_BACKEND_NAME STREQUAL "OSX") +- set(KAUTH_POLICY_GEN_SRCS ${KAUTH_POLICY_GEN_SRCS} +- backends/mac/kauth-policy-gen-mac.cpp) +- set(KAUTH_POLICY_GEN_LIBRARIES ${KAUTH_POLICY_GEN_LIBRARIES} ${CORE_FOUNDATION_LIBRARY} ${SECURITY_LIBRARY} Qt5::Core) +-elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT") +- set(KAUTH_POLICY_GEN_SRCS ${KAUTH_POLICY_GEN_SRCS} +- backends/policykit/kauth-policy-gen-polkit.cpp ) +-elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT5-1") +- set(KAUTH_POLICY_GEN_SRCS ${KAUTH_POLICY_GEN_SRCS} +- backends/polkit-1/kauth-policy-gen-polkit1.cpp ) +- set(KAUTH_POLICY_GEN_LIBRARIES ${KAUTH_POLICY_GEN_LIBRARIES} +- Qt5::Core) +-endif() ++set(KAUTH_POLICY_GEN_SRCS ${KAUTH_POLICY_GEN_SRCS} ++ backends/polkit-1/kauth-policy-gen-polkit1.cpp ) ++set(KAUTH_POLICY_GEN_LIBRARIES ${KAUTH_POLICY_GEN_LIBRARIES} ++ Qt5::Core) + + ######################## + # Helper backend probing +-- +1.8.3.1 + diff --git a/recipes-kde/framework-tier2/kauth/kauth-native.bb b/recipes-kde/framework-tier2/kauth/kauth-native.bb index 0fe2e314..dba3b430 100644 --- a/recipes-kde/framework-tier2/kauth/kauth-native.bb +++ b/recipes-kde/framework-tier2/kauth/kauth-native.bb @@ -4,4 +4,4 @@ inherit native DEPENDS += "kcoreaddons-native" -SRC_URI += "file://0002-Force-building-kauth-policy-gen-with-for-polkit-qt-1.patch" +SRC_URI += "file://0003-build-kauth-policy-gen-only-with-for-polkit-qt-1-bac.patch" diff --git a/recipes-kde/framework-tier2/kauth/kauth.inc b/recipes-kde/framework-tier2/kauth/kauth.inc index 138e7b9c..b9612c91 100644 --- a/recipes-kde/framework-tier2/kauth/kauth.inc +++ b/recipes-kde/framework-tier2/kauth/kauth.inc @@ -8,7 +8,7 @@ inherit kde SRC_URI += " \ file://0001-Make-autotests-optional.patch \ - file://0003-align-installation-location-for-helpers.patch \ + file://0002-align-installation-location-for-helpers.patch \ " SRCREV = "4f6d10cdc59aca6819e4189e81ff65150559bc10" PV = "5.5.0"