Hello community, here is the log from the commit of package polkit-qt-1 for openSUSE:Factory checked in at 2015-07-05 17:56:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/polkit-qt-1 (Old) and /work/SRC/openSUSE:Factory/.polkit-qt-1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "polkit-qt-1" Changes: -------- --- /work/SRC/openSUSE:Factory/polkit-qt-1/polkit-qt-1.changes 2013-07-16 18:38:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.polkit-qt-1.new/polkit-qt-1.changes 2015-07-05 17:56:52.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Jun 19 11:30:33 UTC 2015 - [email protected] + +- Update to version 0.112.0 + * Qt5 support + * Update deprecated methods to latest Polkit API + +- Qt4 and Qt5 versions are now aligned. + +- Drop patches merged upstream: + * fixed-reference-counting-of-GObjects.patch, + * fixed-GCancellable-handling-in-PolkitQtListener.patch + +- Added do-not-use-global-static-systembus-instance.patch from + upstream, fixes crash on DBus disconnect + +------------------------------------------------------------------- Old: ---- fixed-GCancellable-handling-in-PolkitQtListener.patch fixed-reference-counting-of-GObjects.patch polkit-qt-1-0.103.0.tar.bz2 New: ---- do-not-use-global-static-systembus-instance.patch polkit-qt-1-0.112.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ polkit-qt-1.spec ++++++ --- /var/tmp/diff_new_pack.WKZEZ0/_old 2015-07-05 17:56:53.000000000 +0200 +++ /var/tmp/diff_new_pack.WKZEZ0/_new 2015-07-05 17:56:53.000000000 +0200 @@ -19,19 +19,16 @@ %define debug_package_requires libpolkit-qt-1-0 = %{version}-%{release} Name: polkit-qt-1 -Version: 0.103.0 +Version: 0.112.0 Release: 0 Summary: PolicyKit Library Qt Bindings License: LGPL-2.1+ Group: Development/Libraries/KDE Url: http://api.kde.org/kdesupport-api/kdesupport-apidocs/polkit-qt/html/ -# ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/ -Source0: ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/%{name}-%{version}.tar.bz2 +Source0: http://download.kde.org/stable/apps/KDE4.x/admin//%{name}-%{version}.tar.bz2 Source99: baselibs.conf -# PATCH-FIX-UPSTREAM fixed-reference-counting-of-GObjects.patch (kde#257802, kde#286935, kde#291977, kde#307323) -Patch0: fixed-reference-counting-of-GObjects.patch -# PATCH-FIX-UPSTREAM fixed-GCancellable-handling-in-PolkitQtListener.patch (kde#270489) -Patch1: fixed-GCancellable-handling-in-PolkitQtListener.patch +# PATCH-FIX-UPSTREAM do-not-use-global-static-systembus-instance.patch +Patch0: do-not-use-global-static-systembus-instance.patch BuildRequires: automoc4 BuildRequires: cmake BuildRequires: kde4-filesystem @@ -74,7 +71,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %cmake_kde4 -d build ++++++ do-not-use-global-static-systembus-instance.patch ++++++ From: Harald Sitter <[email protected]> Date: Fri, 01 Aug 2014 14:34:03 +0000 Subject: do not use global static systembus instance X-Git-Url: http://quickgit.kde.org/?p=polkit-qt-1.git&a=commitdiff&h=88c6e9334c8440721189ef7d020fa94d47f30f8b --- do not use global static systembus instance global static destruction order cannot be controlled and we need our bus to disconnect from the consolekit signals, so use our own bus instance to connect to systembus signals REVIEW: 119545 --- --- a/core/polkitqt1-authority.cpp +++ b/core/polkitqt1-authority.cpp @@ -83,7 +83,10 @@ // Polkit will return NULL on failures, hence we use it instead of 0 Private(Authority *qq) : q(qq) , pkAuthority(NULL) - , m_hasError(false) {} + , m_hasError(false) + , m_systemBus(0) + { + } ~Private(); @@ -103,6 +106,13 @@ bool m_hasError; Authority::ErrorCode m_lastError; QString m_errorDetails; + // Local system bus. QDBusConnection::systemBus() may only be savely used + // inside a QCoreApplication scope as for example destruction of connected + // objects need to happen before the bus disappears. Since this class however + // is a global static and systemBus() internally is a global static we + // cannot assure destruction order. Instead we create a local copy of the + // global systemBus instance so we can make life time to our needs. + // This prevents crashes when cleaning up the global statics. QDBusConnection *m_systemBus; GCancellable *m_checkAuthorizationCancellable, *m_enumerateActionsCancellable, @@ -127,6 +137,7 @@ Authority::Private::~Private() { + delete m_systemBus; g_object_unref(m_checkAuthorizationCancellable); g_object_unref(m_enumerateActionsCancellable); g_object_unref(m_registerAuthenticationAgentCancellable); @@ -169,6 +180,9 @@ QDBusError dbus_error; g_type_init(); + + m_systemBus = new QDBusConnection(QDBusConnection::connectToBus(QDBusConnection::SystemBus, + QString("polkit_qt_system_bus"))); m_checkAuthorizationCancellable = g_cancellable_new(); m_enumerateActionsCancellable = g_cancellable_new(); @@ -219,7 +233,7 @@ // then we need to extract all seats from ConsoleKit QDBusMessage msg = QDBusMessage::createMethodCall(consoleKitService, consoleKitManagerPath, consoleKitManagerInterface, "GetSeats"); - msg = QDBusConnection::systemBus().call(msg); + msg = m_systemBus->call(msg); if (!msg.arguments().isEmpty()) { // this method returns a list with present seats QList<QString> seats; @@ -256,8 +270,7 @@ void Authority::Private::dbusSignalAdd(const QString &service, const QString &path, const QString &interface, const QString &name) { // FIXME: This code seems to be nonfunctional - it needs to be fixed somewhere (is it Qt BUG?) - QDBusConnection::systemBus().connect(service, path, interface, name, - q, SLOT(dbusFilter(QDBusMessage))); + m_systemBus->connect(service, path, interface, name, q, SLOT(dbusFilter(QDBusMessage))); } void Authority::Private::dbusFilter(const QDBusMessage &message) ++++++ polkit-qt-1-0.103.0.tar.bz2 -> polkit-qt-1-0.112.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/CMakeLists.txt new/polkit-qt-1-0.112.0/CMakeLists.txt --- old/polkit-qt-1-0.103.0/CMakeLists.txt 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/CMakeLists.txt 2014-07-10 10:37:25.000000000 +0200 @@ -1,27 +1,98 @@ ## Polkit Qt Library project("PolkitQt-1") -cmake_minimum_required(VERSION 2.6.0) +cmake_minimum_required(VERSION 2.8.11) -set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH}) +set(CMAKE_AUTOMOC TRUE) +set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(QT_MIN_VERSION "4.4.0") +set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) + +# Used to create CMake config files +include(CMakePackageConfigHelpers) + +# Used to set installation paths +include(GNUInstallDirs) + +# Set the different paths +set(LIB_DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Library directory name") +set(INCLUDE_DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}" CACHE PATH "The subdirectory to the header prefix") + + +# Check whether we explicitely select the Qt version to be used or autodetect +if(NOT USE_QT4 AND NOT USE_QT5) + # Autodetect, prefering Qt 5 + message(STATUS "Autodetecting Qt version to use") + find_package(Qt5Core QUIET) + if(Qt5Core_FOUND) + set(USE_QT5 TRUE) + endif() +endif() + +if(USE_QT5) + message(STATUS "Using Qt 5") + + set(REQUIRED_QT_VERSION 5.1.0) + + find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core DBus Widgets) + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0) + + set(POLKITQT-1_PCNAME "polkit-qt5-1") + set(POLKITQT-1_CORE_PCNAME "polkit-qt5-core-1") + set(POLKITQT-1_GUI_PCNAME "polkit-qt5-gui-1") + set(POLKITQT-1_AGENT_PCNAME "polkit-qt5-agent-1") + set(POLKITQT-1_CAMEL_NAME "PolkitQt5-1") + set(POLKITQT-1_EXAMPLE "polkit-example-qt5") + set(POLKITQT-1_EXAMPLE_HELPER "polkit-example-helper-qt5") + set(POLKITQT-1_AGENT_EXAMPLE "polkit-agent-example-qt5") + set(POLKITQT-1_INCLUDE_PATH "polkit-qt5-1") + + set(QT_QTCORE_LIBRARY Qt5::Core) + set(QT_QTDBUS_LIBRARY Qt5::DBus) + set(QT_QTTEST_LIBRARY Qt5::Test) + set(QT_QTGUI_LIBRARY Qt5::Widgets) + + macro(qt4_wrap_ui) + qt5_wrap_ui(${ARGN}) + endmacro() + + macro(qt4_add_resources) + qt5_add_resources(${ARGN}) + endmacro() + + macro(qt4_add_dbus_adaptor) + qt5_add_dbus_adaptor(${ARGN}) + endmacro() +else() + message(STATUS "Using Qt 4") + + set(QT_MIN_VERSION "4.4.0") + + find_package(Qt4 REQUIRED) + + include (${QT_USE_FILE}) + include (InstallSettings) + + set(POLKITQT-1_PCNAME "polkit-qt-1") + set(POLKITQT-1_CORE_PCNAME "polkit-qt-core-1") + set(POLKITQT-1_GUI_PCNAME "polkit-qt-gui-1") + set(POLKITQT-1_AGENT_PCNAME "polkit-qt-agent-1") + set(POLKITQT-1_CAMEL_NAME "PolkitQt-1") + set(POLKITQT-1_EXAMPLE "polkit-example") + set(POLKITQT-1_EXAMPLE_HELPER "polkit-example-helper") + set(POLKITQT-1_AGENT_EXAMPLE "polkit-agent-example") + set(POLKITQT-1_INCLUDE_PATH "polkit-qt-1") +endif() -find_package(Qt4 REQUIRED) -find_package(Automoc4 REQUIRED) find_package(Polkit REQUIRED) find_package(GObject REQUIRED) find_package(GIO REQUIRED) add_definitions(-DQT_NO_KEYWORDS) -include (${QT_USE_FILE}) -include (InstallSettings) -include (MacroWriteBasicCMakeVersionFile) include (CheckFunctionExists) include_directories( - ${CMAKE_CURRENT_BINARY_DIR} ${POLKIT_INCLUDE_DIR} ${POLKIT_AGENT_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} @@ -30,8 +101,12 @@ ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/core ${CMAKE_CURRENT_SOURCE_DIR}/includes - ${QT_QTXML_INCLUDE_DIR} ) +if(NOT USE_QT5) + include_directories( + ${QT_QTXML_INCLUDE_DIR} + ) +endif() # Check for older polkit set(CMAKE_REQUIRED_INCLUDES ${POLKIT_INCLUDE_DIR} ${POLKIT_AGENT_INCLUDE_DIR}) @@ -44,12 +119,10 @@ add_definitions(-DPOLKIT_QT_1_COMPATIBILITY_MODE) endif (NOT HAVE_POLKIT_AGENT_LISTENER_REGISTER OR NOT HAVE_POLKIT_AUTHORITY_GET_SYNC) -if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2) - option(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR "Prefer to install the <package>Config.cmake files to lib/cmake/<package> instead of lib/<package>/cmake" TRUE) -endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2) +option(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR "Prefer to install the <package>Config.cmake files to lib/cmake/<package> instead of lib/<package>/cmake" TRUE) set(POLKITQT-1_VERSION_MAJOR 0 CACHE INT "PolkitQt-1's major version number" FORCE) -set(POLKITQT-1_VERSION_MINOR 103 CACHE INT "PolkitQt-1's minor version number" FORCE) +set(POLKITQT-1_VERSION_MINOR 112 CACHE INT "PolkitQt-1's minor version number" FORCE) set(POLKITQT-1_VERSION_PATCH 0 CACHE INT "PolkitQt-1's release version number" FORCE) set(POLKITQT-1_VERSION_STRING "${POLKITQT-1_VERSION_MAJOR}.${POLKITQT-1_VERSION_MINOR}.${POLKITQT-1_VERSION_PATCH}") @@ -58,6 +131,7 @@ set(POLKITQT-1_ABI_VERSION 1) # The version number of the polkit-qt-1 libraries set(POLKITQT-1_LIBRARY_VERSION "${POLKITQT-1_ABI_VERSION}.${POLKITQT-1_VERSION_MINOR}.${POLKITQT-1_VERSION_PATCH}") +set(POLKITQT-1_LIB_NAMESPACE ${POLKITQT-1_CAMEL_NAME}) configure_file(polkitqt1-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkitqt1-version.h) @@ -80,7 +154,7 @@ polkitqt1-export.h DESTINATION - ${INCLUDE_INSTALL_DIR}/polkit-qt-1 COMPONENT Devel) + ${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH} COMPONENT Devel) install(FILES includes/PolkitQt1/Authority @@ -90,54 +164,70 @@ includes/PolkitQt1/TemporaryAuthorization includes/PolkitQt1/ActionDescription DESTINATION - ${INCLUDE_INSTALL_DIR}/polkit-qt-1/PolkitQt1 COMPONENT Devel) + ${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1 COMPONENT Devel) install(FILES includes/PolkitQt1/Gui/Action includes/PolkitQt1/Gui/ActionButton includes/PolkitQt1/Gui/ActionButtons DESTINATION - ${INCLUDE_INSTALL_DIR}/polkit-qt-1/PolkitQt1/Gui COMPONENT Devel) + ${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1/Gui COMPONENT Devel) install(FILES includes/PolkitQt1/Agent/Listener includes/PolkitQt1/Agent/Session DESTINATION - ${INCLUDE_INSTALL_DIR}/polkit-qt-1/PolkitQt1/Agent COMPONENT Devel) + ${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1/Agent COMPONENT Devel) if(NOT WIN32) # Pkgconfig - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/polkit-qt-1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-1.pc @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-1.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/polkit-qt-core-1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-core-1.pc + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${POLKITQT-1_PCNAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_PCNAME}.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_PCNAME}.pc DESTINATION ${LIB_DESTINATION}/pkgconfig ) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${POLKITQT-1_CORE_PCNAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_CORE_PCNAME}.pc @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-core-1.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/polkit-qt-gui-1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-gui-1.pc @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-gui-1.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/polkit-qt-agent-1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-agent-1.pc + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_CORE_PCNAME}.pc DESTINATION ${LIB_DESTINATION}/pkgconfig ) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${POLKITQT-1_GUI_PCNAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_GUI_PCNAME}.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_GUI_PCNAME}.pc DESTINATION ${LIB_DESTINATION}/pkgconfig ) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${POLKITQT-1_AGENT_PCNAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_AGENT_PCNAME}.pc @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-agent-1.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_AGENT_PCNAME}.pc DESTINATION ${LIB_DESTINATION}/pkgconfig ) endif(NOT WIN32) -# CMake Config files -configure_file(PolkitQt-1Config.cmake.in "${CMAKE_BINARY_DIR}/PolkitQt-1Config.cmake" @ONLY) - -# this file is used by to check if the installed version can be used. -macro_write_basic_cmake_version_file(${CMAKE_BINARY_DIR}/PolkitQt-1ConfigVersion.cmake - ${POLKITQT-1_VERSION_MAJOR} ${POLKITQT-1_VERSION_MINOR} ${POLKITQT-1_VERSION_PATCH}) if(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) - set(_PolkitQt-1Config_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/PolkitQt-1) + set(_PolkitQt-1Config_INSTALL_DIR ${LIB_DESTINATION}/cmake/${POLKITQT-1_CAMEL_NAME}) else(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) - set(_PolkitQt-1Config_INSTALL_DIR ${LIB_INSTALL_DIR}/PolkitQt-1/cmake) + set(_PolkitQt-1Config_INSTALL_DIR ${LIB_DESTINATION}/${POLKITQT-1_CAMEL_NAME}/cmake) endif(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) -install(FILES ${CMAKE_BINARY_DIR}/PolkitQt-1ConfigVersion.cmake - ${CMAKE_BINARY_DIR}/PolkitQt-1Config.cmake - DESTINATION ${_PolkitQt-1Config_INSTALL_DIR} ) + +# Create the CMake Config files +configure_package_config_file(PolkitQt-1Config.cmake.in + ${CMAKE_BINARY_DIR}/${POLKITQT-1_CAMEL_NAME}Config.cmake + INSTALL_DESTINATION ${_PolkitQt-1Config_INSTALL_DIR} + PATH_VARS LIB_DESTINATION INCLUDE_DESTINATION +) + +write_basic_package_version_file(${CMAKE_BINARY_DIR}/${POLKITQT-1_CAMEL_NAME}ConfigVersion.cmake + VERSION ${POLKITQT-1_VERSION_STRING} + COMPATIBILITY SameMajorVersion + ) + +install(FILES ${CMAKE_BINARY_DIR}/${POLKITQT-1_CAMEL_NAME}Config.cmake + ${CMAKE_BINARY_DIR}/${POLKITQT-1_CAMEL_NAME}ConfigVersion.cmake + DESTINATION ${_PolkitQt-1Config_INSTALL_DIR} + ) + +install(EXPORT ${POLKITQT-1_CAMEL_NAME}Export FILE ${POLKITQT-1_CAMEL_NAME}Targets.cmake + DESTINATION ${_PolkitQt-1Config_INSTALL_DIR} + NAMESPACE ${POLKITQT-1_LIB_NAMESPACE}::) option(BUILD_EXAMPLES "Builds a set of examples for polkit-qt-1" OFF) if (BUILD_EXAMPLES) + if(USE_QT5) + find_package(Qt5Xml ${REQUIRED_QT_VERSION} REQUIRED) + set(QT_QTXML_LIBRARY Qt5::Xml) + endif() add_subdirectory(examples) endif (BUILD_EXAMPLES) @@ -145,6 +235,9 @@ option(BUILD_TEST "Builds unit tests for polkit-qt-1" OFF) if (BUILD_TEST) + if(USE_QT5) + find_package(Qt5Test ${REQUIRED_QT_VERSION} REQUIRED) + endif() add_subdirectory(test) endif (BUILD_TEST) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/PolkitQt-1Config.cmake.in new/polkit-qt-1-0.112.0/PolkitQt-1Config.cmake.in --- old/polkit-qt-1-0.103.0/PolkitQt-1Config.cmake.in 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/PolkitQt-1Config.cmake.in 2014-07-10 10:37:25.000000000 +0200 @@ -1,41 +1,55 @@ -# PolkitQt-1Config.cmake is generated by CMake from PolkitQt-1Config.cmake.in. -# Any changed value in this file will be overwritten by CMake. +@PACKAGE_INIT@ -# set the PolkitQt-1 version number +# Config file for POLKITQT-1 +# The following variables are defined: +# POLKITQT-1_FOUND - True if POLKITQT-1 has been found. +# POLKITQT-1_INCLUDE_DIR - The include directory. +# POLKITQT-1_LIB_DIR - The libraries directory. +# POLKITQT-1_LIBRARIES - Libraries needed to use PolkitQt-1. + +########## The PolkitQt-1 version ########## set(POLKITQT-1_VERSION_MAJOR @POLKITQT-1_VERSION_MAJOR@) set(POLKITQT-1_VERSION_MINOR @POLKITQT-1_VERSION_MINOR@) set(POLKITQT-1_VERSION_PATCH @POLKITQT-1_VERSION_PATCH@) set(POLKITQT-1_VERSION @POLKITQT-1_VERSION_STRING@) -set(POLKITQT-1_VERSION_STRING "@POLKITQT-1_VERSION_STRING@") +set(POLKITQT-1_VERSION_STRING "@POLKITQT-1_VERSION_STRING@") +######################################### -# set the directories +########## Install dirs ########## if(NOT POLKITQT-1_INSTALL_DIR) set(POLKITQT-1_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@") endif(NOT POLKITQT-1_INSTALL_DIR) -set(POLKITQT-1_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@/polkit-qt-1") -set(POLKITQT-1_LIB_DIR "@LIB_INSTALL_DIR@") +set_and_check(POLKITQT-1_INCLUDE_DIR "@PACKAGE_INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@") +set_and_check(POLKITQT-1_INCLUDE_DIRS "${POLKITQT-1_INCLUDE_DIR}") +set_and_check(POLKITQT-1_LIB_DIR "@PACKAGE_LIB_DESTINATION@") set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "${POLKITQT-1_INSTALL_DIR}/share/polkit-1/actions") +################################## -# Compatibility +########## Compatibility ########## if(WIN32) if(MINGW) - set(POLKITQT-1_CORE_LIBRARY "${POLKITQT-1_LIB_DIR}/libpolkit-qt-core-1.dll.a") - set(POLKITQT-1_AGENT_LIBRARY "${POLKITQT-1_LIB_DIR}/libpolkit-qt-agent-1.dll.a") - set(POLKITQT-1_GUI_LIBRARY "${POLKITQT-1_LIB_DIR}/libpolkit-qt-gui-1.dll.a") + set(POLKITQT-1_CORE_LIBRARY "${POLKITQT-1_LIB_DIR}/lib@[email protected]") + set(POLKITQT-1_AGENT_LIBRARY "${POLKITQT-1_LIB_DIR}/lib@[email protected]") + set(POLKITQT-1_GUI_LIBRARY "${POLKITQT-1_LIB_DIR}/lib@[email protected]") else(MINGW) - set(POLKITQT-1_CORE_LIBRARY "${POLKITQT-1_LIB_DIR}/polkit-qt-core-1.lib") - set(POLKITQT-1_AGENT_LIBRARY "${POLKITQT-1_LIB_DIR}/polkit-qt-agent-1.lib") - set(POLKITQT-1_GUI_LIBRARY "${POLKITQT-1_LIB_DIR}/polkit-qt-gui-1.lib") + set(POLKITQT-1_CORE_LIBRARY "${POLKITQT-1_LIB_DIR}/@[email protected]") + set(POLKITQT-1_AGENT_LIBRARY "${POLKITQT-1_LIB_DIR}/@[email protected]") + set(POLKITQT-1_GUI_LIBRARY "${POLKITQT-1_LIB_DIR}/@[email protected]") endif(MINGW) elseif(APPLE) - set(POLKITQT-1_CORE_LIBRARY "${POLKITQT-1_LIB_DIR}/libpolkit-qt-core-1.dylib") - set(POLKITQT-1_AGENT_LIBRARY "${POLKITQT-1_LIB_DIR}/libpolkit-qt-agent-1.dylib") - set(POLKITQT-1_GUI_LIBRARY "${POLKITQT-1_LIB_DIR}/libpolkit-qt-gui-1.dylib") + set(POLKITQT-1_CORE_LIBRARY "${POLKITQT-1_LIB_DIR}/lib@[email protected]") + set(POLKITQT-1_AGENT_LIBRARY "${POLKITQT-1_LIB_DIR}/lib@[email protected]") + set(POLKITQT-1_GUI_LIBRARY "${POLKITQT-1_LIB_DIR}/lib@[email protected]") else() - set(POLKITQT-1_CORE_LIBRARY "${POLKITQT-1_LIB_DIR}/libpolkit-qt-core-1.so") - set(POLKITQT-1_AGENT_LIBRARY "${POLKITQT-1_LIB_DIR}/libpolkit-qt-agent-1.so") - set(POLKITQT-1_GUI_LIBRARY "${POLKITQT-1_LIB_DIR}/libpolkit-qt-gui-1.so") + set(POLKITQT-1_CORE_LIBRARY "${POLKITQT-1_LIB_DIR}/lib@[email protected]") + set(POLKITQT-1_AGENT_LIBRARY "${POLKITQT-1_LIB_DIR}/lib@[email protected]") + set(POLKITQT-1_GUI_LIBRARY "${POLKITQT-1_LIB_DIR}/lib@[email protected]") endif() -set(POLKITQT-1_LIBRARIES ${POLKITQT-1_GUI_LIBRARY} ${POLKITQT-1_CORE_LIBRARY} ${POLKITQT-1_AGENT_LIBRARY}) +########## The PolkitQt-1 libraries ########## +# Load the exported targets. +include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]") +set(POLKITQT-1_LIBRARIES @POLKITQT-1_CAMEL_NAME@::Core @POLKITQT-1_CAMEL_NAME@::Gui @POLKITQT-1_CAMEL_NAME@::Agent) +########################################### + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/agent/CMakeLists.txt new/polkit-qt-1-0.112.0/agent/CMakeLists.txt --- old/polkit-qt-1-0.103.0/agent/CMakeLists.txt 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/agent/CMakeLists.txt 2014-07-10 10:37:25.000000000 +0200 @@ -1,25 +1,32 @@ -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} -) - set(polkit_qt_agent_SRCS polkitqt1-agent-session.cpp polkitqt1-agent-listener.cpp listeneradapter.cpp polkitqtlistener.cpp ) -automoc4_add_library(polkit-qt-agent-1 SHARED ${polkit_qt_agent_SRCS}) +add_library(${POLKITQT-1_AGENT_PCNAME} SHARED ${polkit_qt_agent_SRCS}) + +add_library(${POLKITQT-1_CAMEL_NAME}::Agent ALIAS ${POLKITQT-1_AGENT_PCNAME}) -target_link_libraries(polkit-qt-agent-1 +target_link_libraries(${POLKITQT-1_AGENT_PCNAME} + LINK_PUBLIC + ${QT_QTCORE_LIBRARY} + ${POLKITQT-1_CORE_PCNAME} + LINK_PRIVATE ${POLKIT_LIBRARIES} ${QT_QTCORE_LIBRARY} ${POLKIT_AGENT_LIBRARY} - polkit-qt-core-1 + ${GOBJECT_LIBRARIES} + ${GIO_LIBRARIES} ) -set_target_properties(polkit-qt-agent-1 PROPERTIES VERSION ${POLKITQT-1_LIBRARY_VERSION} +set_target_properties(${POLKITQT-1_AGENT_PCNAME} PROPERTIES VERSION ${POLKITQT-1_LIBRARY_VERSION} SOVERSION ${POLKITQT-1_ABI_VERSION} - DEFINE_SYMBOL MAKE_POLKITQT1_LIB) + DEFINE_SYMBOL MAKE_POLKITQT1_LIB + EXPORT_NAME Agent) + +target_include_directories(${POLKITQT-1_AGENT_PCNAME} INTERFACE $<INSTALL_INTERFACE:${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}>) -install(TARGETS polkit-qt-agent-1 ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS ${POLKITQT-1_AGENT_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${LIB_DESTINATION} + LIBRARY DESTINATION ${LIB_DESTINATION} + RUNTIME DESTINATION bin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/agent/listeneradapter.cpp new/polkit-qt-1-0.112.0/agent/listeneradapter.cpp --- old/polkit-qt-1-0.103.0/agent/listeneradapter.cpp 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/agent/listeneradapter.cpp 2014-07-10 10:37:25.000000000 +0200 @@ -142,5 +142,3 @@ } } - -#include "listeneradapter_p.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/agent/polkitqt1-agent-listener.cpp new/polkit-qt-1-0.112.0/agent/polkitqt1-agent-listener.cpp --- old/polkit-qt-1-0.103.0/agent/polkitqt1-agent-listener.cpp 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/agent/polkitqt1-agent-listener.cpp 2014-07-10 10:37:25.000000000 +0200 @@ -62,6 +62,10 @@ g_type_init(); d->listener = listener; + + if (d->listener != NULL) { + g_object_ref(d->listener); + } } Listener::~Listener() @@ -120,5 +124,3 @@ } } - -#include "polkitqt1-agent-listener.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/agent/polkitqt1-agent-session.cpp new/polkit-qt-1-0.112.0/agent/polkitqt1-agent-session.cpp --- old/polkit-qt-1-0.103.0/agent/polkitqt1-agent-session.cpp 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/agent/polkitqt1-agent-session.cpp 2014-07-10 10:37:25.000000000 +0200 @@ -66,6 +66,9 @@ , d(new Private) { d->polkitAgentSession = pkAgentSession; + if (d->polkitAgentSession) { + g_object_ref(d->polkitAgentSession); + } g_signal_connect(G_OBJECT(d->polkitAgentSession), "completed", G_CALLBACK(Private::completed), this); g_signal_connect(G_OBJECT(d->polkitAgentSession), "request", G_CALLBACK(Private::request), this); g_signal_connect(G_OBJECT(d->polkitAgentSession), "show-error", G_CALLBACK(Private::showError), this); @@ -165,5 +168,3 @@ Q_ASSERT(d->result); g_simple_async_result_set_error(d->result, POLKIT_ERROR, POLKIT_ERROR_FAILED, "%s", text.toUtf8().data()); } - -#include "polkitqt1-agent-session.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/agent/polkitqtlistener.cpp new/polkit-qt-1-0.112.0/agent/polkitqtlistener.cpp --- old/polkit-qt-1-0.103.0/agent/polkitqtlistener.cpp 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/agent/polkitqtlistener.cpp 2014-07-10 10:37:25.000000000 +0200 @@ -115,6 +115,13 @@ qDebug() << "Listener adapter polkit_qt_listener_initiate_authentication"; PolkitQtListener *listener = POLKIT_QT_LISTENER(agent_listener); + if (cancellable != NULL) { + g_cancellable_connect(cancellable, + G_CALLBACK(cancelled_cb), + agent_listener, + NULL); + } + // The result of asynchronous method will be created here and it will be pushed to the listener. GSimpleAsyncResult *result = g_simple_async_result_new((GObject *) listener, callback, user_data, agent_listener); qDebug() << "GSimpleAsyncResult:" << result; @@ -129,13 +136,6 @@ cancellable, result); - if (cancellable != NULL) { - g_signal_connect(cancellable, - "cancelled", - G_CALLBACK(cancelled_cb), - agent_listener); - } - } static gboolean polkit_qt_listener_initiate_authentication_finish(PolkitAgentListener *listener, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/cmake/modules/FindAutomoc4.cmake new/polkit-qt-1-0.112.0/cmake/modules/FindAutomoc4.cmake --- old/polkit-qt-1-0.103.0/cmake/modules/FindAutomoc4.cmake 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/cmake/modules/FindAutomoc4.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,81 +0,0 @@ -# - Try to find automoc4 -# Once done this will define -# -# AUTOMOC4_FOUND - automoc4 has been found -# AUTOMOC4_EXECUTABLE - the automoc4 tool -# AUTOMOC4_VERSION - the full version of automoc4 -# AUTOMOC4_VERSION_MAJOR, AUTOMOC4_VERSION_MINOR, AUTOMOC4_VERSION_PATCH - AUTOMOC4_VERSION -# broken into its components -# -# It also adds the following macros -# AUTOMOC4(<target> <SRCS_VAR>) -# Use this to run automoc4 on all files contained in the list <SRCS_VAR>. -# -# AUTOMOC4_MOC_HEADERS(<target> header1.h header2.h ...) -# Use this to add more header files to be processed with automoc4. -# -# AUTOMOC4_ADD_EXECUTABLE(<target_NAME> src1 src2 ...) -# This macro does the same as ADD_EXECUTABLE, but additionally -# adds automoc4 handling for all source files. -# -# AUTOMOC4_ADD_LIBRARY(<target_NAME> src1 src2 ...) -# This macro does the same as ADD_LIBRARY, but additionally -# adds automoc4 handling for all source files. - -# Internal helper macro, may change or be removed anytime: -# _ADD_AUTOMOC4_TARGET(<target_NAME> <SRCS_VAR>) -# -# Since version 0.9.88: -# The following two macros are only to be used for KDE4 projects -# and do something which makes sure automoc4 works for KDE. Don't -# use them anywhere else. -# _AUTOMOC4_KDE4_PRE_TARGET_HANDLING(<target_NAME> <SRCS_VAR>) -# _AUTOMOC4_KDE4_POST_TARGET_HANDLING(<target_NAME>) - - -# Copyright (c) 2008-2009, Alexander Neundorf, <[email protected]> -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - - -# check if we are inside KDESupport -if("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}") - # when building this project as part of kdesupport - set(AUTOMOC4_CONFIG_FILE "${KDESupport_SOURCE_DIR}/automoc/Automoc4Config.cmake") -else("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}") - # when building this project outside kdesupport - - # CMAKE_[SYSTEM_]PREFIX_PATH exists starting with cmake 2.6.0 - file(TO_CMAKE_PATH "$ENV{CMAKE_PREFIX_PATH}" _env_CMAKE_PREFIX_PATH) - file(TO_CMAKE_PATH "$ENV{CMAKE_LIBRARY_PATH}" _env_CMAKE_LIBRARY_PATH) - - find_file(AUTOMOC4_CONFIG_FILE NAMES Automoc4Config.cmake - PATH_SUFFIXES automoc4 lib/automoc4 lib64/automoc4 - PATHS ${_env_CMAKE_PREFIX_PATH} ${CMAKE_PREFIX_PATH} ${CMAKE_SYSTEM_PREFIX_PATH} - ${_env_CMAKE_LIBRARY_PATH} ${CMAKE_LIBRARY_PATH} ${CMAKE_SYSTEM_LIBRARY_PATH} - ${CMAKE_INSTALL_PREFIX} - NO_DEFAULT_PATH ) -endif("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}") - - -if(AUTOMOC4_CONFIG_FILE) - include(${AUTOMOC4_CONFIG_FILE}) - set(AUTOMOC4_FOUND TRUE) -else(AUTOMOC4_CONFIG_FILE) - set(AUTOMOC4_FOUND FALSE) -endif(AUTOMOC4_CONFIG_FILE) - -if (AUTOMOC4_FOUND) - if (NOT Automoc4_FIND_QUIETLY) - message(STATUS "Found Automoc4: ${AUTOMOC4_EXECUTABLE}") - endif (NOT Automoc4_FIND_QUIETLY) -else (AUTOMOC4_FOUND) - if (Automoc4_FIND_REQUIRED) - message(FATAL_ERROR "Did not find automoc4 (part of kdesupport).") - else (Automoc4_FIND_REQUIRED) - if (NOT Automoc4_FIND_QUIETLY) - message(STATUS "Did not find automoc4 (part of kdesupport).") - endif (NOT Automoc4_FIND_QUIETLY) - endif (Automoc4_FIND_REQUIRED) -endif (AUTOMOC4_FOUND) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/cmake/modules/FindGObject.cmake new/polkit-qt-1-0.112.0/cmake/modules/FindGObject.cmake --- old/polkit-qt-1-0.103.0/cmake/modules/FindGObject.cmake 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/cmake/modules/FindGObject.cmake 2014-07-10 10:37:25.000000000 +0200 @@ -6,70 +6,47 @@ # GOBJECT_LIBRARIES - the libraries needed to use GObject # GOBJECT_DEFINITIONS - Compiler switches required for using GObject -# Copyright (c) 2008 Helio Chissini de Castro, <[email protected]> -# (c)2006, Tim Beaulen <[email protected]> - - -IF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES) - # in cache already - SET(GObject_FIND_QUIETLY TRUE) -ELSE (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES) - SET(GObject_FIND_QUIETLY FALSE) -ENDIF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES) - -IF (NOT WIN32) - FIND_PACKAGE(PkgConfig) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - PKG_CHECK_MODULES(PKG_GOBJECT2 gobject-2.0) - SET(GOBJECT_DEFINITIONS ${PKG_GOBJECT2_CFLAGS}) -ENDIF (NOT WIN32) - -FIND_PATH(GOBJECT_INCLUDE_DIR gobject/gobject.h - PATHS - ${PKG_GOBJECT2_INCLUDE_DIRS} - /usr/include/glib-2.0/ - PATH_SUFFIXES glib-2.0 +# Copyright (c) 2011, Raphael Kubo da Costa <[email protected]> +# Copyright (c) 2006, Tim Beaulen <[email protected]> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +FIND_PACKAGE(PkgConfig) +PKG_CHECK_MODULES(PC_GOBJECT gobject-2.0) +SET(GOBJECT_DEFINITIONS ${PC_GOBJECT_CFLAGS_OTHER}) + +FIND_PATH(GOBJECT_INCLUDE_DIR gobject.h + HINTS + ${PC_GOBJECT_INCLUDEDIR} + ${PC_GOBJECT_INCLUDE_DIRS} + PATH_SUFFIXES glib-2.0/gobject/ ) FIND_LIBRARY(_GObjectLibs NAMES gobject-2.0 - PATHS - ${PKG_GOBJECT2_LIBRARY_DIRS} + HINTS + ${PC_GOBJECT_LIBDIR} + ${PC_GOBJECT_LIBRARY_DIRS} ) FIND_LIBRARY(_GModuleLibs NAMES gmodule-2.0 - PATHS - ${PKG_GOBJECT2_LIBRARY_DIRS} + HINTS + ${PC_GOBJECT_LIBDIR} + ${PC_GOBJECT_LIBRARY_DIRS} ) FIND_LIBRARY(_GThreadLibs NAMES gthread-2.0 - PATHS - ${PKG_GOBJECT2_LIBRARY_DIRS} + HINTS + ${PC_GOBJECT_LIBDIR} + ${PC_GOBJECT_LIBRARY_DIRS} ) FIND_LIBRARY(_GLibs NAMES glib-2.0 - PATHS - ${PKG_GOBJECT2_LIBRARY_DIRS} + HINTS + ${PC_GOBJECT_LIBDIR} + ${PC_GOBJECT_LIBRARY_DIRS} ) -IF (WIN32) -SET (GOBJECT_LIBRARIES ${_GObjectLibs} ${_GModuleLibs} ${_GThreadLibs} ${_GLibs}) -ELSE (WIN32) -SET (GOBJECT_LIBRARIES ${PKG_GOBJECT2_LIBRARIES}) -ENDIF (WIN32) - -IF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES) - SET(GOBJECT_FOUND TRUE) -ELSE (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES) - SET(GOBJECT_FOUND FALSE) -ENDIF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES) - -IF (GOBJECT_FOUND) - IF (NOT GObject_FIND_QUIETLY) - MESSAGE(STATUS "Found GObject libraries: ${GOBJECT_LIBRARIES}") - MESSAGE(STATUS "Found GObject includes : ${GOBJECT_INCLUDE_DIR}") - ENDIF (NOT GObject_FIND_QUIETLY) -ELSE (GOBJECT_FOUND) - IF (GObject_FIND_REQUIRED) - MESSAGE(STATUS "Could NOT find GObject") - ENDIF(GObject_FIND_REQUIRED) -ENDIF (GOBJECT_FOUND) +SET( GOBJECT_LIBRARIES ${_GObjectLibs} ${_GModuleLibs} ${_GThreadLibs} ${_GLibs} ) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GOBJECT DEFAULT_MSG GOBJECT_LIBRARIES GOBJECT_INCLUDE_DIR) -MARK_AS_ADVANCED(GOBJECT_INCLUDE_DIR GOBJECT_LIBRARIES) +MARK_AS_ADVANCED(GOBJECT_INCLUDE_DIR _GObjectLibs _GModuleLibs _GThreadLibs _GLibs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/core/CMakeLists.txt new/polkit-qt-1-0.112.0/core/CMakeLists.txt --- old/polkit-qt-1-0.103.0/core/CMakeLists.txt 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/core/CMakeLists.txt 2014-07-10 10:37:25.000000000 +0200 @@ -1,8 +1,3 @@ -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} -) - set(polkit_qt_core_SRCS polkitqt1-authority.cpp polkitqt1-identity.cpp @@ -12,20 +7,29 @@ polkitqt1-actiondescription.cpp ) -automoc4_add_library(polkit-qt-core-1 SHARED ${polkit_qt_core_SRCS}) +add_library(${POLKITQT-1_CORE_PCNAME} SHARED ${polkit_qt_core_SRCS}) + +add_library(${POLKITQT-1_CAMEL_NAME}::Core ALIAS ${POLKITQT-1_CORE_PCNAME}) -target_link_libraries(polkit-qt-core-1 +target_link_libraries(${POLKITQT-1_CORE_PCNAME} + LINK_PUBLIC ${QT_QTCORE_LIBRARY} + LINK_PRIVATE ${QT_QTDBUS_LIBRARY} - ${QT_QTXML_LIBRARY} ${POLKIT_LIBRARIES} ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES} ${GIO_LIBRARIES} ) -set_target_properties(polkit-qt-core-1 PROPERTIES VERSION ${POLKITQT-1_LIBRARY_VERSION} +set_target_properties(${POLKITQT-1_CORE_PCNAME} PROPERTIES VERSION ${POLKITQT-1_LIBRARY_VERSION} SOVERSION ${POLKITQT-1_ABI_VERSION} - DEFINE_SYMBOL MAKE_POLKITQT1_LIB) + DEFINE_SYMBOL MAKE_POLKITQT1_LIB + EXPORT_NAME Core) + +target_include_directories(${POLKITQT-1_CORE_PCNAME} INTERFACE $<INSTALL_INTERFACE:${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}>) + +install(TARGETS ${POLKITQT-1_CORE_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${LIB_DESTINATION} + LIBRARY DESTINATION ${LIB_DESTINATION} + RUNTIME DESTINATION bin) -install(TARGETS polkit-qt-core-1 ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/core/polkitqt1-authority.cpp new/polkit-qt-1-0.112.0/core/polkitqt1-authority.cpp --- old/polkit-qt-1-0.103.0/core/polkitqt1-authority.cpp 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/core/polkitqt1-authority.cpp 2014-07-10 10:37:25.000000000 +0200 @@ -24,6 +24,7 @@ #include "polkitqt1-authority.h" #include <QtDBus/QDBusInterface> +#include <QtDBus/QDBusMessage> #include <QtDBus/QDBusReply> #include <polkit/polkit.h> @@ -256,7 +257,7 @@ { // FIXME: This code seems to be nonfunctional - it needs to be fixed somewhere (is it Qt BUG?) QDBusConnection::systemBus().connect(service, path, interface, name, - q, SLOT(dbusFilter(const QDBusMessage &))); + q, SLOT(dbusFilter(QDBusMessage))); } void Authority::Private::dbusFilter(const QDBusMessage &message) @@ -852,4 +853,4 @@ } -#include "polkitqt1-authority.moc" +#include "moc_polkitqt1-authority.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/core/polkitqt1-details.cpp new/polkit-qt-1-0.112.0/core/polkitqt1-details.cpp --- old/polkit-qt-1-0.103.0/core/polkitqt1-details.cpp 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/core/polkitqt1-details.cpp 2014-07-10 10:37:25.000000000 +0200 @@ -35,11 +35,15 @@ : QSharedData(other) , polkitDetails(other.polkitDetails) { - g_object_ref(polkitDetails); + if (polkitDetails != NULL) { + g_object_ref(polkitDetails); + } } ~Data() { - g_object_unref(polkitDetails); + if (polkitDetails != NULL) { + g_object_unref(polkitDetails); + } } PolkitDetails *polkitDetails; @@ -57,6 +61,10 @@ { g_type_init(); d->polkitDetails = pkDetails; + + if (d->polkitDetails != NULL) { + g_object_ref(d->polkitDetails); + } } Details::~Details() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/core/polkitqt1-subject.cpp new/polkit-qt-1-0.112.0/core/polkitqt1-subject.cpp --- old/polkit-qt-1-0.103.0/core/polkitqt1-subject.cpp 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/core/polkitqt1-subject.cpp 2014-07-10 10:37:25.000000000 +0200 @@ -58,6 +58,10 @@ { g_type_init(); d->subject = subject; + + if (d->subject != NULL) { + g_object_ref(d->subject); + } } Subject::Subject(const PolkitQt1::Subject& other) @@ -88,6 +92,9 @@ void Subject::setSubject(PolkitSubject *subject) { + if (d->subject != NULL) { + g_object_unref(d->subject); + } d->subject = subject; } @@ -115,13 +122,13 @@ UnixProcessSubject::UnixProcessSubject(qint64 pid) : Subject() { - setSubject(polkit_unix_process_new(pid)); + setSubject(polkit_unix_process_new_for_owner(pid, 0, -1)); } UnixProcessSubject::UnixProcessSubject(qint64 pid, quint64 startTime) : Subject() { - setSubject(polkit_unix_process_new_full(pid, startTime)); + setSubject(polkit_unix_process_new_for_owner(pid, startTime, -1)); } UnixProcessSubject::UnixProcessSubject(PolkitUnixProcess *pkUnixProcess) @@ -140,6 +147,11 @@ return polkit_unix_process_get_start_time((PolkitUnixProcess *) subject()); } +qint64 UnixProcessSubject::uid() const +{ + return polkit_unix_process_get_uid((PolkitUnixProcess *) subject()); +} + void UnixProcessSubject::setPid(qint64 pid) { polkit_unix_process_set_pid((PolkitUnixProcess *) subject(), pid); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/core/polkitqt1-subject.h new/polkit-qt-1-0.112.0/core/polkitqt1-subject.h --- old/polkit-qt-1-0.103.0/core/polkitqt1-subject.h 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/core/polkitqt1-subject.h 2014-07-10 10:37:25.000000000 +0200 @@ -154,6 +154,13 @@ qint64 startTime() const; /** + * Returns Unix process UID. + * + * \return A UID of associated Unix process. + */ + qint64 uid() const; + + /** * Sets Unix process PID. * * \param pid An Unix process PID. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/examples/CMakeLists.txt new/polkit-qt-1-0.112.0/examples/CMakeLists.txt --- old/polkit-qt-1-0.103.0/examples/CMakeLists.txt 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/examples/CMakeLists.txt 2014-07-10 10:37:25.000000000 +0200 @@ -1,9 +1,7 @@ -install(FILES org.qt.policykit.examples.policy DESTINATION ${SHARE_INSTALL_PREFIX}/polkit-1/actions/) +install(FILES org.qt.policykit.examples.policy DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/polkit-1/actions/) include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/gui ) @@ -16,28 +14,25 @@ icons/icons.qrc ) -QT4_WRAP_CPP(polkit_example_MOC_SRCS - PkExample.h -) - QT4_WRAP_UI(polkit_example_UI_SRCS PkExample.ui ) QT4_ADD_RESOURCES (qtsourceview_RC_SRCS ${polkit_example_RESOUCES}) -add_executable(polkit-example +add_executable(${POLKITQT-1_EXAMPLE} ${polkit_example_SRCS} - ${polkit_example_MOC_SRCS} ${polkit_example_UI_SRCS} ${qtsourceview_RC_SRCS} ) -target_link_libraries(polkit-example +target_link_libraries(${POLKITQT-1_EXAMPLE} ${QT_QTCORE_LIBRARY} + ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} - polkit-qt-gui-1 - polkit-qt-core-1 + ${POLKITQT-1_GUI_PCNAME} + ${POLKITQT-1_CORE_PCNAME} + ${GOBJECT_LIBRARIES} ) #--------Helper Application @@ -49,7 +44,7 @@ string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i}) set(_target ${CMAKE_CURRENT_BINARY_DIR}/${_output_file}) configure_file(${_service_file} ${_target}) - install(FILES ${_target} DESTINATION ${SHARE_INSTALL_PREFIX}/dbus-1/system-services ) + install(FILES ${_target} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/dbus-1/system-services ) #install(FILES ${_target} DESTINATION ${_install_dir}) endforeach (_i ${ARGN}) endmacro(dbus_add_activation_system_service _sources) @@ -65,22 +60,19 @@ PkExampleHelper ) -QT4_WRAP_CPP(polkit_example_helper_MOC_SRCS - PkExampleHelper.h -) - -add_executable(polkit-example-helper +add_executable(${POLKITQT-1_EXAMPLE_HELPER} ${polkit_example_helper_SRCS} - ${polkit_example_helper_MOC_SRCS} ) # see our helper is pretty small :D -target_link_libraries(polkit-example-helper +target_link_libraries(${POLKITQT-1_EXAMPLE_HELPER} ${QT_QTCORE_LIBRARY} - polkit-qt-core-1 + ${QT_QTXML_LIBRARY} + ${QT_QTDBUS_LIBRARY} + ${POLKITQT-1_GUI_PCNAME} ) -install(TARGETS polkit-example-helper DESTINATION ${BIN_INSTALL_DIR}) +install(TARGETS ${POLKITQT-1_EXAMPLE_HELPER} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}) dbus_add_activation_system_service(org.qt.policykit.examples.service.in) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/examples/PkExample.cpp new/polkit-qt-1-0.112.0/examples/PkExample.cpp --- old/polkit-qt-1-0.103.0/examples/PkExample.cpp 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/examples/PkExample.cpp 2014-07-10 10:37:25.000000000 +0200 @@ -59,7 +59,7 @@ // This signal was propagated from the QAbstractButton just for // convenience in this case we don't have any benefit but the code // look cleaner - connect(bt, SIGNAL(clicked(QAbstractButton *, bool)), bt, SLOT(activate())); + connect(bt, SIGNAL(clicked(QAbstractButton*,bool)), bt, SLOT(activate())); // this is the Action activated signal, it is always emmited whenever // someone click and get authorized to do the action connect(bt, SIGNAL(authorized()), this, SLOT(actionActivated())); @@ -70,7 +70,7 @@ menuActions->addAction(qobject_cast<Action *>(bt)); toolBar->addAction(qobject_cast<Action *>(bt)); connect(bt, SIGNAL(triggered(bool)), this, SLOT(activateAction())); - connect(bt, SIGNAL(clicked(QAbstractButton *, bool)), bt, SLOT(activate())); + connect(bt, SIGNAL(clicked(QAbstractButton*,bool)), bt, SLOT(activate())); connect(bt, SIGNAL(authorized()), this, SLOT(actionActivated())); bt = new ActionButton(bleedPB, "org.qt.policykit.examples.bleed", this); @@ -79,7 +79,7 @@ menuActions->addAction(qobject_cast<Action *>(bt)); toolBar->addAction(qobject_cast<Action *>(bt)); connect(bt, SIGNAL(triggered(bool)), this, SLOT(activateAction())); - connect(bt, SIGNAL(clicked(QAbstractButton *, bool)), bt, SLOT(activate())); + connect(bt, SIGNAL(clicked(QAbstractButton*,bool)), bt, SLOT(activate())); connect(bt, SIGNAL(authorized()), this, SLOT(actionActivated())); // This action is more customized @@ -103,7 +103,7 @@ menuActions->addAction(qobject_cast<Action *>(bt)); toolBar->addAction(qobject_cast<Action *>(bt)); connect(bt, SIGNAL(triggered(bool)), this, SLOT(activateAction())); - connect(bt, SIGNAL(clicked(QAbstractButton *, bool)), bt, SLOT(activate())); + connect(bt, SIGNAL(clicked(QAbstractButton*,bool)), bt, SLOT(activate())); connect(bt, SIGNAL(authorized()), this, SLOT(actionActivated())); bt = new ActionButton(deletePB, "org.qt.policykit.examples.delete", this); @@ -114,7 +114,7 @@ menuActions->addAction(qobject_cast<Action *>(bt)); toolBar->addAction(qobject_cast<Action *>(bt)); connect(bt, SIGNAL(triggered(bool)), this, SLOT(activateAction())); - connect(bt, SIGNAL(clicked(QAbstractButton *, bool)), bt, SLOT(activate())); + connect(bt, SIGNAL(clicked(QAbstractButton*,bool)), bt, SLOT(activate())); connect(bt, SIGNAL(authorized()), this, SLOT(actionActivated())); bt = new ActionButton(listenPB, "org.qt.policykit.examples.listen", this); @@ -125,7 +125,7 @@ menuActions->addAction(qobject_cast<Action *>(bt)); toolBar->addAction(qobject_cast<Action *>(bt)); connect(bt, SIGNAL(triggered(bool)), this, SLOT(activateAction())); - connect(bt, SIGNAL(clicked(QAbstractButton *, bool)), bt, SLOT(activate())); + connect(bt, SIGNAL(clicked(QAbstractButton*,bool)), bt, SLOT(activate())); connect(bt, SIGNAL(authorized()), this, SLOT(actionActivated())); bt = new ActionButton(setPB, "org.qt.policykit.examples.set", this); @@ -136,7 +136,7 @@ menuActions->addAction(qobject_cast<Action *>(bt)); toolBar->addAction(qobject_cast<Action *>(bt)); connect(bt, SIGNAL(triggered(bool)), this, SLOT(activateAction())); - connect(bt, SIGNAL(clicked(QAbstractButton *, bool)), bt, SLOT(activate())); + connect(bt, SIGNAL(clicked(QAbstractButton*,bool)), bt, SLOT(activate())); connect(bt, SIGNAL(authorized()), this, SLOT(actionActivated())); bt = new ActionButton(shoutPB, "org.qt.policykit.examples.shout", this); @@ -149,7 +149,7 @@ menuActions->addAction(qobject_cast<Action *>(bt)); toolBar->addAction(qobject_cast<Action *>(bt)); connect(bt, SIGNAL(triggered(bool)), this, SLOT(activateAction())); - connect(bt, SIGNAL(clicked(QAbstractButton *, bool)), bt, SLOT(activate())); + connect(bt, SIGNAL(clicked(QAbstractButton*,bool)), bt, SLOT(activate())); connect(bt, SIGNAL(authorized()), this, SLOT(actionActivated())); // test configChanged diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/examples/agent/CMakeLists.txt new/polkit-qt-1-0.112.0/examples/agent/CMakeLists.txt --- old/polkit-qt-1-0.103.0/examples/agent/CMakeLists.txt 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/examples/agent/CMakeLists.txt 2014-07-10 10:37:25.000000000 +0200 @@ -1,6 +1,4 @@ include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/agent ) @@ -10,15 +8,14 @@ klistener.cpp ) -automoc4(polkit-agent-example polkit_agent_example_SRCS) - -add_executable(polkit-agent-example +add_executable(${POLKITQT-1_AGENT_EXAMPLE} ${polkit_agent_example_SRCS} ) -target_link_libraries(polkit-agent-example +target_link_libraries(${POLKITQT-1_AGENT_EXAMPLE} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} - polkit-qt-agent-1 - polkit-qt-core-1 + ${POLKITQT-1_AGENT_PCNAME} + ${POLKITQT-1_CORE_PCNAME} + ${GOBJECT_LIBRARIES} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/examples/agent/klistener.cpp new/polkit-qt-1-0.112.0/examples/agent/klistener.cpp --- old/polkit-qt-1-0.103.0/examples/agent/klistener.cpp 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/examples/agent/klistener.cpp 2014-07-10 10:37:25.000000000 +0200 @@ -51,7 +51,7 @@ qDebug() << identity.toString(); Session *session; session = new Session(identity, cookie, result); - connect(session, SIGNAL(request(QString, bool)), this, SLOT(request(QString, bool))); + connect(session, SIGNAL(request(QString,bool)), this, SLOT(request(QString,bool))); connect(session, SIGNAL(completed(bool)), this, SLOT(completed(bool))); connect(session, SIGNAL(showError(QString)), this, SLOT(showError(QString))); connect(session, SIGNAL(showInfo(QString)), this, SLOT(showInfo(QString))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/examples/main.cpp new/polkit-qt-1-0.112.0/examples/main.cpp --- old/polkit-qt-1-0.103.0/examples/main.cpp 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/examples/main.cpp 2014-07-10 10:37:25.000000000 +0200 @@ -19,7 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * ***************************************************************************/ -#include <QtGui/QApplication> +#include <QApplication> #include "PkExample.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/examples/org.qt.policykit.examples.service.in new/polkit-qt-1-0.112.0/examples/org.qt.policykit.examples.service.in --- old/polkit-qt-1-0.103.0/examples/org.qt.policykit.examples.service.in 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/examples/org.qt.policykit.examples.service.in 2014-07-10 10:37:25.000000000 +0200 @@ -1,5 +1,5 @@ [D-BUS Service] Name=org.qt.policykit.examples -Exec=@BIN_INSTALL_DIR@/polkit-example-helper +Exec=@BIN_INSTALL_DIR@/@POLKITQT-1_EXAMPLE_HELPER@ User=root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/gui/CMakeLists.txt new/polkit-qt-1-0.112.0/gui/CMakeLists.txt --- old/polkit-qt-1-0.103.0/gui/CMakeLists.txt 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/gui/CMakeLists.txt 2014-07-10 10:37:25.000000000 +0200 @@ -1,26 +1,30 @@ -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} -) - set(polkit_qt_gui_SRCS polkitqt1-gui-action.cpp polkitqt1-gui-actionbutton.cpp polkitqt1-gui-actionbuttons.cpp ) -automoc4_add_library(polkit-qt-gui-1 SHARED ${polkit_qt_gui_SRCS}) +add_library(${POLKITQT-1_GUI_PCNAME} SHARED ${polkit_qt_gui_SRCS}) -target_link_libraries(polkit-qt-gui-1 - ${QT_QTCORE_LIBRARY} +add_library(${POLKITQT-1_CAMEL_NAME}::Gui ALIAS ${POLKITQT-1_GUI_PCNAME}) + +target_link_libraries(${POLKITQT-1_GUI_PCNAME} + LINK_PUBLIC + ${POLKITQT-1_CORE_PCNAME} ${QT_QTGUI_LIBRARY} + LINK_PRIVATE + ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${POLKIT_LIBRARIES} - polkit-qt-core-1 ) -set_target_properties(polkit-qt-gui-1 PROPERTIES VERSION ${POLKITQT-1_LIBRARY_VERSION} +set_target_properties(${POLKITQT-1_GUI_PCNAME} PROPERTIES VERSION ${POLKITQT-1_LIBRARY_VERSION} SOVERSION ${POLKITQT-1_ABI_VERSION} - DEFINE_SYMBOL MAKE_POLKITQT1_LIB) + DEFINE_SYMBOL MAKE_POLKITQT1_LIB + EXPORT_NAME Gui) + +target_include_directories(${POLKITQT-1_GUI_PCNAME} INTERFACE $<INSTALL_INTERFACE:${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}>) -install(TARGETS polkit-qt-gui-1 ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS ${POLKITQT-1_GUI_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${LIB_DESTINATION} + LIBRARY DESTINATION ${LIB_DESTINATION} + RUNTIME DESTINATION bin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/gui/polkitqt1-gui-action.cpp new/polkit-qt-1-0.112.0/gui/polkitqt1-gui-action.cpp --- old/polkit-qt-1-0.103.0/gui/polkitqt1-gui-action.cpp 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/gui/polkitqt1-gui-action.cpp 2014-07-10 10:37:25.000000000 +0200 @@ -512,4 +512,4 @@ } -#include "polkitqt1-gui-action.moc" +#include "moc_polkitqt1-gui-action.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/gui/polkitqt1-gui-action.h new/polkit-qt-1-0.112.0/gui/polkitqt1-gui-action.h --- old/polkit-qt-1-0.103.0/gui/polkitqt1-gui-action.h 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/gui/polkitqt1-gui-action.h 2014-07-10 10:37:25.000000000 +0200 @@ -24,7 +24,7 @@ #include "polkitqt1-export.h" -#include <QtGui/QAction> +#include <QAction> namespace PolkitQt1 { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/gui/polkitqt1-gui-actionbutton.cpp new/polkit-qt-1-0.112.0/gui/polkitqt1-gui-actionbutton.cpp --- old/polkit-qt-1-0.103.0/gui/polkitqt1-gui-actionbutton.cpp 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/gui/polkitqt1-gui-actionbutton.cpp 2014-07-10 10:37:25.000000000 +0200 @@ -163,4 +163,4 @@ } -#include "polkitqt1-gui-actionbutton.moc" +#include "moc_polkitqt1-gui-actionbutton.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/gui/polkitqt1-gui-actionbutton_p.h new/polkit-qt-1-0.112.0/gui/polkitqt1-gui-actionbutton_p.h --- old/polkit-qt-1-0.103.0/gui/polkitqt1-gui-actionbutton_p.h 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/gui/polkitqt1-gui-actionbutton_p.h 2014-07-10 10:37:25.000000000 +0200 @@ -24,7 +24,7 @@ #include <polkitqt1-gui-actionbutton.h> #include <QtCore/QList> -#include <QtGui/QAbstractButton> +#include <QAbstractButton> /** * \internal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/gui/polkitqt1-gui-actionbuttons.cpp new/polkit-qt-1-0.112.0/gui/polkitqt1-gui-actionbuttons.cpp --- old/polkit-qt-1-0.103.0/gui/polkitqt1-gui-actionbuttons.cpp 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/gui/polkitqt1-gui-actionbuttons.cpp 2014-07-10 10:37:25.000000000 +0200 @@ -69,5 +69,3 @@ } } - -#include "polkitqt1-gui-actionbuttons.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/polkit-qt-1.pc.cmake new/polkit-qt-1-0.112.0/polkit-qt-1.pc.cmake --- old/polkit-qt-1-0.103.0/polkit-qt-1.pc.cmake 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/polkit-qt-1.pc.cmake 2014-07-10 10:37:25.000000000 +0200 @@ -1,11 +1,11 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ -libdir=@LIB_INSTALL_DIR@ -includedir=@CMAKE_INSTALL_PREFIX@/include +libdir=@LIB_DESTINATION@ +includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@ -Name: polkit-qt-1 +Name: @POLKITQT-1_PCNAME@ Description: Convenience library for using polkit with a Qt-styled API Version: @POLKITQT-1_VERSION_STRING@ -Requires: polkit-qt-core-1 polkit-qt-gui-1 polkit-qt-agent-1 -Libs: -L${libdir} -lpolkit-qt-core-1 -lpolkit-qt-gui-1 -lpolkit-qt-agent-1 +Requires: @POLKITQT-1_CORE_PCNAME@ @POLKITQT-1_GUI_PCNAME@ @POLKITQT-1_AGENT_PCNAME@ +Libs: -L${libdir} -l@POLKITQT-1_CORE_PCNAME@ -l@POLKITQT-1_GUI_PCNAME@ -l@POLKITQT-1_AGENT_PCNAME@ Cflags: -I${includedir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/polkit-qt-agent-1.pc.cmake new/polkit-qt-1-0.112.0/polkit-qt-agent-1.pc.cmake --- old/polkit-qt-1-0.103.0/polkit-qt-agent-1.pc.cmake 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/polkit-qt-agent-1.pc.cmake 2014-07-10 10:37:25.000000000 +0200 @@ -1,11 +1,11 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ -libdir=@LIB_INSTALL_DIR@ -includedir=@CMAKE_INSTALL_PREFIX@/include +libdir=@LIB_DESTINATION@ +includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@ -Name: polkit-qt-agent-1 +Name: @POLKITQT-1_AGENT_PCNAME@ Description: Convenience library for using polkit Agent with a Qt-styled API Version: @POLKITQT-1_VERSION_STRING@ Requires: QtCore QtGui -Libs: -L${libdir} -lpolkit-qt-agent-1 +Libs: -L${libdir} -l@POLKITQT-1_AGENT_PCNAME@ Cflags: -I${includedir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/polkit-qt-core-1.pc.cmake new/polkit-qt-1-0.112.0/polkit-qt-core-1.pc.cmake --- old/polkit-qt-1-0.103.0/polkit-qt-core-1.pc.cmake 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/polkit-qt-core-1.pc.cmake 2014-07-10 10:37:25.000000000 +0200 @@ -1,11 +1,11 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ -libdir=@LIB_INSTALL_DIR@ -includedir=@CMAKE_INSTALL_PREFIX@/include +libdir=@LIB_DESTINATION@ +includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@ -Name: polkit-qt-core-1 +Name: @POLKITQT-1_CORE_PCNAME@ Description: Convenience library for using polkit with a Qt-styled API, non-GUI classes Version: @POLKITQT-1_VERSION_STRING@ Requires: QtCore -Libs: -L${libdir} -lpolkit-qt-core-1 +Libs: -L${libdir} -l@POLKITQT-1_CORE_PCNAME@ Cflags: -I${includedir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/polkit-qt-gui-1.pc.cmake new/polkit-qt-1-0.112.0/polkit-qt-gui-1.pc.cmake --- old/polkit-qt-1-0.103.0/polkit-qt-gui-1.pc.cmake 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/polkit-qt-gui-1.pc.cmake 2014-07-10 10:37:25.000000000 +0200 @@ -1,11 +1,11 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ -libdir=@LIB_INSTALL_DIR@ -includedir=@CMAKE_INSTALL_PREFIX@/include +libdir=@LIB_DESTINATION@ +includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@ -Name: polkit-qt-gui-1 +Name: @POLKITQT-1_GUI_PCNAME@ Description: Convenience library for using polkit with a Qt-styled API, GUI classes Version: @POLKITQT-1_VERSION_STRING@ -Requires: QtCore QtGui polkit-qt-core-1 -Libs: -L${libdir} -lpolkit-qt-gui-1 +Requires: QtCore QtGui @POLKITQT-1_CORE_PCNAME@ +Libs: -L${libdir} -l@POLKITQT-1_GUI_PCNAME@ Cflags: -I${includedir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/polkit-qt5-1.pc.cmake new/polkit-qt-1-0.112.0/polkit-qt5-1.pc.cmake --- old/polkit-qt-1-0.103.0/polkit-qt5-1.pc.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/polkit-qt-1-0.112.0/polkit-qt5-1.pc.cmake 2014-07-10 10:37:25.000000000 +0200 @@ -0,0 +1,11 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@CMAKE_INSTALL_PREFIX@ +libdir=@LIB_DESTINATION@ +includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@ + +Name: @POLKITQT-1_PCNAME@ +Description: Convenience library for using polkit with a Qt-styled API +Version: @POLKITQT-1_VERSION_STRING@ +Requires: @POLKITQT-1_CORE_PCNAME@ @POLKITQT-1_GUI_PCNAME@ @POLKITQT-1_AGENT_PCNAME@ +Libs: -L${libdir} -l@POLKITQT-1_CORE_PCNAME@ -l@POLKITQT-1_GUI_PCNAME@ -l@POLKITQT-1_AGENT_PCNAME@ +Cflags: -I${includedir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/polkit-qt5-agent-1.pc.cmake new/polkit-qt-1-0.112.0/polkit-qt5-agent-1.pc.cmake --- old/polkit-qt-1-0.103.0/polkit-qt5-agent-1.pc.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/polkit-qt-1-0.112.0/polkit-qt5-agent-1.pc.cmake 2014-07-10 10:37:25.000000000 +0200 @@ -0,0 +1,11 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@CMAKE_INSTALL_PREFIX@ +libdir=@LIB_DESTINATION@ +includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@ + +Name: @POLKITQT-1_AGENT_PCNAME@ +Description: Convenience library for using polkit Agent with a Qt-styled API +Version: @POLKITQT-1_VERSION_STRING@ +Requires: Qt5Core Qt5Gui +Libs: -L${libdir} -l@POLKITQT-1_AGENT_PCNAME@ +Cflags: -I${includedir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/polkit-qt5-core-1.pc.cmake new/polkit-qt-1-0.112.0/polkit-qt5-core-1.pc.cmake --- old/polkit-qt-1-0.103.0/polkit-qt5-core-1.pc.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/polkit-qt-1-0.112.0/polkit-qt5-core-1.pc.cmake 2014-07-10 10:37:25.000000000 +0200 @@ -0,0 +1,11 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@CMAKE_INSTALL_PREFIX@ +libdir=@LIB_DESTINATION@ +includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@ + +Name: @POLKITQT-1_CORE_PCNAME@ +Description: Convenience library for using polkit with a Qt-styled API, non-GUI classes +Version: @POLKITQT-1_VERSION_STRING@ +Requires: Qt5Core +Libs: -L${libdir} -l@POLKITQT-1_CORE_PCNAME@ +Cflags: -I${includedir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/polkit-qt5-gui-1.pc.cmake new/polkit-qt-1-0.112.0/polkit-qt5-gui-1.pc.cmake --- old/polkit-qt-1-0.103.0/polkit-qt5-gui-1.pc.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/polkit-qt-1-0.112.0/polkit-qt5-gui-1.pc.cmake 2014-07-10 10:37:25.000000000 +0200 @@ -0,0 +1,11 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@CMAKE_INSTALL_PREFIX@ +libdir=@LIB_DESTINATION@ +includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@ + +Name: @POLKITQT-1_GUI_PCNAME@ +Description: Convenience library for using polkit with a Qt-styled API, GUI classes +Version: @POLKITQT-1_VERSION_STRING@ +Requires: Qt5Core Qt5Gui @POLKITQT-1_CORE_PCNAME@ +Libs: -L${libdir} -l@POLKITQT-1_GUI_PCNAME@ +Cflags: -I${includedir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.103.0/test/CMakeLists.txt new/polkit-qt-1-0.112.0/test/CMakeLists.txt --- old/polkit-qt-1-0.103.0/test/CMakeLists.txt 2011-12-14 10:19:36.000000000 +0100 +++ new/polkit-qt-1-0.112.0/test/CMakeLists.txt 2014-07-10 10:37:25.000000000 +0200 @@ -1,20 +1,19 @@ enable_testing() include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/agent ) -automoc4_add_executable(polkit-qt-test +add_executable(polkit-qt-test test.cpp ) target_link_libraries(polkit-qt-test ${QT_QTCORE_LIBRARY} + ${QT_QTDBUS_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTGUI_LIBRARY} - polkit-qt-core-1 + ${POLKITQT-1_CORE_PCNAME} ) add_test(BaseTest ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-test)
