diff --git a/0001-Fix-include-libdir-paths-when-they-re-absolute.patch b/0001-Fix-include-libdir-paths-when-they-re-absolute.patch deleted file mode 100644 index 7700a35..0000000 --- a/0001-Fix-include-libdir-paths-when-they-re-absolute.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 563cb938348d7bdd1db4aa861840e343b67bccec Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Wed, 5 Feb 2014 13:18:07 +0100 -Subject: [PATCH] Fix include/libdir paths when they're absolute - -Possibly only applies to our package build, not upstreamable as it is. ---- - PolkitQt5-1Config.cmake.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/PolkitQt5-1Config.cmake.in b/PolkitQt5-1Config.cmake.in -index 14e1f73..f7caa8c 100644 ---- a/PolkitQt5-1Config.cmake.in -+++ b/PolkitQt5-1Config.cmake.in -@@ -13,8 +13,8 @@ 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 "${POLKITQT-1_INSTALL_DIR}/@INCLUDE_INSTALL_DIR@/polkit-qt5-1") --set(POLKITQT-1_LIB_DIR "${POLKITQT-1_INSTALL_DIR}/@LIB_INSTALL_DIR@") -+set(POLKITQT-1_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@/polkit-qt5-1") -+set(POLKITQT-1_LIB_DIR "@LIB_INSTALL_DIR@") - set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "${POLKITQT-1_INSTALL_DIR}/share/polkit-1/actions") - - # Compatibility --- -1.8.5.3 - diff --git a/0001-Include-moc-generated-files.patch b/0001-Include-moc-generated-files.patch deleted file mode 100644 index fac341f..0000000 --- a/0001-Include-moc-generated-files.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 0f5aa46c8fd67c1b40431c628193082203372ab6 Mon Sep 17 00:00:00 2001 -From: Pier Luigi Fiorini -Date: Mon, 31 Dec 2012 09:26:33 +0100 -Subject: [PATCH 1/5] Include moc generated files. - -If we don't include moc generated files, we won't be able to -link the libraries to any program because of unresolved symbols. ---- - CMakeLists.txt | 4 ++++ - agent/polkitqt1-agent-listener.cpp | 2 +- - agent/polkitqt1-agent-session.cpp | 2 +- - gui/polkitqt1-gui-actionbutton.cpp | 2 -- - 4 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cef6a8e..c760031 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,6 +2,10 @@ - project("PolkitQt-1") - - cmake_minimum_required(VERSION 2.8.11) -+ -+# Instruct CMake to run moc automatically when needed -+set(CMAKE_AUTOMOC ON) -+ - find_package(ECM 0.0.6 REQUIRED NO_MODULE) - - set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH}) -diff --git a/agent/polkitqt1-agent-listener.cpp b/agent/polkitqt1-agent-listener.cpp -index a38b34d..c96d242 100644 ---- a/agent/polkitqt1-agent-listener.cpp -+++ b/agent/polkitqt1-agent-listener.cpp -@@ -121,4 +121,4 @@ const PolkitAgentListener *Listener::listener() - - } - -- -+#include "moc_polkitqt1-agent-listener.cpp" -diff --git a/agent/polkitqt1-agent-session.cpp b/agent/polkitqt1-agent-session.cpp -index 77c6e75..1f875d0 100644 ---- a/agent/polkitqt1-agent-session.cpp -+++ b/agent/polkitqt1-agent-session.cpp -@@ -166,4 +166,4 @@ void AsyncResult::setError(const QString &text) - g_simple_async_result_set_error(d->result, POLKIT_ERROR, POLKIT_ERROR_FAILED, "%s", text.toUtf8().data()); - } - -- -+#include "moc_polkitqt1-agent-session.cpp" -diff --git a/gui/polkitqt1-gui-actionbutton.cpp b/gui/polkitqt1-gui-actionbutton.cpp -index dabc264..e2a9ee5 100644 ---- a/gui/polkitqt1-gui-actionbutton.cpp -+++ b/gui/polkitqt1-gui-actionbutton.cpp -@@ -165,5 +165,3 @@ void ActionButtonPrivate::streamClicked(bool c) - - //needed because of Q_PRIVATE_SLOT - #include "moc_polkitqt1-gui-actionbutton.cpp" -- -- --- -1.8.5.3 - diff --git a/0001-Rename-polkit-qt-1-to-polkit-qt5-1.patch b/0001-Rename-polkit-qt-1-to-polkit-qt5-1.patch deleted file mode 100644 index fc08399..0000000 --- a/0001-Rename-polkit-qt-1-to-polkit-qt5-1.patch +++ /dev/null @@ -1,1521 +0,0 @@ -From 3385d024ee5becd5362a69ec81ccfc67d49ee170 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Thu, 6 Feb 2014 14:41:43 +0100 -Subject: [PATCH] Rename polkit-qt-1 to polkit-qt5-1 - -This is done to be able to coexist with qt4-based polkit-qt-1. ---- - CMakeLists.txt | 56 ++++++------ - CMakeLists.txt.orig | 167 +++++++++++++++++++++++++++++++++++ - CMakeLists.txt.rej | 23 +++++ - INSTALL | 6 +- - Mainpage.dox | 28 +++--- - PolkitQt-1Config.cmake.in | 41 --------- - PolkitQt5-1Config.cmake.in | 41 +++++++++ - README | 6 +- - README.porting | 8 +- - TODO | 4 +- - agent/CMakeLists.txt | 12 +-- - agent/listeneradapter.cpp | 2 +- - agent/listeneradapter_p.h | 2 +- - agent/polkitqt1-agent-listener.cpp | 2 +- - agent/polkitqt1-agent-listener.h | 2 +- - agent/polkitqtlistener.cpp | 4 +- - agent/polkitqtlistener_p.h | 4 +- - cmake/modules/FindPolkitQt-1.cmake | 37 -------- - cmake/modules/FindPolkitQt5-1.cmake | 37 ++++++++ - cmake/modules/PolkitQt-1Dist.cmake | 16 ---- - cmake/modules/PolkitQt5-1Dist.cmake | 16 ++++ - core/CMakeLists.txt | 12 +-- - core/polkitqt1-actiondescription.cpp | 2 +- - core/polkitqt1-actiondescription.h | 2 +- - core/polkitqt1-authority.cpp | 2 +- - core/polkitqt1-authority.h | 6 +- - core/polkitqt1-details.cpp | 2 +- - core/polkitqt1-details.h | 2 +- - core/polkitqt1-identity.cpp | 2 +- - core/polkitqt1-identity.h | 2 +- - core/polkitqt1-subject.cpp | 2 +- - examples/CMakeLists.txt | 6 +- - examples/agent/CMakeLists.txt | 4 +- - examples/agent/klistener.cpp | 2 +- - examples/agent/klistener.h | 2 +- - gui/CMakeLists.txt | 14 +-- - gui/polkitqt1-gui-action.cpp | 2 +- - gui/polkitqt1-gui-action.h | 2 +- - gui/polkitqt1-gui-actionbutton.cpp | 2 +- - gui/polkitqt1-gui-actionbutton.h | 2 +- - gui/polkitqt1-gui-actionbutton_p.h | 2 +- - gui/polkitqt1-gui-actionbuttons.cpp | 2 +- - gui/polkitqt1-gui-actionbuttons.h | 2 +- - gui/polkitqt1-gui-actionbuttons_p.h | 2 +- - polkit-qt-1.pc.cmake | 11 --- - polkit-qt-agent-1.pc.cmake | 11 --- - polkit-qt-core-1.pc.cmake | 11 --- - polkit-qt-gui-1.pc.cmake | 11 --- - polkit-qt5-1.pc.cmake | 11 +++ - polkit-qt5-agent-1.pc.cmake | 11 +++ - polkit-qt5-core-1.pc.cmake | 11 +++ - polkit-qt5-gui-1.pc.cmake | 11 +++ - polkitqt1-export.h | 2 +- - polkitqt1-version.h.cmake | 44 ++++----- - test/CMakeLists.txt | 10 +-- - 55 files changed, 463 insertions(+), 273 deletions(-) - create mode 100644 CMakeLists.txt.orig - create mode 100644 CMakeLists.txt.rej - delete mode 100644 PolkitQt-1Config.cmake.in - create mode 100644 PolkitQt5-1Config.cmake.in - delete mode 100644 cmake/modules/FindPolkitQt-1.cmake - create mode 100644 cmake/modules/FindPolkitQt5-1.cmake - delete mode 100644 cmake/modules/PolkitQt-1Dist.cmake - create mode 100644 cmake/modules/PolkitQt5-1Dist.cmake - delete mode 100644 polkit-qt-1.pc.cmake - delete mode 100644 polkit-qt-agent-1.pc.cmake - delete mode 100644 polkit-qt-core-1.pc.cmake - delete mode 100644 polkit-qt-gui-1.pc.cmake - create mode 100644 polkit-qt5-1.pc.cmake - create mode 100644 polkit-qt5-agent-1.pc.cmake - create mode 100644 polkit-qt5-core-1.pc.cmake - create mode 100644 polkit-qt5-gui-1.pc.cmake - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d4f6054..44e2173 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - ## Polkit Qt Library --project("PolkitQt-1") -+project("PolkitQt5-1") - - cmake_minimum_required(VERSION 2.8.11) - find_package(ECM 0.0.6 REQUIRED NO_MODULE) -@@ -58,15 +58,15 @@ if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_ - option(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR "Prefer to install the Config.cmake files to lib/cmake/ instead of lib//cmake" TRUE) - endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2) - --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_PATCH 0 CACHE INT "PolkitQt-1's release version number" FORCE) -+set(POLKITQT-1_VERSION_MAJOR 0 CACHE INT "PolkitQt5-1's major version number" FORCE) -+set(POLKITQT-1_VERSION_MINOR 103 CACHE INT "PolkitQt5-1's minor version number" FORCE) -+set(POLKITQT-1_VERSION_PATCH 0 CACHE INT "PolkitQt5-1's release version number" FORCE) - set(POLKITQT-1_VERSION_STRING - "${POLKITQT-1_VERSION_MAJOR}.${POLKITQT-1_VERSION_MINOR}.${POLKITQT-1_VERSION_PATCH}") - --# The SONUMBER of the polkit-qt-1 libraries -+# The SONUMBER of the polkit-qt5-1 libraries - set(POLKITQT-1_ABI_VERSION 1) --# The version number of the polkit-qt-1 libraries -+# The version number of the polkit-qt5-1 libraries - set(POLKITQT-1_LIBRARY_VERSION "${POLKITQT-1_ABI_VERSION}.${POLKITQT-1_VERSION_MINOR}.${POLKITQT-1_VERSION_PATCH}") - - configure_file(polkitqt1-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkitqt1-version.h) -@@ -90,7 +90,7 @@ install(FILES - polkitqt1-export.h - - DESTINATION -- ${INCLUDE_INSTALL_DIR}/polkit-qt-1 COMPONENT Devel) -+ ${INCLUDE_INSTALL_DIR}/polkit-qt5-1 COMPONENT Devel) - - install(FILES - includes/PolkitQt1/Authority -@@ -100,60 +100,60 @@ install(FILES - includes/PolkitQt1/TemporaryAuthorization - includes/PolkitQt1/ActionDescription - DESTINATION -- ${INCLUDE_INSTALL_DIR}/polkit-qt-1/PolkitQt1 COMPONENT Devel) -+ ${INCLUDE_INSTALL_DIR}/polkit-qt5-1/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_INSTALL_DIR}/polkit-qt5-1/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_INSTALL_DIR}/polkit-qt5-1/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}/polkit-qt5-1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt5-1.pc @ONLY) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt5-1.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/polkit-qt5-core-1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt5-core-1.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}/polkit-qt5-core-1.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/polkit-qt5-gui-1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt5-gui-1.pc @ONLY) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt5-gui-1.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/polkit-qt5-agent-1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt5-agent-1.pc - @ONLY) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-agent-1.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt5-agent-1.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) - endif(NOT WIN32) - - # CMake Config files --configure_file(PolkitQt-1Config.cmake.in "${CMAKE_BINARY_DIR}/PolkitQt-1Config.cmake" @ONLY) -+configure_file(PolkitQt5-1Config.cmake.in "${CMAKE_BINARY_DIR}/PolkitQt5-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 -+macro_write_basic_cmake_version_file(${CMAKE_BINARY_DIR}/PolkitQt5-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(_PolkitQt5-1Config_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/PolkitQt5-1) - else(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) -- set(_PolkitQt-1Config_INSTALL_DIR ${LIB_INSTALL_DIR}/PolkitQt-1/cmake) -+ set(_PolkitQt5-1Config_INSTALL_DIR ${LIB_INSTALL_DIR}/PolkitQt5-1/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} ) -+install(FILES ${CMAKE_BINARY_DIR}/PolkitQt5-1ConfigVersion.cmake -+ ${CMAKE_BINARY_DIR}/PolkitQt5-1Config.cmake -+ DESTINATION ${_PolkitQt5-1Config_INSTALL_DIR} ) - --option(BUILD_EXAMPLES "Builds a set of examples for polkit-qt-1" OFF) -+option(BUILD_EXAMPLES "Builds a set of examples for polkit-qt5-1" OFF) - if (BUILD_EXAMPLES) - add_subdirectory(examples) - endif (BUILD_EXAMPLES) - - add_subdirectory(cmake) - --option(BUILD_TEST "Builds unit tests for polkit-qt-1" OFF) -+option(BUILD_TEST "Builds unit tests for polkit-qt5-1" OFF) - if (BUILD_TEST) - find_package(Qt5Test 5.1.0 REQUIRED) - add_subdirectory(test) -@@ -164,4 +164,4 @@ add_subdirectory(gui) - add_subdirectory(agent) - - # Always last! --include (PolkitQt-1Dist) -+include (PolkitQt5-1Dist) -diff --git a/CMakeLists.txt.orig b/CMakeLists.txt.orig -new file mode 100644 -index 0000000..d4f6054 ---- /dev/null -+++ b/CMakeLists.txt.orig -@@ -0,0 +1,167 @@ -+## Polkit Qt Library -+project("PolkitQt-1") -+ -+cmake_minimum_required(VERSION 2.8.11) -+find_package(ECM 0.0.6 REQUIRED NO_MODULE) -+ -+# Find includes in corresponding build directories -+set(CMAKE_INCLUDE_CURRENT_DIR ON) -+ -+# Instruct CMake to run moc automatically when needed -+set(CMAKE_AUTOMOC ON) -+ -+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH}) -+ -+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0) -+ -+find_package(Qt5Core REQUIRED) -+find_package(Qt5DBus REQUIRED) -+find_package(Qt5Xml REQUIRED) -+find_package(Qt5Gui REQUIRED) -+find_package(Qt5Widgets REQUIRED) -+find_package(Polkit REQUIRED) -+find_package(GObject REQUIRED) -+find_package(GIO REQUIRED) -+ -+add_definitions(-DQT_NO_KEYWORDS) -+ -+include (KDEInstallDirs) -+include (MacroWriteBasicCMakeVersionFile) -+include (CheckFunctionExists) -+ -+set(CMAKE_AUTOMOC TRUE) -+set(CMAKE_INCLUDE_CURRENT_DIR TRUE) -+ -+include_directories( -+ ${POLKIT_INCLUDE_DIR} -+ ${POLKIT_AGENT_INCLUDE_DIR} -+ ${GLIB2_INCLUDE_DIR} -+ ${GOBJECT_INCLUDE_DIR} -+ ${GIO_INCLUDE_DIR} -+ ${CMAKE_SOURCE_DIR} -+ ${CMAKE_SOURCE_DIR}/core -+ ${CMAKE_SOURCE_DIR}/includes -+) -+ -+# Check for older polkit -+set(CMAKE_REQUIRED_INCLUDES ${POLKIT_INCLUDE_DIR} ${POLKIT_AGENT_INCLUDE_DIR}) -+set(CMAKE_REQUIRED_LIBRARIES ${POLKIT_LIBRARIES} ${POLKIT_AGENT_LIBRARY}) -+check_function_exists(polkit_agent_listener_register HAVE_POLKIT_AGENT_LISTENER_REGISTER) -+check_function_exists(polkit_authority_get_sync HAVE_POLKIT_AUTHORITY_GET_SYNC) -+ -+if (NOT HAVE_POLKIT_AGENT_LISTENER_REGISTER OR NOT HAVE_POLKIT_AUTHORITY_GET_SYNC) -+ message(STATUS "You have an older polkit-1 version: Polkit-Qt-1 will be built in compatibility mode") -+ 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 Config.cmake files to lib/cmake/ instead of lib//cmake" TRUE) -+endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2) -+ -+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_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}") -+ -+# The SONUMBER of the polkit-qt-1 libraries -+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}") -+ -+configure_file(polkitqt1-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkitqt1-version.h) -+ -+install(FILES -+ gui/polkitqt1-gui-action.h -+ gui/polkitqt1-gui-actionbutton.h -+ gui/polkitqt1-gui-actionbuttons.h -+ -+ core/polkitqt1-authority.h -+ core/polkitqt1-details.h -+ core/polkitqt1-identity.h -+ core/polkitqt1-subject.h -+ core/polkitqt1-temporaryauthorization.h -+ core/polkitqt1-actiondescription.h -+ -+ agent/polkitqt1-agent-listener.h -+ agent/polkitqt1-agent-session.h -+ -+ ${CMAKE_CURRENT_BINARY_DIR}/polkitqt1-version.h -+ polkitqt1-export.h -+ -+ DESTINATION -+ ${INCLUDE_INSTALL_DIR}/polkit-qt-1 COMPONENT Devel) -+ -+install(FILES -+ includes/PolkitQt1/Authority -+ includes/PolkitQt1/Details -+ includes/PolkitQt1/Identity -+ includes/PolkitQt1/Subject -+ includes/PolkitQt1/TemporaryAuthorization -+ includes/PolkitQt1/ActionDescription -+ DESTINATION -+ ${INCLUDE_INSTALL_DIR}/polkit-qt-1/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) -+ -+install(FILES -+ includes/PolkitQt1/Agent/Listener -+ includes/PolkitQt1/Agent/Session -+ DESTINATION -+ ${INCLUDE_INSTALL_DIR}/polkit-qt-1/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 -+ @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 -+ @ONLY) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-agent-1.pc DESTINATION ${LIB_INSTALL_DIR}/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) -+else(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) -+ set(_PolkitQt-1Config_INSTALL_DIR ${LIB_INSTALL_DIR}/PolkitQt-1/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} ) -+ -+option(BUILD_EXAMPLES "Builds a set of examples for polkit-qt-1" OFF) -+if (BUILD_EXAMPLES) -+ add_subdirectory(examples) -+endif (BUILD_EXAMPLES) -+ -+add_subdirectory(cmake) -+ -+option(BUILD_TEST "Builds unit tests for polkit-qt-1" OFF) -+if (BUILD_TEST) -+ find_package(Qt5Test 5.1.0 REQUIRED) -+ add_subdirectory(test) -+endif (BUILD_TEST) -+ -+add_subdirectory(core) -+add_subdirectory(gui) -+add_subdirectory(agent) -+ -+# Always last! -+include (PolkitQt-1Dist) -diff --git a/CMakeLists.txt.rej b/CMakeLists.txt.rej -new file mode 100644 -index 0000000..a598dc6 ---- /dev/null -+++ b/CMakeLists.txt.rej -@@ -0,0 +1,23 @@ -+--- CMakeLists.txt -++++ CMakeLists.txt -+@@ -58,15 +58,15 @@ -+ option(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR "Prefer to install the Config.cmake files to lib/cmake/ instead of lib//cmake" TRUE) -+ endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2) -+ -+-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_PATCH 1 CACHE INT "PolkitQt-1's release version number" FORCE) -++set(POLKITQT-1_VERSION_MAJOR 0 CACHE INT "PolkitQt5-1's major version number" FORCE) -++set(POLKITQT-1_VERSION_MINOR 103 CACHE INT "PolkitQt5-1's minor version number" FORCE) -++set(POLKITQT-1_VERSION_PATCH 1 CACHE INT "PolkitQt5-1's release version number" FORCE) -+ set(POLKITQT-1_VERSION_STRING -+ "${POLKITQT-1_VERSION_MAJOR}.${POLKITQT-1_VERSION_MINOR}.${POLKITQT-1_VERSION_PATCH}") -+ -+-# The SONUMBER of the polkit-qt-1 libraries -++# The SONUMBER of the polkit-qt5-1 libraries -+ set(POLKITQT-1_ABI_VERSION 1) -+-# The version number of the polkit-qt-1 libraries -++# The version number of the polkit-qt5-1 libraries -+ set(POLKITQT-1_LIBRARY_VERSION "${POLKITQT-1_ABI_VERSION}.${POLKITQT-1_VERSION_MINOR}.${POLKITQT-1_VERSION_PATCH}") -+ -+ configure_file(polkitqt1-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkitqt1-version.h) -diff --git a/INSTALL b/INSTALL -index dc58900..996404e 100644 ---- a/INSTALL -+++ b/INSTALL -@@ -1,6 +1,6 @@ --Polkit-qt's build system uses cmake. -+Polkit-qt5's build system uses cmake. - --So to compile Polkit-qt first create a build dir -+So to compile Polkit-qt5 first create a build dir - - mkdir build - cd build -@@ -15,7 +15,7 @@ cmake then presents a configuration summary. At this point you may - want to install missing dependancies (if you do, remove the CMakeCache.txt) - and run cmake again. - --Finally build Polkit-qt: -+Finally build Polkit-qt5: - - make - -diff --git a/Mainpage.dox b/Mainpage.dox -index 90b34e0..8f3c5af 100644 ---- a/Mainpage.dox -+++ b/Mainpage.dox -@@ -1,43 +1,43 @@ - /** --\mainpage Polkit-qt-1 - Qt wrapper around polkit-1 -+\mainpage Polkit-qt5-1 - Qt wrapper around polkit-1 - - \section polkitqt1_overview Overview - - \note Please note that if you're developing an application on the KDE Development - Platform and not just with Qt, you might want to use KAuth (kdelibs/core/auth) - --polkit-qt-1 aims to make it easy for Qt developers to take advantage of -+polkit-qt5-1 aims to make it easy for Qt developers to take advantage of - polkit API. It is a convenience wrapper around QAction and QAbstractButton - that lets you integrate those two components easily with polkit. - --polkit-qt-1 is not a direct replacement of polkit-qt: it is based on polkit-1, which is not --backwards compatible in any way with Policykit <= 0.9, which was the backend of polkit-qt. --You are encouraged to port polkit-qt applications to polkit-qt or KAuth, if based on the KDE -+polkit-qt5-1 is not a direct replacement of polkit-qt5: it is based on polkit-1, which is not -+backwards compatible in any way with Policykit <= 0.9, which was the backend of polkit-qt5. -+You are encouraged to port polkit-qt5 applications to polkit-qt5 or KAuth, if based on the KDE - Development Platform, since PolicyKit <= 0.9 is no longer maintained. - --polkit-qt-1 is split in three libraries: polkit-qt-core-1, polkit-qt-gui-1 and polkit-qt-agent-1 -+polkit-qt5-1 is split in three libraries: polkit-qt5-core-1, polkit-qt5-gui-1 and polkit-qt5-agent-1 - --\b polkit-qt-core-1 lets you control actions and authentication without a GUI, with some very -+\b polkit-qt5-core-1 lets you control actions and authentication without a GUI, with some very - simple functions. It also lets you retrieve and control useful informations on the polkit - authority. You will be mostly interested in the \c Authority class. - --\b polkit-qt-gui-1 lets you easily associate GUI items with polkit actions. Through some simple -+\b polkit-qt5-gui-1 lets you easily associate GUI items with polkit actions. Through some simple - wrapper classes you are able to associate QAction and QAbstractButton to a polkit action, - and get their properties changed accordingly to polkit's result. It includes the classes - Action, ActionButton and ActionButtons - --\b polkit-qt-agent-1 lets you write your own polkit authentication agents in a very simple way. -+\b polkit-qt5-agent-1 lets you write your own polkit authentication agents in a very simple way. - --\li A sample usage of polkit-qt-1 can be found in \ref polkitqt1_example -+\li A sample usage of polkit-qt5-1 can be found in \ref polkitqt1_example - \li Alphabetical Class List - \li Class Hierarchy - - - - --\page polkitqt1_example Polkit-qt-1 usage example -+\page polkitqt1_example Polkit-qt5-1 usage example - --You can find an example usage of Polkit-qt-1 in the examples/ dir. You can -+You can find an example usage of Polkit-qt5-1 in the examples/ dir. You can - build it by passing \c -DBUILD_EXAMPLES=TRUE to your cmake line. The structure - consists of a .ui file and a main class, to demonstrate how easy it is to integrate - polkit support in an existing application. Let's see some details about it: -@@ -93,14 +93,14 @@ with even more ease, just by manually connecting the signal to ActionButton::act - to understand why this connection doesn't happen automatically), and Action::authorized() signal notifies - you when polkit has authorized you to perform the action. - --As you can see, usage of polkit-qt-1 is extremely simple. Have a look at the complete example -+As you can see, usage of polkit-qt5-1 is extremely simple. Have a look at the complete example - and to the API Docs for more details. - - - */ - - // DOXYGEN_PROJECTVERSION=0.96.1 --// DOXYGEN_PROJECTNAME=PolkitQt-1 -+// DOXYGEN_PROJECTNAME=PolkitQt5-1 - // DOXYGEN_ENABLE=YES - - // vim:ts=4:sw=4:expandtab:filetype=doxygen -diff --git a/PolkitQt-1Config.cmake.in b/PolkitQt-1Config.cmake.in -deleted file mode 100644 -index db60830..0000000 ---- a/PolkitQt-1Config.cmake.in -+++ /dev/null -@@ -1,41 +0,0 @@ --# PolkitQt-1Config.cmake is generated by CMake from PolkitQt-1Config.cmake.in. --# Any changed value in this file will be overwritten by CMake. -- --# set the PolkitQt-1 version number --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 the directories --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 "${POLKITQT-1_INSTALL_DIR}/@INCLUDE_INSTALL_DIR@/polkit-qt-1") --set(POLKITQT-1_LIB_DIR "${POLKITQT-1_INSTALL_DIR}/@LIB_INSTALL_DIR@") --set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "${POLKITQT-1_INSTALL_DIR}/share/polkit-1/actions") -- --# 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") --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") --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") --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") --endif() -- --set(POLKITQT-1_LIBRARIES ${POLKITQT-1_GUI_LIBRARY} ${POLKITQT-1_CORE_LIBRARY} ${POLKITQT-1_AGENT_LIBRARY}) -diff --git a/PolkitQt5-1Config.cmake.in b/PolkitQt5-1Config.cmake.in -new file mode 100644 -index 0000000..14e1f73 ---- /dev/null -+++ b/PolkitQt5-1Config.cmake.in -@@ -0,0 +1,41 @@ -+# PolkitQt5-1Config.cmake is generated by CMake from PolkitQt5-1Config.cmake.in. -+# Any changed value in this file will be overwritten by CMake. -+ -+# set the PolkitQt5-1 version number -+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 the directories -+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 "${POLKITQT-1_INSTALL_DIR}/@INCLUDE_INSTALL_DIR@/polkit-qt5-1") -+set(POLKITQT-1_LIB_DIR "${POLKITQT-1_INSTALL_DIR}/@LIB_INSTALL_DIR@") -+set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "${POLKITQT-1_INSTALL_DIR}/share/polkit-1/actions") -+ -+# Compatibility -+if(WIN32) -+if(MINGW) -+ set(POLKITQT-1_CORE_LIBRARY "${POLKITQT-1_LIB_DIR}/libpolkit-qt5-core-1.dll.a") -+ set(POLKITQT-1_AGENT_LIBRARY "${POLKITQT-1_LIB_DIR}/libpolkit-qt5-agent-1.dll.a") -+ set(POLKITQT-1_GUI_LIBRARY "${POLKITQT-1_LIB_DIR}/libpolkit-qt5-gui-1.dll.a") -+else(MINGW) -+ set(POLKITQT-1_CORE_LIBRARY "${POLKITQT-1_LIB_DIR}/polkit-qt5-core-1.lib") -+ set(POLKITQT-1_AGENT_LIBRARY "${POLKITQT-1_LIB_DIR}/polkit-qt5-agent-1.lib") -+ set(POLKITQT-1_GUI_LIBRARY "${POLKITQT-1_LIB_DIR}/polkit-qt5-gui-1.lib") -+endif(MINGW) -+elseif(APPLE) -+ set(POLKITQT-1_CORE_LIBRARY "${POLKITQT-1_LIB_DIR}/libpolkit-qt5-core-1.dylib") -+ set(POLKITQT-1_AGENT_LIBRARY "${POLKITQT-1_LIB_DIR}/libpolkit-qt5-agent-1.dylib") -+ set(POLKITQT-1_GUI_LIBRARY "${POLKITQT-1_LIB_DIR}/libpolkit-qt5-gui-1.dylib") -+else() -+ set(POLKITQT-1_CORE_LIBRARY "${POLKITQT-1_LIB_DIR}/libpolkit-qt5-core-1.so") -+ set(POLKITQT-1_AGENT_LIBRARY "${POLKITQT-1_LIB_DIR}/libpolkit-qt5-agent-1.so") -+ set(POLKITQT-1_GUI_LIBRARY "${POLKITQT-1_LIB_DIR}/libpolkit-qt5-gui-1.so") -+endif() -+ -+set(POLKITQT-1_LIBRARIES ${POLKITQT-1_GUI_LIBRARY} ${POLKITQT-1_CORE_LIBRARY} ${POLKITQT-1_AGENT_LIBRARY}) -diff --git a/README b/README -index efc31d8..f67f8cd 100644 ---- a/README -+++ b/README -@@ -1,9 +1,9 @@ --Polkit-qt -+Polkit-qt5 - ======== - --What is Polkit-qt? -+What is Polkit-qt5? - ------------------ --Polkit-qt is a library that lets developers use the PolicyKit API through a nice -+Polkit-qt5 is a library that lets developers use the PolicyKit API through a nice - Qt-styled API. It is mainly a wrapper around QAction and QAbstractButton that - lets you integrate those two component easily with PolicyKit - -diff --git a/README.porting b/README.porting -index d2074ea..9a18117 100644 ---- a/README.porting -+++ b/README.porting -@@ -1,16 +1,16 @@ --Policy Kit 1 support for polkit-qt -+Policy Kit 1 support for polkit-qt5 - ================================== - - This is initial port to PK1. - - What's working? - --------------- --polkit-qt-core --polkit-qt-gui -+polkit-qt5-core -+polkit-qt5-gui - - TO-DO - ----- --* polkit-qt-core -+* polkit-qt5-core - - temporary authorization handling functions - - move from Auth namespace to Authority class? - - tests -diff --git a/TODO b/TODO -index 596936f..66f406a 100644 ---- a/TODO -+++ b/TODO -@@ -2,10 +2,10 @@ TODO - ==== - - - Policy Kit 1 port -- * polkit-qt -+ * polkit-qt5 - + Console Kit support - -- * polkit-qt-gui -+ * polkit-qt5-gui - + authorization checking for non privileged user - - - document Listener and co. -diff --git a/agent/CMakeLists.txt b/agent/CMakeLists.txt -index 47e649d..7ae37b2 100644 ---- a/agent/CMakeLists.txt -+++ b/agent/CMakeLists.txt -@@ -5,18 +5,18 @@ set(polkit_qt_agent_SRCS - polkitqtlistener.cpp - ) - --add_library(polkit-qt-agent-1 SHARED ${polkit_qt_agent_SRCS}) -+add_library(polkit-qt5-agent-1 SHARED ${polkit_qt_agent_SRCS}) - --qt5_use_modules(polkit-qt-agent-1 Core) -+qt5_use_modules(polkit-qt5-agent-1 Core) - --target_link_libraries(polkit-qt-agent-1 -+target_link_libraries(polkit-qt5-agent-1 - ${POLKIT_LIBRARIES} - ${POLKIT_AGENT_LIBRARY} -- polkit-qt-core-1 -+ polkit-qt5-core-1 - ) - --set_target_properties(polkit-qt-agent-1 PROPERTIES VERSION ${POLKITQT-1_LIBRARY_VERSION} -+set_target_properties(polkit-qt5-agent-1 PROPERTIES VERSION ${POLKITQT-1_LIBRARY_VERSION} - SOVERSION ${POLKITQT-1_ABI_VERSION} - DEFINE_SYMBOL MAKE_POLKITQT1_LIB) - --install(TARGETS polkit-qt-agent-1 ${INSTALL_TARGETS_DEFAULT_ARGS}) -+install(TARGETS polkit-qt5-agent-1 ${INSTALL_TARGETS_DEFAULT_ARGS}) -diff --git a/agent/listeneradapter.cpp b/agent/listeneradapter.cpp -index 0136193..c85ca5a 100644 ---- a/agent/listeneradapter.cpp -+++ b/agent/listeneradapter.cpp -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Jaroslav Reznik - * - * This library is free software; you can redistribute it and/or -diff --git a/agent/listeneradapter_p.h b/agent/listeneradapter_p.h -index 126cd13..125d53d 100644 ---- a/agent/listeneradapter_p.h -+++ b/agent/listeneradapter_p.h -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Jaroslav Reznik - * - * This library is free software; you can redistribute it and/or -diff --git a/agent/polkitqt1-agent-listener.cpp b/agent/polkitqt1-agent-listener.cpp -index a193d8b..62432fd 100644 ---- a/agent/polkitqt1-agent-listener.cpp -+++ b/agent/polkitqt1-agent-listener.cpp -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Jaroslav Reznik - * - * This library is free software; you can redistribute it and/or -diff --git a/agent/polkitqt1-agent-listener.h b/agent/polkitqt1-agent-listener.h -index 38c2ae4..1f70c3a 100644 ---- a/agent/polkitqt1-agent-listener.h -+++ b/agent/polkitqt1-agent-listener.h -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Jaroslav Reznik - * - * This library is free software; you can redistribute it and/or -diff --git a/agent/polkitqtlistener.cpp b/agent/polkitqtlistener.cpp -index a9a93aa..b1bf53a 100644 ---- a/agent/polkitqtlistener.cpp -+++ b/agent/polkitqtlistener.cpp -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Jaroslav Reznik - * - * This library is free software; you can redistribute it and/or -@@ -17,7 +17,7 @@ - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * -- * polkit-qt-listener based on code by David Zeuthen -+ * polkit-qt5-listener based on code by David Zeuthen - */ - - -diff --git a/agent/polkitqtlistener_p.h b/agent/polkitqtlistener_p.h -index 1447691..097edae 100644 ---- a/agent/polkitqtlistener_p.h -+++ b/agent/polkitqtlistener_p.h -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Jaroslav Reznik - * - * This library is free software; you can redistribute it and/or -@@ -17,7 +17,7 @@ - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * -- * polkit-qt-listener based on code by David Zeuthen -+ * polkit-qt5-listener based on code by David Zeuthen - */ - - #ifndef POLKITQT_LISTENER_P_H -diff --git a/cmake/modules/FindPolkitQt-1.cmake b/cmake/modules/FindPolkitQt-1.cmake -deleted file mode 100644 -index 30d27de..0000000 ---- a/cmake/modules/FindPolkitQt-1.cmake -+++ /dev/null -@@ -1,37 +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) -- --# Copyright (c) 2010, Dario Freddi, --# --# Redistribution and use is allowed according to the terms of the BSD license. --# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -- --# 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 ( NOT PolkitQt-1_FIND_VERSION AND POLKITQT-1_MIN_VERSION ) -- --set( _PolkitQt-1_FIND_QUIETLY ${PolkitQt-1_FIND_QUIETLY} ) --find_package( PolkitQt-1 ${PolkitQt-1_FIND_VERSION} QUIET NO_MODULE PATHS ${LIB_INSTALL_DIR}/PolkitQt-1/cmake ) --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 ${POLKITQT-1_INSTALL_DIR} prefix") -- endif (NOT POLKITQT-1_INSTALL_DIR STREQUAL CMAKE_INSTALL_PREFIX) --endif (POLKITQT-1_FOUND) -diff --git a/cmake/modules/FindPolkitQt5-1.cmake b/cmake/modules/FindPolkitQt5-1.cmake -new file mode 100644 -index 0000000..852e5e3 ---- /dev/null -+++ b/cmake/modules/FindPolkitQt5-1.cmake -@@ -0,0 +1,37 @@ -+# - Try to find PolkitQt5-1 -+# Once done this will define -+# -+# POLKITQT-1_FOUND - system has Polkit-qt5 -+# POLKITQT-1_INCLUDE_DIR - the Polkit-qt5 include directory -+# POLKITQT-1_LIBRARIES - Link these to use all Polkit-qt5 libs -+# POLKITQT-1_CORE_LIBRARY - Link this to use the polkit-qt5-core library only -+# POLKITQT-1_GUI_LIBRARY - Link this to use GUI elements in polkit-qt5 (polkit-qt5-gui) -+# POLKITQT-1_AGENT_LIBRARY - Link this to use the agent wrapper in polkit-qt5 -+# POLKITQT-1_DEFINITIONS - Compiler switches required for using Polkit-qt5 -+# -+# The minimum required version of PolkitQt5-1 can be specified using the -+# standard syntax, e.g. find_package(PolkitQt5-1 1.0) -+ -+# Copyright (c) 2010, Dario Freddi, -+# -+# Redistribution and use is allowed according to the terms of the BSD license. -+# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -+ -+# Support POLKITQT-1_MIN_VERSION for compatibility: -+if ( NOT PolkitQt5-1_FIND_VERSION AND POLKITQT-1_MIN_VERSION ) -+ set ( PolkitQt5-1_FIND_VERSION ${POLKITQT-1_MIN_VERSION} ) -+endif ( NOT PolkitQt5-1_FIND_VERSION AND POLKITQT-1_MIN_VERSION ) -+ -+set( _PolkitQt5-1_FIND_QUIETLY ${PolkitQt5-1_FIND_QUIETLY} ) -+find_package( PolkitQt5-1 ${PolkitQt5-1_FIND_VERSION} QUIET NO_MODULE PATHS ${LIB_INSTALL_DIR}/PolkitQt5-1/cmake ) -+set( PolkitQt5-1_FIND_QUIETLY ${_PolkitQt5-1_FIND_QUIETLY} ) -+ -+include( FindPackageHandleStandardArgs ) -+find_package_handle_standard_args( PolkitQt5-1 DEFAULT_MSG PolkitQt5-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 ${POLKITQT-1_INSTALL_DIR} prefix") -+ endif (NOT POLKITQT-1_INSTALL_DIR STREQUAL CMAKE_INSTALL_PREFIX) -+endif (POLKITQT-1_FOUND) -diff --git a/cmake/modules/PolkitQt-1Dist.cmake b/cmake/modules/PolkitQt-1Dist.cmake -deleted file mode 100644 -index 99122dd..0000000 ---- a/cmake/modules/PolkitQt-1Dist.cmake -+++ /dev/null -@@ -1,16 +0,0 @@ --SET(CPACK_PACKAGE_NAME "polkit-qt-1") --SET(CPACK_PACKAGE_VERSION_MAJOR "${POLKITQT-1_VERSION_MAJOR}") --SET(CPACK_PACKAGE_VERSION_MINOR "${POLKITQT-1_VERSION_MINOR}") --SET(CPACK_PACKAGE_VERSION_PATCH "${POLKITQT-1_VERSION_PATCH}") -- --set(CPACK_SOURCE_GENERATOR "TBZ2") --set(CPACK_SOURCE_PACKAGE_FILE_NAME "polkit-qt-1-${POLKITQT-1_VERSION_MAJOR}.${POLKITQT-1_VERSION_MINOR}.${POLKITQT-1_VERSION_PATCH}") --set(CPACK_SOURCE_IGNORE_FILES "/\\\\.svn/" "/\\\\.git/" "makechangelog") -- --set(ARCHIVE_NAME ${CPACK_PACKAGE_NAME}-${POLKITQT-1_VERSION_STRING}) --add_custom_target(dist -- COMMAND git archive --prefix=${ARCHIVE_NAME}/ HEAD -- | bzip2 > ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2 -- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) -- --include(CPack) # needs to happen after the above variables are set -diff --git a/cmake/modules/PolkitQt5-1Dist.cmake b/cmake/modules/PolkitQt5-1Dist.cmake -new file mode 100644 -index 0000000..4633de9 ---- /dev/null -+++ b/cmake/modules/PolkitQt5-1Dist.cmake -@@ -0,0 +1,16 @@ -+SET(CPACK_PACKAGE_NAME "polkit-qt5-1") -+SET(CPACK_PACKAGE_VERSION_MAJOR "${POLKITQT-1_VERSION_MAJOR}") -+SET(CPACK_PACKAGE_VERSION_MINOR "${POLKITQT-1_VERSION_MINOR}") -+SET(CPACK_PACKAGE_VERSION_PATCH "${POLKITQT-1_VERSION_PATCH}") -+ -+set(CPACK_SOURCE_GENERATOR "TBZ2") -+set(CPACK_SOURCE_PACKAGE_FILE_NAME "polkit-qt5-1-${POLKITQT-1_VERSION_MAJOR}.${POLKITQT-1_VERSION_MINOR}.${POLKITQT-1_VERSION_PATCH}") -+set(CPACK_SOURCE_IGNORE_FILES "/\\\\.svn/" "/\\\\.git/" "makechangelog") -+ -+set(ARCHIVE_NAME ${CPACK_PACKAGE_NAME}-${POLKITQT-1_VERSION_STRING}) -+add_custom_target(dist -+ COMMAND git archive --prefix=${ARCHIVE_NAME}/ HEAD -+ | bzip2 > ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2 -+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) -+ -+include(CPack) # needs to happen after the above variables are set -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index 1adf1f8..4bf09db 100644 ---- a/core/CMakeLists.txt -+++ b/core/CMakeLists.txt -@@ -7,23 +7,23 @@ set(polkit_qt_core_SRCS - polkitqt1-actiondescription.cpp - ) - --add_library(polkit-qt-core-1 SHARED ${polkit_qt_core_SRCS}) -+add_library(polkit-qt5-core-1 SHARED ${polkit_qt_core_SRCS}) - --qt5_use_modules(polkit-qt-core-1 Core DBus Xml) -+qt5_use_modules(polkit-qt5-core-1 Core DBus Xml) - --target_link_libraries(polkit-qt-core-1 -+target_link_libraries(polkit-qt5-core-1 - ${POLKIT_LIBRARIES} - ${GLIB2_LIBRARIES} - ${GOBJECT_LIBRARIES} - ${GIO_LIBRARIES} - ) - --qt5_use_modules(polkit-qt-core-1 -+qt5_use_modules(polkit-qt5-core-1 - Xml DBus - ) - --set_target_properties(polkit-qt-core-1 PROPERTIES VERSION ${POLKITQT-1_LIBRARY_VERSION} -+set_target_properties(polkit-qt5-core-1 PROPERTIES VERSION ${POLKITQT-1_LIBRARY_VERSION} - SOVERSION ${POLKITQT-1_ABI_VERSION} - DEFINE_SYMBOL MAKE_POLKITQT1_LIB) - --install(TARGETS polkit-qt-core-1 ${INSTALL_TARGETS_DEFAULT_ARGS}) -+install(TARGETS polkit-qt5-core-1 ${INSTALL_TARGETS_DEFAULT_ARGS}) -diff --git a/core/polkitqt1-actiondescription.cpp b/core/polkitqt1-actiondescription.cpp -index dbe1aa8..20ef962 100644 ---- a/core/polkitqt1-actiondescription.cpp -+++ b/core/polkitqt1-actiondescription.cpp -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Jaroslav Reznik - * Copyright (C) 2010 Dario Freddi - * -diff --git a/core/polkitqt1-actiondescription.h b/core/polkitqt1-actiondescription.h -index deed65d..07facab 100644 ---- a/core/polkitqt1-actiondescription.h -+++ b/core/polkitqt1-actiondescription.h -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Jaroslav Reznik - * Copyright (C) 2010 Dario Freddi - * -diff --git a/core/polkitqt1-authority.cpp b/core/polkitqt1-authority.cpp -index 62488ca..6c8b377 100644 ---- a/core/polkitqt1-authority.cpp -+++ b/core/polkitqt1-authority.cpp -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Daniel Nicoletti - * Copyright (C) 2009 Dario Freddi - * Copyright (C) 2009 Jaroslav Reznik -diff --git a/core/polkitqt1-authority.h b/core/polkitqt1-authority.h -index 64ebb8f..d0ba494 100644 ---- a/core/polkitqt1-authority.h -+++ b/core/polkitqt1-authority.h -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Daniel Nicoletti - * Copyright (C) 2009 Dario Freddi - * Copyright (C) 2009 Jaroslav Reznik -@@ -125,7 +125,7 @@ public: - * Returns the current instance of Authority. Call this function whenever - * you need to access the Authority class. - * -- * \note Authority is a singleton. Memory is handled by polkit-qt, so you just -+ * \note Authority is a singleton. Memory is handled by polkit-qt5, so you just - * need to call this function to get a working instance of Authority. - * Don't delete the object after having used it. - * -@@ -170,7 +170,7 @@ public: - - /** - * Returns the current instance of PolkitAuthority. If you are handling -- * it through Polkit-qt (which is quite likely, since you are calling -+ * it through Polkit-qt5 (which is quite likely, since you are calling - * this function), DO NOT use any PolicyKit API's specific method that - * modifies the instance on it, unless you're completely aware of what you're doing and - * of the possible consequencies. Use this instance only to gather information. -diff --git a/core/polkitqt1-details.cpp b/core/polkitqt1-details.cpp -index e1d0f31..df5fa51 100644 ---- a/core/polkitqt1-details.cpp -+++ b/core/polkitqt1-details.cpp -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Radek Novacek - * - * This library is free software; you can redistribute it and/or -diff --git a/core/polkitqt1-details.h b/core/polkitqt1-details.h -index dc55f85..976edc3 100644 ---- a/core/polkitqt1-details.h -+++ b/core/polkitqt1-details.h -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Radek Novacek - * - * This library is free software; you can redistribute it and/or -diff --git a/core/polkitqt1-identity.cpp b/core/polkitqt1-identity.cpp -index 3541072..678e303 100644 ---- a/core/polkitqt1-identity.cpp -+++ b/core/polkitqt1-identity.cpp -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Lukas Tinkl - * - * This library is free software; you can redistribute it and/or -diff --git a/core/polkitqt1-identity.h b/core/polkitqt1-identity.h -index faed3a3..31e7b9f 100644 ---- a/core/polkitqt1-identity.h -+++ b/core/polkitqt1-identity.h -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Lukas Tinkl - * - * This library is free software; you can redistribute it and/or -diff --git a/core/polkitqt1-subject.cpp b/core/polkitqt1-subject.cpp -index dfc9697..5045c25 100644 ---- a/core/polkitqt1-subject.cpp -+++ b/core/polkitqt1-subject.cpp -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Jaroslav Reznik - * - * This library is free software; you can redistribute it and/or -diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt -index b579799..7a7eb9d 100644 ---- a/examples/CMakeLists.txt -+++ b/examples/CMakeLists.txt -@@ -27,8 +27,8 @@ add_executable(polkit-example - ) - - target_link_libraries(polkit-example -- polkit-qt-gui-1 -- polkit-qt-core-1 -+ polkit-qt5-gui-1 -+ polkit-qt5-core-1 - ) - - qt5_use_modules(polkit-example -@@ -66,7 +66,7 @@ add_executable(polkit-example-helper - - # see our helper is pretty small :D - target_link_libraries(polkit-example-helper -- polkit-qt-core-1 -+ polkit-qt5-core-1 - ) - - qt5_use_modules(polkit-example-helper -diff --git a/examples/agent/CMakeLists.txt b/examples/agent/CMakeLists.txt -index 4b6d6fb..9fa709b 100644 ---- a/examples/agent/CMakeLists.txt -+++ b/examples/agent/CMakeLists.txt -@@ -13,8 +13,8 @@ add_executable(polkit-agent-example - ) - - target_link_libraries(polkit-agent-example -- polkit-qt-agent-1 -- polkit-qt-core-1 -+ polkit-qt5-agent-1 -+ polkit-qt5-core-1 - ) - - qt5_use_modules(polkit-agent-example -diff --git a/examples/agent/klistener.cpp b/examples/agent/klistener.cpp -index e229899..de1c36b 100644 ---- a/examples/agent/klistener.cpp -+++ b/examples/agent/klistener.cpp -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Jaroslav Reznik - * - * This library is free software; you can redistribute it and/or -diff --git a/examples/agent/klistener.h b/examples/agent/klistener.h -index 2576acd..7f5046c 100644 ---- a/examples/agent/klistener.h -+++ b/examples/agent/klistener.h -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Jaroslav Reznik - * - * This library is free software; you can redistribute it and/or -diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt -index 00d111d..9925f3f 100644 ---- a/gui/CMakeLists.txt -+++ b/gui/CMakeLists.txt -@@ -4,20 +4,20 @@ set(polkit_qt_gui_SRCS - polkitqt1-gui-actionbuttons.cpp - ) - --add_library(polkit-qt-gui-1 SHARED ${polkit_qt_gui_SRCS}) -+add_library(polkit-qt5-gui-1 SHARED ${polkit_qt_gui_SRCS}) - --qt5_use_modules(polkit-qt-gui-1 Core DBus Gui Widgets) -+qt5_use_modules(polkit-qt5-gui-1 Core DBus Gui Widgets) - --target_link_libraries(polkit-qt-gui-1 -+target_link_libraries(polkit-qt5-gui-1 - ${POLKIT_LIBRARIES} -- polkit-qt-core-1 -+ polkit-qt5-core-1 - ) --qt5_use_modules(polkit-qt-gui-1 -+qt5_use_modules(polkit-qt5-gui-1 - Widgets DBus - ) - --set_target_properties(polkit-qt-gui-1 PROPERTIES VERSION ${POLKITQT-1_LIBRARY_VERSION} -+set_target_properties(polkit-qt5-gui-1 PROPERTIES VERSION ${POLKITQT-1_LIBRARY_VERSION} - SOVERSION ${POLKITQT-1_ABI_VERSION} - DEFINE_SYMBOL MAKE_POLKITQT1_LIB) - --install(TARGETS polkit-qt-gui-1 ${INSTALL_TARGETS_DEFAULT_ARGS}) -+install(TARGETS polkit-qt5-gui-1 ${INSTALL_TARGETS_DEFAULT_ARGS}) -diff --git a/gui/polkitqt1-gui-action.cpp b/gui/polkitqt1-gui-action.cpp -index 806d56f..0179abd 100644 ---- a/gui/polkitqt1-gui-action.cpp -+++ b/gui/polkitqt1-gui-action.cpp -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Daniel Nicoletti - * Copyright (C) 2009 Dario Freddi - * Copyright (C) 2009 Jaroslav Reznik -diff --git a/gui/polkitqt1-gui-action.h b/gui/polkitqt1-gui-action.h -index e5194e5..6ba5d90 100644 ---- a/gui/polkitqt1-gui-action.h -+++ b/gui/polkitqt1-gui-action.h -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Daniel Nicoletti - * Copyright (C) 2009 Dario Freddi - * -diff --git a/gui/polkitqt1-gui-actionbutton.cpp b/gui/polkitqt1-gui-actionbutton.cpp -index e2a9ee5..ba8b583 100644 ---- a/gui/polkitqt1-gui-actionbutton.cpp -+++ b/gui/polkitqt1-gui-actionbutton.cpp -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Daniel Nicoletti - * Copyright (C) 2009 Dario Freddi - * -diff --git a/gui/polkitqt1-gui-actionbutton.h b/gui/polkitqt1-gui-actionbutton.h -index 23f1783..995c64f 100644 ---- a/gui/polkitqt1-gui-actionbutton.h -+++ b/gui/polkitqt1-gui-actionbutton.h -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Daniel Nicoletti - * Copyright (C) 2009 Dario Freddi - * -diff --git a/gui/polkitqt1-gui-actionbutton_p.h b/gui/polkitqt1-gui-actionbutton_p.h -index f8bdad6..dc6f1d7 100644 ---- a/gui/polkitqt1-gui-actionbutton_p.h -+++ b/gui/polkitqt1-gui-actionbutton_p.h -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Dario Freddi - * - * This library is free software; you can redistribute it and/or -diff --git a/gui/polkitqt1-gui-actionbuttons.cpp b/gui/polkitqt1-gui-actionbuttons.cpp -index cf83f3d..8393595 100644 ---- a/gui/polkitqt1-gui-actionbuttons.cpp -+++ b/gui/polkitqt1-gui-actionbuttons.cpp -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Dario Freddi - * - * This library is free software; you can redistribute it and/or -diff --git a/gui/polkitqt1-gui-actionbuttons.h b/gui/polkitqt1-gui-actionbuttons.h -index b02ddb9..12bae86 100644 ---- a/gui/polkitqt1-gui-actionbuttons.h -+++ b/gui/polkitqt1-gui-actionbuttons.h -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Dario Freddi - * - * This library is free software; you can redistribute it and/or -diff --git a/gui/polkitqt1-gui-actionbuttons_p.h b/gui/polkitqt1-gui-actionbuttons_p.h -index c334d30..546ce57 100644 ---- a/gui/polkitqt1-gui-actionbuttons_p.h -+++ b/gui/polkitqt1-gui-actionbuttons_p.h -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Dario Freddi - * - * This library is free software; you can redistribute it and/or -diff --git a/polkit-qt-1.pc.cmake b/polkit-qt-1.pc.cmake -deleted file mode 100644 -index 0d7bd08..0000000 ---- a/polkit-qt-1.pc.cmake -+++ /dev/null -@@ -1,11 +0,0 @@ --prefix=@CMAKE_INSTALL_PREFIX@ --exec_prefix=@CMAKE_INSTALL_PREFIX@ --libdir=@LIB_INSTALL_DIR@ --includedir=@CMAKE_INSTALL_PREFIX@/include -- --Name: polkit-qt-1 --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 --Cflags: -I${includedir} -diff --git a/polkit-qt-agent-1.pc.cmake b/polkit-qt-agent-1.pc.cmake -deleted file mode 100644 -index dbf0ba4..0000000 ---- a/polkit-qt-agent-1.pc.cmake -+++ /dev/null -@@ -1,11 +0,0 @@ --prefix=@CMAKE_INSTALL_PREFIX@ --exec_prefix=@CMAKE_INSTALL_PREFIX@ --libdir=@LIB_INSTALL_DIR@ --includedir=@CMAKE_INSTALL_PREFIX@/include -- --Name: polkit-qt-agent-1 --Description: Convenience library for using polkit Agent with a Qt-styled API --Version: @POLKITQT-1_VERSION_STRING@ --Requires: Qt5Core Qt5Gui --Libs: -L${libdir} -lpolkit-qt-agent-1 --Cflags: -I${includedir} -diff --git a/polkit-qt-core-1.pc.cmake b/polkit-qt-core-1.pc.cmake -deleted file mode 100644 -index d5f16b8..0000000 ---- a/polkit-qt-core-1.pc.cmake -+++ /dev/null -@@ -1,11 +0,0 @@ --prefix=@CMAKE_INSTALL_PREFIX@ --exec_prefix=@CMAKE_INSTALL_PREFIX@ --libdir=@LIB_INSTALL_DIR@ --includedir=@CMAKE_INSTALL_PREFIX@/include -- --Name: polkit-qt-core-1 --Description: Convenience library for using polkit with a Qt-styled API, non-GUI classes --Version: @POLKITQT-1_VERSION_STRING@ --Requires: Qt5Core --Libs: -L${libdir} -lpolkit-qt-core-1 --Cflags: -I${includedir} -diff --git a/polkit-qt-gui-1.pc.cmake b/polkit-qt-gui-1.pc.cmake -deleted file mode 100644 -index fe872e0..0000000 ---- a/polkit-qt-gui-1.pc.cmake -+++ /dev/null -@@ -1,11 +0,0 @@ --prefix=@CMAKE_INSTALL_PREFIX@ --exec_prefix=@CMAKE_INSTALL_PREFIX@ --libdir=@LIB_INSTALL_DIR@ --includedir=@CMAKE_INSTALL_PREFIX@/include -- --Name: polkit-qt-gui-1 --Description: Convenience library for using polkit with a Qt-styled API, GUI classes --Version: @POLKITQT-1_VERSION_STRING@ --Requires: Qt5Core Qt5DBus Qt5Xml Qt5Gui Qt5Widgets polkit-qt-core-1 --Libs: -L${libdir} -lpolkit-qt-gui-1 --Cflags: -I${includedir} -diff --git a/polkit-qt5-1.pc.cmake b/polkit-qt5-1.pc.cmake -new file mode 100644 -index 0000000..fa4a637 ---- /dev/null -+++ b/polkit-qt5-1.pc.cmake -@@ -0,0 +1,11 @@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=@CMAKE_INSTALL_PREFIX@ -+libdir=@LIB_INSTALL_DIR@ -+includedir=@CMAKE_INSTALL_PREFIX@/include -+ -+Name: polkit-qt5-1 -+Description: Convenience library for using polkit with a Qt-styled API -+Version: @POLKITQT-1_VERSION_STRING@ -+Requires: polkit-qt5-core-1 polkit-qt5-gui-1 polkit-qt5-agent-1 -+Libs: -L${libdir} -lpolkit-qt5-core-1 -lpolkit-qt5-gui-1 -lpolkit-qt5-agent-1 -+Cflags: -I${includedir} -diff --git a/polkit-qt5-agent-1.pc.cmake b/polkit-qt5-agent-1.pc.cmake -new file mode 100644 -index 0000000..0924f04 ---- /dev/null -+++ b/polkit-qt5-agent-1.pc.cmake -@@ -0,0 +1,11 @@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=@CMAKE_INSTALL_PREFIX@ -+libdir=@LIB_INSTALL_DIR@ -+includedir=@CMAKE_INSTALL_PREFIX@/include -+ -+Name: polkit-qt5-agent-1 -+Description: Convenience library for using polkit Agent with a Qt-styled API -+Version: @POLKITQT-1_VERSION_STRING@ -+Requires: Qt5Core Qt5Gui -+Libs: -L${libdir} -lpolkit-qt5-agent-1 -+Cflags: -I${includedir} -diff --git a/polkit-qt5-core-1.pc.cmake b/polkit-qt5-core-1.pc.cmake -new file mode 100644 -index 0000000..9da1e3c ---- /dev/null -+++ b/polkit-qt5-core-1.pc.cmake -@@ -0,0 +1,11 @@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=@CMAKE_INSTALL_PREFIX@ -+libdir=@LIB_INSTALL_DIR@ -+includedir=@CMAKE_INSTALL_PREFIX@/include -+ -+Name: polkit-qt5-core-1 -+Description: Convenience library for using polkit with a Qt-styled API, non-GUI classes -+Version: @POLKITQT-1_VERSION_STRING@ -+Requires: Qt5Core -+Libs: -L${libdir} -lpolkit-qt5-core-1 -+Cflags: -I${includedir} -diff --git a/polkit-qt5-gui-1.pc.cmake b/polkit-qt5-gui-1.pc.cmake -new file mode 100644 -index 0000000..b6ea93e ---- /dev/null -+++ b/polkit-qt5-gui-1.pc.cmake -@@ -0,0 +1,11 @@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=@CMAKE_INSTALL_PREFIX@ -+libdir=@LIB_INSTALL_DIR@ -+includedir=@CMAKE_INSTALL_PREFIX@/include -+ -+Name: polkit-qt5-gui-1 -+Description: Convenience library for using polkit with a Qt-styled API, GUI classes -+Version: @POLKITQT-1_VERSION_STRING@ -+Requires: Qt5Core Qt5DBus Qt5Xml Qt5Gui Qt5Widgets polkit-qt5-core-1 -+Libs: -L${libdir} -lpolkit-qt5-gui-1 -+Cflags: -I${includedir} -diff --git a/polkitqt1-export.h b/polkitqt1-export.h -index c3d8fc1..5a38563 100644 ---- a/polkitqt1-export.h -+++ b/polkitqt1-export.h -@@ -1,5 +1,5 @@ - /* -- * This file is part of the Polkit-qt project -+ * This file is part of the Polkit-qt5 project - * Copyright (C) 2009 Dario Freddi - * Copyright (C) 2007 David Faure - * -diff --git a/polkitqt1-version.h.cmake b/polkitqt1-version.h.cmake -index e2ca5d2..a20e37a 100644 ---- a/polkitqt1-version.h.cmake -+++ b/polkitqt1-version.h.cmake -@@ -23,82 +23,82 @@ - - #include "polkitqt1-export.h" - --/// @brief PolkitQt-1 version as string at compile time. -+/// @brief PolkitQt5-1 version as string at compile time. - #define POLKITQT1_VERSION_STRING "${POLKITQT-1_VERSION_STRING}" - --/// @brief The major PolkitQt-1 version number at compile time -+/// @brief The major PolkitQt5-1 version number at compile time - #define POLKITQT1_VERSION_MAJOR ${POLKITQT-1_VERSION_MAJOR} - --/// @brief The minor PolkitQt-1 version number at compile time -+/// @brief The minor PolkitQt5-1 version number at compile time - #define POLKITQT1_VERSION_MINOR ${POLKITQT-1_VERSION_MINOR} - --/// @brief The PolkitQt-1 patch version number at compile time -+/// @brief The PolkitQt5-1 patch version number at compile time - #define POLKITQT1_VERSION_PATCH ${POLKITQT-1_VERSION_PATCH} - - /** -- * \brief Create a unique number from the major, minor and release number of a %PolkitQt-1 version -+ * \brief Create a unique number from the major, minor and release number of a %PolkitQt5-1 version - * - * This function can be used for preprocessing. For version information at runtime -- * use the version methods in the PolkitQt-1 namespace. -+ * use the version methods in the PolkitQt5-1 namespace. - */ - #define POLKITQT1_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) - - /** -- * \brief %PolkitQt-1 Version as a unique number at compile time -+ * \brief %PolkitQt5-1 Version as a unique number at compile time - * -- * This macro calculates the %PolkitQt-1 version into a number. It is mainly used -+ * This macro calculates the %PolkitQt5-1 version into a number. It is mainly used - * through POLKITQT1_IS_VERSION in preprocessing. For version information at runtime -- * use the version methods in the PolkitQt-1 namespace. -+ * use the version methods in the PolkitQt5-1 namespace. - */ - #define POLKITQT1_VERSION \ - POLKITQT1_MAKE_VERSION(POLKITQT1_VERSION_MAJOR,POLKITQT1_VERSION_MINOR,POLKITQT1_VERSION_PATCH) - - /** -- * \brief Check if the %PolkitQt-1 version matches a certain version or is higher -+ * \brief Check if the %PolkitQt5-1 version matches a certain version or is higher - * - * This macro is typically used to compile conditionally a part of code: - * \code - * #if POLKITQT1_IS_VERSION(2,1) -- * // Code for PolkitQt-1 2.1 -+ * // Code for PolkitQt5-1 2.1 - * #else -- * // Code for PolkitQt-1 2.0 -+ * // Code for PolkitQt5-1 2.0 - * #endif - * \endcode - * - * For version information at runtime -- * use the version methods in the PolkitQt-1 namespace. -+ * use the version methods in the PolkitQt5-1 namespace. - */ - #define POLKITQT1_IS_VERSION(a,b,c) ( POLKITQT1_VERSION >= POLKITQT1_MAKE_VERSION(a,b,c) ) - - - namespace PolkitQt1 { - /** -- * @brief Returns the major number of PolkitQt-1's version, e.g. -- * 1 for %PolkitQt-1 1.0.2. -+ * @brief Returns the major number of PolkitQt5-1's version, e.g. -+ * 1 for %PolkitQt5-1 1.0.2. - * @return the major version number at runtime. - */ - POLKITQT1_EXPORT unsigned int versionMajor(); - - /** -- * @brief Returns the minor number of PolkitQt-1's version, e.g. -- * 0 for %PolkitQt-1 1.0.2. -+ * @brief Returns the minor number of PolkitQt5-1's version, e.g. -+ * 0 for %PolkitQt5-1 1.0.2. - * @return the minor version number at runtime. - */ - POLKITQT1_EXPORT unsigned int versionMinor(); - - /** -- * @brief Returns the patch number of PolkitQt-1's version, e.g. -- * 2 for %PolkitQt-1 1.0.2. -+ * @brief Returns the patch number of PolkitQt5-1's version, e.g. -+ * 2 for %PolkitQt5-1 1.0.2. - * @return the release number at runtime. - */ - POLKITQT1_EXPORT unsigned int versionPatch(); - - /** -- * @brief Returns the %PolkitQt-1 version as string, e.g. "1.0.2". -+ * @brief Returns the %PolkitQt5-1 version as string, e.g. "1.0.2". - * - * On contrary to the macro POLKITQT1_VERSION_STRING this function returns -- * the version number of PolkitQt-1 at runtime. -- * @return the %PolkitQt-1 version. You can keep the string forever -+ * the version number of PolkitQt5-1 at runtime. -+ * @return the %PolkitQt5-1 version. You can keep the string forever - */ - POLKITQT1_EXPORT const char* versionString(); - } -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index cdafe19..73aa18d 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -4,15 +4,15 @@ include_directories( - ${CMAKE_SOURCE_DIR}/agent - ) - --add_executable(polkit-qt-test -+add_executable(polkit-qt5-test - test.cpp - ) - --target_link_libraries(polkit-qt-test -- polkit-qt-core-1 -+target_link_libraries(polkit-qt5-test -+ polkit-qt5-core-1 - ) --qt5_use_modules(polkit-qt-test -+qt5_use_modules(polkit-qt5-test - Core DBus Test - ) - --add_test(BaseTest ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-test) -+add_test(BaseTest ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt5-test) --- -1.8.5.3 - diff --git a/0002-Full-Qt-5-port.patch b/0002-Full-Qt-5-port.patch deleted file mode 100644 index 49620b2..0000000 --- a/0002-Full-Qt-5-port.patch +++ /dev/null @@ -1,224 +0,0 @@ -From 9cac9ef904042bb69fbda88386a38b50e536ac3a Mon Sep 17 00:00:00 2001 -From: Pier Luigi Fiorini -Date: Mon, 31 Dec 2012 15:11:23 +0100 -Subject: [PATCH 2/5] Full Qt 5 port. - -[lkundrak@v3.sk: Rebased, squashed "Reintroduce ECM. -It's needed for KDEInstallDirs." in to fix build] ---- - CMakeLists.txt | 10 +++++++--- - agent/CMakeLists.txt | 9 +++------ - agent/polkitqt1-agent-listener.cpp | 2 +- - core/CMakeLists.txt | 7 ++----- - core/polkitqt1-authority.cpp | 16 ++++++++-------- - gui/CMakeLists.txt | 2 ++ - polkit-qt-agent-1.pc.cmake | 2 +- - polkit-qt-core-1.pc.cmake | 2 +- - polkit-qt-gui-1.pc.cmake | 2 +- - 9 files changed, 26 insertions(+), 26 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c760031..c6a2e28 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,17 +2,21 @@ - project("PolkitQt-1") - - cmake_minimum_required(VERSION 2.8.11) -+find_package(ECM 0.0.6 REQUIRED NO_MODULE) -+ -+# Find includes in corresponding build directories -+set(CMAKE_INCLUDE_CURRENT_DIR ON) - - # Instruct CMake to run moc automatically when needed - set(CMAKE_AUTOMOC ON) - --find_package(ECM 0.0.6 REQUIRED NO_MODULE) -- - set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH}) - --find_package(Qt5 5.1.0 REQUIRED COMPONENTS Core DBus Widgets Xml) - add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0) - -+find_package(Qt5Core REQUIRED) -+find_package(Qt5Gui REQUIRED) -+find_package(Qt5Widgets REQUIRED) - find_package(Polkit REQUIRED) - find_package(GObject REQUIRED) - find_package(GIO REQUIRED) -diff --git a/agent/CMakeLists.txt b/agent/CMakeLists.txt -index 4df7d62..47e649d 100644 ---- a/agent/CMakeLists.txt -+++ b/agent/CMakeLists.txt -@@ -1,19 +1,16 @@ --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 - ) -+ - add_library(polkit-qt-agent-1 SHARED ${polkit_qt_agent_SRCS}) - -+qt5_use_modules(polkit-qt-agent-1 Core) -+ - target_link_libraries(polkit-qt-agent-1 - ${POLKIT_LIBRARIES} -- ${QT_QTCORE_LIBRARY} - ${POLKIT_AGENT_LIBRARY} - polkit-qt-core-1 - ) -diff --git a/agent/polkitqt1-agent-listener.cpp b/agent/polkitqt1-agent-listener.cpp -index c96d242..a193d8b 100644 ---- a/agent/polkitqt1-agent-listener.cpp -+++ b/agent/polkitqt1-agent-listener.cpp -@@ -90,7 +90,7 @@ bool Listener::registerListener(const PolkitQt1::Subject &subject, const QString - bool r = polkit_agent_register_listener(d->listener, - #endif - subject.subject(), -- objectPath.toAscii().data(), -+ objectPath.toLatin1().data(), - #ifndef POLKIT_QT_1_COMPATIBILITY_MODE - NULL, - #endif -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index 5afdae4..1adf1f8 100644 ---- a/core/CMakeLists.txt -+++ b/core/CMakeLists.txt -@@ -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 -@@ -14,6 +9,8 @@ set(polkit_qt_core_SRCS - - add_library(polkit-qt-core-1 SHARED ${polkit_qt_core_SRCS}) - -+qt5_use_modules(polkit-qt-core-1 Core DBus Xml) -+ - target_link_libraries(polkit-qt-core-1 - ${POLKIT_LIBRARIES} - ${GLIB2_LIBRARIES} -diff --git a/core/polkitqt1-authority.cpp b/core/polkitqt1-authority.cpp -index 265fe70..62488ca 100644 ---- a/core/polkitqt1-authority.cpp -+++ b/core/polkitqt1-authority.cpp -@@ -223,7 +223,7 @@ void Authority::Private::init() - if (!msg.arguments().isEmpty()) { - // this method returns a list with present seats - QList seats; -- qVariantValue (msg.arguments()[0]) >> seats; -+ qvariant_cast (msg.arguments()[0]) >> seats; - // it can be multiple seats present so connect all their signals - Q_FOREACH(const QString &seat, seats) { - seatSignalsConnect(seat); -@@ -267,7 +267,7 @@ void Authority::Private::dbusFilter(const QDBusMessage &message) - - // TODO: Test this with the multiseat support - if (message.member() == "SeatAdded") { -- seatSignalsConnect(qVariantValue (message.arguments()[0]).path()); -+ seatSignalsConnect(qvariant_cast (message.arguments()[0]).path()); - } - } - } -@@ -323,7 +323,7 @@ Authority::Result Authority::checkAuthorizationSync(const QString &actionId, con - - pk_result = polkit_authority_check_authorization_sync(d->pkAuthority, - subject.subject(), -- actionId.toAscii().data(), -+ actionId.toLatin1().data(), - NULL, - (PolkitCheckAuthorizationFlags)(int)flags, - NULL, -@@ -358,7 +358,7 @@ void Authority::checkAuthorization(const QString &actionId, const Subject &subje - - polkit_authority_check_authorization(d->pkAuthority, - subject.subject(), -- actionId.toAscii().data(), -+ actionId.toLatin1().data(), - NULL, - (PolkitCheckAuthorizationFlags)(int)flags, - d->m_checkAuthorizationCancellable, -@@ -470,8 +470,8 @@ bool Authority::registerAuthenticationAgentSync(const Subject &subject, const QS - } - - result = polkit_authority_register_authentication_agent_sync(d->pkAuthority, -- subject.subject(), locale.toAscii().data(), -- objectPath.toAscii().data(), NULL, &error); -+ subject.subject(), locale.toLatin1().data(), -+ objectPath.toLatin1().data(), NULL, &error); - - if (error) { - d->setError(E_RegisterFailed, error->message); -@@ -495,8 +495,8 @@ void Authority::registerAuthenticationAgent(const Subject &subject, const QStrin - - polkit_authority_register_authentication_agent(d->pkAuthority, - subject.subject(), -- locale.toAscii().data(), -- objectPath.toAscii().data(), -+ locale.toLatin1().data(), -+ objectPath.toLatin1().data(), - d->m_registerAuthenticationAgentCancellable, - d->registerAuthenticationAgentCallback, - this); -diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt -index 47ac74d..00d111d 100644 ---- a/gui/CMakeLists.txt -+++ b/gui/CMakeLists.txt -@@ -6,6 +6,8 @@ set(polkit_qt_gui_SRCS - - add_library(polkit-qt-gui-1 SHARED ${polkit_qt_gui_SRCS}) - -+qt5_use_modules(polkit-qt-gui-1 Core DBus Gui Widgets) -+ - target_link_libraries(polkit-qt-gui-1 - ${POLKIT_LIBRARIES} - polkit-qt-core-1 -diff --git a/polkit-qt-agent-1.pc.cmake b/polkit-qt-agent-1.pc.cmake -index 09f9323..dbf0ba4 100644 ---- a/polkit-qt-agent-1.pc.cmake -+++ b/polkit-qt-agent-1.pc.cmake -@@ -6,6 +6,6 @@ includedir=@CMAKE_INSTALL_PREFIX@/include - Name: polkit-qt-agent-1 - Description: Convenience library for using polkit Agent with a Qt-styled API - Version: @POLKITQT-1_VERSION_STRING@ --Requires: QtCore QtGui -+Requires: Qt5Core Qt5Gui - Libs: -L${libdir} -lpolkit-qt-agent-1 - Cflags: -I${includedir} -diff --git a/polkit-qt-core-1.pc.cmake b/polkit-qt-core-1.pc.cmake -index f553b7b..d5f16b8 100644 ---- a/polkit-qt-core-1.pc.cmake -+++ b/polkit-qt-core-1.pc.cmake -@@ -6,6 +6,6 @@ includedir=@CMAKE_INSTALL_PREFIX@/include - Name: polkit-qt-core-1 - Description: Convenience library for using polkit with a Qt-styled API, non-GUI classes - Version: @POLKITQT-1_VERSION_STRING@ --Requires: QtCore -+Requires: Qt5Core - Libs: -L${libdir} -lpolkit-qt-core-1 - Cflags: -I${includedir} -diff --git a/polkit-qt-gui-1.pc.cmake b/polkit-qt-gui-1.pc.cmake -index 83d4e9a..b211881 100644 ---- a/polkit-qt-gui-1.pc.cmake -+++ b/polkit-qt-gui-1.pc.cmake -@@ -6,6 +6,6 @@ includedir=@CMAKE_INSTALL_PREFIX@/include - Name: polkit-qt-gui-1 - 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 -+Requires: Qt5Core Qt5Gui Qt5Widgets polkit-qt-core-1 - Libs: -L${libdir} -lpolkit-qt-gui-1 - Cflags: -I${includedir} --- -1.8.5.3 - diff --git a/0003-Check-for-Qt5DBus-and-Qt5Xml.patch b/0003-Check-for-Qt5DBus-and-Qt5Xml.patch deleted file mode 100644 index 0a325f6..0000000 --- a/0003-Check-for-Qt5DBus-and-Qt5Xml.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 98014b844aa92e303be0565e51405548062e09de Mon Sep 17 00:00:00 2001 -From: Pier Luigi Fiorini -Date: Sat, 5 Jan 2013 01:19:23 +0100 -Subject: [PATCH 3/5] Check for Qt5DBus and Qt5Xml. - -polkit-qt-gui-1 needs them. ---- - CMakeLists.txt | 2 ++ - polkit-qt-gui-1.pc.cmake | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c6a2e28..d4f6054 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -15,6 +15,8 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_P - add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0) - - find_package(Qt5Core REQUIRED) -+find_package(Qt5DBus REQUIRED) -+find_package(Qt5Xml REQUIRED) - find_package(Qt5Gui REQUIRED) - find_package(Qt5Widgets REQUIRED) - find_package(Polkit REQUIRED) -diff --git a/polkit-qt-gui-1.pc.cmake b/polkit-qt-gui-1.pc.cmake -index b211881..fe872e0 100644 ---- a/polkit-qt-gui-1.pc.cmake -+++ b/polkit-qt-gui-1.pc.cmake -@@ -6,6 +6,6 @@ includedir=@CMAKE_INSTALL_PREFIX@/include - Name: polkit-qt-gui-1 - Description: Convenience library for using polkit with a Qt-styled API, GUI classes - Version: @POLKITQT-1_VERSION_STRING@ --Requires: Qt5Core Qt5Gui Qt5Widgets polkit-qt-core-1 -+Requires: Qt5Core Qt5DBus Qt5Xml Qt5Gui Qt5Widgets polkit-qt-core-1 - Libs: -L${libdir} -lpolkit-qt-gui-1 - Cflags: -I${includedir} --- -1.8.5.3 - diff --git a/polkit-qt5-1.spec b/polkit-qt5-1.spec index 51640bf..254fce4 100644 --- a/polkit-qt5-1.spec +++ b/polkit-qt5-1.spec @@ -1,23 +1,16 @@ Name: polkit-qt5-1 Version: 0.103.0 -Release: 3%{?dist} +Release: 3.20130415gitbac771e%{?dist} Summary: Qt5 bindings for PolicyKit License: GPLv2+ URL: https://projects.kde.org/projects/kdesupport/polkit-qt-1 # git clone git://anongit.kde.org/polkit-qt-1 # cd polkit-qt-1 -# git archive --prefix=polkit-qt5-1/ 3a5f879 |gzip -9 >polkit-qt5-1.tar.gz +# git archive --prefix=polkit-qt5-1/ bac771e |gzip -9 >polkit-qt5-1.tar.gz Source0: %{name}.tar.gz Source1: Doxyfile -# Hawaii-patches -Patch1: 0001-Include-moc-generated-files.patch -Patch2: 0002-Full-Qt-5-port.patch -Patch3: 0003-Check-for-Qt5DBus-and-Qt5Xml.patch -Patch4: 0001-Rename-polkit-qt-1-to-polkit-qt5-1.patch -Patch5: 0001-Fix-include-libdir-paths-when-they-re-absolute.patch - BuildRequires: automoc4 BuildRequires: cmake BuildRequires: extra-cmake-modules @@ -38,13 +31,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep %setup -q -n %{name} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 - - %build %{cmake} . make %{?_smp_mflags} @@ -78,6 +64,9 @@ make install DESTDIR=%{buildroot} %changelog +* Sun Jun 15 2014 Lubomir Rintel - 0.103.0-3.20130415gitbac771e +- Update to upstream GIT snapshot, drop custom qt5 support patches + * Wed Jun 11 2014 Rex Dieter - 0.103.0-3 - -devel: Provides: polkit-qt5-devel - switch to pkgconfig-style build deps diff --git a/sources b/sources index f478430..9d85c33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -67c7ecad92604370a9d2f62dc4da547f polkit-qt5-1.tar.gz +35e28312d1e441eb35b5deabe51b3e90 polkit-qt5-1.tar.gz