Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kauth for openSUSE:Factory checked in at 2022-02-24 18:19:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kauth (Old) and /work/SRC/openSUSE:Factory/.kauth.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kauth" Thu Feb 24 18:19:17 2022 rev:104 rq:954228 version:5.91.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kauth/kauth.changes 2022-01-11 21:18:19.856919214 +0100 +++ /work/SRC/openSUSE:Factory/.kauth.new.1958/kauth.changes 2022-02-24 18:21:21.954691763 +0100 @@ -1,0 +2,18 @@ +Sun Feb 6 10:16:48 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 5.91.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.91.0 +- Changes since 5.90.0: + * Make code more compact (idea from Samir) + * Use kf6/ for qt6 or old path for keeping compatibility + * Move plugins in kf<version> directory + * Add CI qt6 support + * Seems my text editor munched the syntax, fix + * Correct the dependencies specified for KAuth. + * Bump minimum required version of Polkit-Qt-1 to 0.112.0 + * Remove Polkit-Qt build support, Polkit-Qt-1 replaced it a long time ago + * Adjust CMake code to find PolkitQt{5,6}-1 + +------------------------------------------------------------------- Old: ---- kauth-5.90.0.tar.xz kauth-5.90.0.tar.xz.sig New: ---- kauth-5.91.0.tar.xz kauth-5.91.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kauth.spec ++++++ --- /var/tmp/diff_new_pack.lurJgi/_old 2022-02-24 18:21:22.514691614 +0100 +++ /var/tmp/diff_new_pack.lurJgi/_new 2022-02-24 18:21:22.518691612 +0100 @@ -17,14 +17,14 @@ %define lname libKF5Auth5 -%define _tar_path 5.90 +%define _tar_path 5.91 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without released Name: kauth -Version: 5.90.0 +Version: 5.91.0 Release: 0 Summary: Framework which lets applications perform actions as a privileged user License: LGPL-2.1-or-later @@ -118,10 +118,8 @@ %{_kf5_libdir}/libKF5AuthCore.so.* %files devel -%dir %{_kf5_includedir}/*/ %{_kf5_datadir}/kauth/ -%{_kf5_includedir}/*.h -%{_kf5_includedir}/*/ +%{_kf5_includedir}/KAuth/ %{_kf5_libdir}/cmake/KF5Auth/ %{_kf5_libdir}/libKF5Auth.so %{_kf5_libdir}/libKF5AuthCore.so ++++++ kauth-5.90.0.tar.xz -> kauth-5.91.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.90.0/.gitlab-ci.yml new/kauth-5.91.0/.gitlab-ci.yml --- old/kauth-5.90.0/.gitlab-ci.yml 2022-01-01 13:25:48.000000000 +0100 +++ new/kauth-5.91.0/.gitlab-ci.yml 2022-02-05 22:18:44.000000000 +0100 @@ -4,3 +4,4 @@ include: - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.90.0/.kde-ci.yml new/kauth-5.91.0/.kde-ci.yml --- old/kauth-5.90.0/.kde-ci.yml 2022-01-01 13:25:48.000000000 +0100 +++ new/kauth-5.91.0/.kde-ci.yml 2022-02-05 22:18:44.000000000 +0100 @@ -1,8 +1,11 @@ Dependencies: -- 'on': ['macOS', 'Linux', 'FreeBSD'] +- 'on': ['macOS', 'Linux', 'FreeBSD', 'Windows'] 'require': 'frameworks/extra-cmake-modules': '@same' 'frameworks/kcoreaddons' : '@same' + +- 'on': ['Linux', 'FreeBSD'] + 'require': 'kdesupport/polkit-qt-1' : '@same' Options: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.90.0/CMakeLists.txt new/kauth-5.91.0/CMakeLists.txt --- old/kauth-5.90.0/CMakeLists.txt 2022-01-01 13:25:48.000000000 +0100 +++ new/kauth-5.91.0/CMakeLists.txt 2022-02-05 22:18:44.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.90.0") # handled by release scripts -set(KF_DEP_VERSION "5.90.0") # handled by release scripts +set(KF_VERSION "5.91.0") # handled by release scripts +set(KF_DEP_VERSION "5.91.0") # handled by release scripts project(KAuth VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.90.0 NO_MODULE) +find_package(ECM 5.91.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -57,7 +57,7 @@ ecm_install_po_files_as_qm(po) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055900) add_subdirectory(src) if(TARGET Qt${QT_MAJOR_VERSION}::Widgets) if (BUILD_TESTING) @@ -106,7 +106,7 @@ endif() install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kauth_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel ) + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KAuth COMPONENT Devel) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.90.0/cmake/FindPolkitQt-1.cmake new/kauth-5.91.0/cmake/FindPolkitQt-1.cmake --- old/kauth-5.90.0/cmake/FindPolkitQt-1.cmake 2022-01-01 13:25:48.000000000 +0100 +++ new/kauth-5.91.0/cmake/FindPolkitQt-1.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -# - Try to find PolkitQt-1 -# Once done this will define -# -# POLKITQT-1_FOUND - system has Polkit-qt -# POLKITQT-1_INCLUDE_DIR - the Polkit-qt include directory -# POLKITQT-1_LIBRARIES - Link these to use all Polkit-qt libs -# POLKITQT-1_CORE_LIBRARY - Link this to use the polkit-qt-core library only -# POLKITQT-1_GUI_LIBRARY - Link this to use GUI elements in polkit-qt (polkit-qt-gui) -# POLKITQT-1_AGENT_LIBRARY - Link this to use the agent wrapper in polkit-qt -# POLKITQT-1_DEFINITIONS - Compiler switches required for using Polkit-qt -# -# The minimum required version of PolkitQt-1 can be specified using the -# standard syntax, e.g. find_package(PolkitQt-1 1.0) - -# SPDX-FileCopyrightText: 2009 Dario Freddi <[email protected]> -# SPDX-License-Identifier: BSD-3-Clause - -# Support POLKITQT-1_MIN_VERSION for compatibility: -if(NOT PolkitQt-1_FIND_VERSION AND POLKITQT-1_MIN_VERSION) - set(PolkitQt-1_FIND_VERSION ${POLKITQT-1_MIN_VERSION}) -endif() - -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) -set(PolkitQt-1_FIND_QUIETLY ${_PolkitQt-1_FIND_QUIETLY}) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(PolkitQt-1 DEFAULT_MSG PolkitQt-1_CONFIG) - -if(POLKITQT-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() -endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.90.0/cmake/FindPolkitQt.cmake new/kauth-5.91.0/cmake/FindPolkitQt.cmake --- old/kauth-5.90.0/cmake/FindPolkitQt.cmake 2022-01-01 13:25:48.000000000 +0100 +++ new/kauth-5.91.0/cmake/FindPolkitQt.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,92 +0,0 @@ -# - Try to find Polkit-qt -# Once done this will define -# -# POLKITQT_FOUND - system has Polkit-qt -# POLKITQT_INCLUDE_DIR - the Polkit-qt include directory -# POLKITQT_LIBRARIES - Link these to use all Polkit-qt libs -# POLKITQT_CORE_LIBRARY - Link this to use the polkit-qt-core library only -# POLKITQT_GUI_LIBRARY - Link this to use GUI elements in polkit-qt (polkit-qt-gui) -# POLKITQT_DEFINITIONS - Compiler switches required for using Polkit-qt -# POLKITQT_POLICY_FILES_INSTALL_DIR - The directory where policy files should be installed to. -# -# The minimum required version of PolkitQt can be specified using the -# standard syntax, e.g. find_package(PolkitQt 1.0) -# For compatibility, this can also be done by setting the POLKITQT_MIN_VERSION variable. - -# SPDX-FileCopyrightText: 2009 Daniel Nicoletti <[email protected]> -# SPDX-FileCopyrightText: 2009 Dario Freddi <[email protected]> -# SPDX-FileCopyrightText: 2009 Michal Malek <[email protected]> -# SPDX-FileCopyrightText: 2009 Alexander Neundorf <[email protected]> -# SPDX-License-Identifier: BSD-3-Clause - -# Support POLKITQT_MIN_VERSION for compatibility: -if(NOT PolkitQt_FIND_VERSION) - set(PolkitQt_FIND_VERSION "${POLKITQT_MIN_VERSION}") -endif() - -# the minimum version of PolkitQt we require -if(NOT PolkitQt_FIND_VERSION) - set(PolkitQt_FIND_VERSION "0.9.3") -endif() - -if(NOT WIN32) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - find_package(PkgConfig) - pkg_check_modules(PC_POLKITQT QUIET polkit-qt) - set(POLKITQT_DEFINITIONS ${PC_POLKITQT_CFLAGS_OTHER}) -endif() - -find_path(POLKITQT_INCLUDE_DIR - NAMES polkit-qt/auth.h - PATH_SUFFIXES PolicyKit -) - -find_file(POLKITQT_VERSION_FILE - polkit-qt/polkitqtversion.h - HINTS ${POLKITQT_INCLUDE_DIR} -) - -if(POLKITQT_VERSION_FILE AND NOT POLKITQT_VERSION) - file(READ ${POLKITQT_VERSION_FILE} POLKITQT_VERSION_CONTENT) - string(REGEX MATCH "POLKITQT_VERSION_STRING \".*\"\n" POLKITQT_VERSION_MATCH "${POLKITQT_VERSION_CONTENT}") - - if(POLKITQT_VERSION_MATCH) - string(REGEX REPLACE "POLKITQT_VERSION_STRING \"(.*)\"\n" "\\1" _POLKITQT_VERSION ${POLKITQT_VERSION_MATCH}) - endif() - set(POLKITQT_VERSION "${_POLKITQT_VERSION}" CACHE STRING "Version number of PolkitQt" FORCE) -endif() - -find_library(POLKITQT_CORE_LIBRARY - NAMES polkit-qt-core - HINTS ${PC_POLKITQT_LIBDIR} -) -find_library(POLKITQT_GUI_LIBRARY - NAMES polkit-qt-gui - HINTS ${PC_POLKITQT_LIBDIR} -) - -set(POLKITQT_LIBRARIES ${POLKITQT_GUI_LIBRARY} ${POLKITQT_CORE_LIBRARY}) - -include(FindPackageHandleStandardArgs) -# Use the extended (new) syntax for FPHSA(): -find_package_handle_standard_args(PolkitQt REQUIRED_VARS POLKITQT_GUI_LIBRARY POLKITQT_CORE_LIBRARY POLKITQT_INCLUDE_DIR - VERSION_VAR POLKITQT_VERSION) - -mark_as_advanced(POLKITQT_INCLUDE_DIR - POLKITQT_CORE_LIBRARY - POLKITQT_GUI_LIBRARY - POLKITQT_VERSION_FILE - ) - -set(POLKITQT_POLICY_FILES_INSTALL_DIR share/PolicyKit/policy/) - -if(POLKITQT_FOUND) - get_filename_component(_POLKITQT_INSTALL_PREFIX "${POLKITQT_CORE_LIBRARY}" PATH) - get_filename_component(_POLKITQT_INSTALL_PREFIX "${_POLKITQT_INSTALL_PREFIX}" PATH) - if(NOT _POLKITQT_INSTALL_PREFIX STREQUAL CMAKE_INSTALL_PREFIX) - message("WARNING: Installation prefix does not match PolicyKit install prefixes. You probably will need to move files installed " - "in ${CMAKE_INSTALL_PREFIX}/${POLKITQT_POLICY_FILES_INSTALL_DIR} and by dbus_add_activation_system_service to the ${_POLKITQT_INSTALL_PREFIX}/${POLKITQT_POLICY_FILES_INSTALL_DIR} prefix") - endif() -endif() - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.90.0/cmake/KF5AuthMacros.cmake new/kauth-5.91.0/cmake/KF5AuthMacros.cmake --- old/kauth-5.90.0/cmake/KF5AuthMacros.cmake 2022-01-01 13:25:48.000000000 +0100 +++ new/kauth-5.91.0/cmake/KF5AuthMacros.cmake 2022-02-05 22:18:44.000000000 +0100 @@ -36,7 +36,7 @@ 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})") message(STATUS "installation will execute ${kauth_policy_gen} ${ACTIONS_FILE} in ${CMAKE_CURRENT_SOURCE_DIR}") - elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT" OR KAUTH_BACKEND_NAME STREQUAL "POLKITQT5-1") + elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT${QT_MAJOR_VERSION}-1") set(_output ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.policy) get_filename_component(_input ${ACTIONS_FILE} ABSOLUTE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.90.0/po/nb/kauth5_qt.po new/kauth-5.91.0/po/nb/kauth5_qt.po --- old/kauth-5.90.0/po/nb/kauth5_qt.po 2022-01-01 13:25:48.000000000 +0100 +++ new/kauth-5.91.0/po/nb/kauth5_qt.po 2022-02-05 22:18:44.000000000 +0100 @@ -26,13 +26,13 @@ "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" -#: backends/dbus/DBusHelperProxy.cpp:70 +#: backends/dbus/DBusHelperProxy.cpp:74 #, qt-format msgctxt "KAuth::DBusHelperProxy|" msgid "DBus Backend error: service start %1 failed: %2" msgstr "" -#: backends/dbus/DBusHelperProxy.cpp:85 +#: backends/dbus/DBusHelperProxy.cpp:89 #, qt-format msgctxt "KAuth::DBusHelperProxy|" msgid "" @@ -40,7 +40,7 @@ "(application: %2 helper: %3)" msgstr "" -#: backends/dbus/DBusHelperProxy.cpp:120 +#: backends/dbus/DBusHelperProxy.cpp:124 #, qt-format msgctxt "KAuth::DBusHelperProxy|" msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.90.0/po/se/kauth5_qt.po new/kauth-5.91.0/po/se/kauth5_qt.po --- old/kauth-5.90.0/po/se/kauth5_qt.po 2022-01-01 13:25:48.000000000 +0100 +++ new/kauth-5.91.0/po/se/kauth5_qt.po 2022-02-05 22:18:44.000000000 +0100 @@ -20,13 +20,13 @@ "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" -#: backends/dbus/DBusHelperProxy.cpp:70 +#: backends/dbus/DBusHelperProxy.cpp:74 #, qt-format msgctxt "KAuth::DBusHelperProxy|" msgid "DBus Backend error: service start %1 failed: %2" msgstr "" -#: backends/dbus/DBusHelperProxy.cpp:85 +#: backends/dbus/DBusHelperProxy.cpp:89 #, qt-format msgctxt "KAuth::DBusHelperProxy|" msgid "" @@ -34,7 +34,7 @@ "(application: %2 helper: %3)" msgstr "" -#: backends/dbus/DBusHelperProxy.cpp:120 +#: backends/dbus/DBusHelperProxy.cpp:124 #, qt-format msgctxt "KAuth::DBusHelperProxy|" msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.90.0/po/zh_CN/kauth5_qt.po new/kauth-5.91.0/po/zh_CN/kauth5_qt.po --- old/kauth-5.90.0/po/zh_CN/kauth5_qt.po 2022-01-01 13:25:48.000000000 +0100 +++ new/kauth-5.91.0/po/zh_CN/kauth5_qt.po 2022-02-05 22:18:44.000000000 +0100 @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2021-12-22 14:05\n" +"PO-Revision-Date: 2022-01-08 15:22\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.90.0/src/CMakeLists.txt new/kauth-5.91.0/src/CMakeLists.txt --- old/kauth-5.90.0/src/CMakeLists.txt 2022-01-01 13:25:48.000000000 +0100 +++ new/kauth-5.91.0/src/CMakeLists.txt 2022-02-05 22:18:44.000000000 +0100 @@ -201,13 +201,6 @@ ) endif() -# TODO: Remove once we depend on polkit-qt1 > 0.99.0 -# core/polkitqt1-actiondescription.h from polkit currently fails when built with -pedantic -string(REPLACE "--pedantic-errors" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -string(REPLACE "-pedantic-errors" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -string(REPLACE "--pedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -string(REPLACE "-pedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - include(ECMGeneratePriFile) ecm_generate_pri_file(BASE_NAME KAuthCore LIB_NAME KF5AuthCore DEPS "core KCoreAddons" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KAuth) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.90.0/src/ConfigureChecks.cmake new/kauth-5.91.0/src/ConfigureChecks.cmake --- old/kauth-5.90.0/src/ConfigureChecks.cmake 2022-01-01 13:25:48.000000000 +0100 +++ new/kauth-5.91.0/src/ConfigureChecks.cmake 2022-02-05 22:18:44.000000000 +0100 @@ -1,7 +1,7 @@ ####### checks for kdecore/kauth ############### set(KAUTH_BACKEND_NAME "" CACHE STRING "Specifies the KAuth backend to build. Current available options are - PolkitQt5-1, Fake, OSX. Not setting this variable will build the most + PolkitQt${QT_MAJOR_VERSION}-1, Fake, OSX. Not setting this variable will build the most appropriate backend for your system") # Case-insensitive @@ -9,6 +9,8 @@ set(KAUTH_BACKEND ${KAUTH_BACKEND_NAME}) +set(POLKITQT_MIN_VERSION 0.112.0) + ## Check if the user did not specify a backend to be built. If that is the case, ## we check what is the best backend to build on this system. if(NOT KAUTH_BACKEND) @@ -17,12 +19,12 @@ if(APPLE) set(KAUTH_BACKEND "OSX") elseif(UNIX) - find_package(PolkitQt5-1 0.99.0) + find_package(PolkitQt${QT_MAJOR_VERSION}-1 ${POLKITQT_MIN_VERSION}) - if(PolkitQt5-1_FOUND) - set(KAUTH_BACKEND "POLKITQT5-1") + if(PolkitQt${QT_MAJOR_VERSION}-1_FOUND) + set(KAUTH_BACKEND "POLKITQT${QT_MAJOR_VERSION}-1") - set_package_properties(PolkitQt5-1 PROPERTIES + set_package_properties(PolkitQt${QT_MAJOR_VERSION}-1 PROPERTIES URL "http://techbase.kde.org/Polkit-Qt-1"; DESCRIPTION "PolicyKit API for Qt" TYPE RECOMMENDED @@ -37,7 +39,9 @@ elseif(KAUTH_BACKEND AND NOT KAUTH_BUILD_CODEGENERATOR_ONLY) # Check if the specified backend is valid. If it is not, we fall back to the FAKE one - if(NOT KAUTH_BACKEND STREQUAL "OSX" AND NOT KAUTH_BACKEND STREQUAL "POLKITQT" AND NOT KAUTH_BACKEND STREQUAL "POLKITQT5-1" AND NOT KAUTH_BACKEND STREQUAL "FAKE") + if(NOT KAUTH_BACKEND STREQUAL "OSX" + AND NOT KAUTH_BACKEND STREQUAL "POLKITQT${QT_MAJOR_VERSION}-1" + AND NOT KAUTH_BACKEND STREQUAL "FAKE") message("WARNING: The KAuth Backend ${KAUTH_BACKEND} you specified does not exist. Falling back to Fake backend") set(KAUTH_BACKEND "FAKE") endif() @@ -47,31 +51,17 @@ message("WARNING: You chose the OSX KAuth backend but your system does not support it. Falling back to Fake backend") set(KAUTH_BACKEND "FAKE") endif() - if(KAUTH_BACKEND STREQUAL "POLKITQT") - find_package(PolkitQt) - set_package_properties(PolkitQt PROPERTIES - URL "http://api.kde.org/polkit-qt"; - DESCRIPTION "PolicyKit API for Qt" - TYPE RECOMMENDED - PURPOSE "Support for executing privileged actions in a controlled way (KAuth). Either this or PolkitQt5-1 is required to make KAuth work, and hence enable certain workspace functionalities" - ) - if(NOT POLKITQT_FOUND) - message("WARNING: You chose the PolkitQt KAuth backend but you don't have PolkitQt installed. - Falling back to Fake backend") - set(KAUTH_BACKEND "FAKE") - endif() - endif() - if(KAUTH_BACKEND STREQUAL "POLKITQT5-1") - find_package(PolkitQt5-1 0.99.0) - set_package_properties(PolkitQt5-1 PROPERTIES + if(KAUTH_BACKEND STREQUAL "POLKITQT${QT_MAJOR_VERSION}-1") + find_package(PolkitQt${QT_MAJOR_VERSION}-1 ${POLKITQT_MIN_VERSION}) + set_package_properties(PolkitQt${QT_MAJOR_VERSION}-1 PROPERTIES URL "http://techbase.kde.org/Polkit-Qt-1"; DESCRIPTION "PolicyKit API for Qt" TYPE RECOMMENDED - PURPOSE "Support for executing privileged actions in a controlled way (KAuth). Either this or PolkitQt is required to make KAuth work, and hence enable certain workspace functionalities" + PURPOSE "Support for executing privileged actions in a controlled way (KAuth). This is required to make KAuth work, and hence enable certain workspace functionalities" ) - if(NOT PolkitQt5-1_FOUND) - message("WARNING: You chose the PolkitQt5-1 KAuth backend but you don't have PolkitQt5-1 installed. + if(NOT PolkitQt${QT_MAJOR_VERSION}-1_FOUND) + message("WARNING: You chose the PolkitQt${QT_MAJOR_VERSION}-1 KAuth backend but you don't have PolkitQt${QT_MAJOR_VERSION}-1 installed. Falling back to Fake backend") set(KAUTH_BACKEND "FAKE") endif() @@ -79,7 +69,7 @@ endif() set(KAUTH_BACKEND_NAME ${KAUTH_BACKEND} CACHE STRING "Specifies the KAuth backend to build. Current available options are - PolkitQt, PolkitQt5-1, Fake, OSX. Not setting this variable will build the most + PolkitQt${QT_MAJOR_VERSION}-1, Fake, OSX. Not setting this variable will build the most appropriate backend for your system" FORCE) # Add the correct libraries depending on the backend, and eventually set the policy files install location @@ -94,8 +84,8 @@ ) set(KAUTH_BACKEND_LIBS ${SECURITY_LIBRARY} Qt${QT_MAJOR_VERSION}::Core) -elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT5-1") - message(STATUS "Building PolkitQt5-1 KAuth backend") +elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT${QT_MAJOR_VERSION}-1") + message(STATUS "Building PolkitQt${QT_MAJOR_VERSION}-1 KAuth backend") include_directories(SYSTEM ${POLKITQT-1_INCLUDE_DIR}) @@ -106,7 +96,7 @@ set(KAUTH_BACKEND_LIBS ${POLKITQT-1_CORE_LIBRARY} Qt${QT_MAJOR_VERSION}::DBus Qt${QT_MAJOR_VERSION}::Widgets KF5::AuthCore) # POLKITQT-1_POLICY_FILES_INSTALL_DIR has an absolute pathname, fix that. - if(PolkitQt5-1_FOUND) + if(PolkitQt${QT_MAJOR_VERSION}-1_FOUND) string(REPLACE ${POLKITQT-1_INSTALL_DIR} ${CMAKE_INSTALL_PREFIX} _KAUTH_POLICY_FILES_INSTALL_DIR ${POLKITQT-1_POLICY_FILES_INSTALL_DIR}) @@ -131,7 +121,7 @@ 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} Qt${QT_MAJOR_VERSION}::Core) -elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT5-1") +elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT${QT_MAJOR_VERSION}-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} @@ -188,6 +178,10 @@ endif() +set(_kf_prefix) +if (QT_MAJOR_VERSION STREQUAL "6") + set(_kf_prefix "kf6/") +endif() # Set directories for plugins if(NOT WIN32) @@ -221,13 +215,12 @@ set(${_var} "${${_var}}" CACHE PATH "${_comment}") endif() endmacro() - - _set_fancy(KAUTH_HELPER_PLUGIN_DIR "kauth/helper" "Where KAuth's helper plugin will be installed") - _set_fancy(KAUTH_BACKEND_PLUGIN_DIR "kauth/backend" "Where KAuth's backend plugin will be installed") + _set_fancy(KAUTH_HELPER_PLUGIN_DIR "${_kf_prefix}kauth/helper" "Where KAuth's helper plugin will be installed") + _set_fancy(KAUTH_BACKEND_PLUGIN_DIR "${_kf_prefix}kauth/backend" "Where KAuth's backend plugin will be installed") #set(KAUTH_OTHER_PLUGIN_DIR "${QT_PLUGINS_DIR}/kauth/plugins") else() - set(KAUTH_HELPER_PLUGIN_DIR "kauth/helper") - set(KAUTH_BACKEND_PLUGIN_DIR "kauth/backend") + set(KAUTH_HELPER_PLUGIN_DIR "${_kf_prefix}kauth/helper") + set(KAUTH_BACKEND_PLUGIN_DIR "${_kf_prefix}kauth/backend") endif() ## End
