Hello community,
here is the log from the commit of package polkit-qt-1 for openSUSE:Factory
checked in at Mon Dec 13 17:38:30 CET 2010.
--------
--- KDE/polkit-qt-1/polkit-qt-1.changes 2010-10-26 18:54:34.000000000 +0200
+++ polkit-qt-1/polkit-qt-1.changes 2010-12-09 10:19:22.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Dec 9 09:18:00 UTC 2010 - tittiatcoke@gmail.com
+
+- update to 0.99.1
+ - Introduction of a compatibility mode for older PolicyKit version
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
polkit-qt-1-0.98.1.tar.bz2
New:
----
polkit-qt-1-0.99.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ polkit-qt-1.spec ++++++
--- /var/tmp/diff_new_pack.32HvsD/_old 2010-12-13 17:36:45.000000000 +0100
+++ /var/tmp/diff_new_pack.32HvsD/_new 2010-12-13 17:36:45.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package polkit-qt-1 (Version 0.98.1)
+# spec file for package polkit-qt-1 (Version 0.99.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,7 +24,7 @@
License: LGPLv2.1+
Group: Development/Libraries/KDE
Summary: PolicyKit Library Qt Bindings
-Version: 0.98.1
+Version: 0.99.1
Release: 1
Url: http://api.kde.org/kdesupport-api/kdesupport-apidocs/polkit-qt/html/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -114,6 +114,7 @@
%_libdir/libpolkit-qt-gui-1.so
%_libdir/libpolkit-qt-core-1.so
%_libdir/libpolkit-qt-agent-1.so
+%_libdir/cmake/PolkitQt-1/
%files -n libpolkit-qt-1-0
%defattr(-,root,root)
++++++ polkit-qt-1-0.98.1.tar.bz2 -> polkit-qt-1-0.99.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/.reviewboardrc new/polkit-qt-1-0.99.1/.reviewboardrc
--- old/polkit-qt-1-0.98.1/.reviewboardrc 1970-01-01 01:00:00.000000000 +0100
+++ new/polkit-qt-1-0.99.1/.reviewboardrc 2010-12-09 10:15:16.000000000 +0100
@@ -0,0 +1 @@
+REVIEWBOARD_URL = "http://git.reviewboard.kde.org"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/CMakeLists.txt new/polkit-qt-1-0.99.1/CMakeLists.txt
--- old/polkit-qt-1-0.98.1/CMakeLists.txt 2010-10-26 18:52:00.000000000 +0200
+++ new/polkit-qt-1-0.99.1/CMakeLists.txt 2010-12-09 10:15:16.000000000 +0100
@@ -9,111 +9,148 @@
find_package(Qt4 REQUIRED)
find_package(Automoc4 REQUIRED)
-find_package(Polkit)
-find_package(GObject)
-find_package(GIO)
+find_package(Polkit REQUIRED)
+find_package(GObject REQUIRED)
+find_package(GIO REQUIRED)
add_definitions(-DQT_NO_KEYWORDS)
-if(POLKIT_FOUND)
- include (${QT_USE_FILE})
- include (InstallSettings)
-
- include_directories(
- ${CMAKE_CURRENT_BINARY_DIR}
- ${POLKIT_INCLUDE_DIR}
- ${POLKIT_AGENT_INCLUDE_DIR}
- ${GLIB2_INCLUDE_DIR}
- ${GOBJECT_INCLUDE_DIR}
- ${GIO_INCLUDE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/core
- ${CMAKE_CURRENT_SOURCE_DIR}/includes
- ${QT_QTXML_INCLUDE_DIR}
- )
-
- set(CMAKE_MAJOR_POLKITQT-1_VERSION 0 CACHE INT "PolkitQt-1's major version number" FORCE)
- set(CMAKE_MINOR_POLKITQT-1_VERSION 98 CACHE INT "PolkitQt-1's minor version number" FORCE)
- set(CMAKE_RELEASE_POLKITQT-1_VERSION 1 CACHE INT "PolkitQt-1's release version number" FORCE)
- set(CMAKE_POLKITQT-1_VERSION_STRING
- "${CMAKE_MAJOR_POLKITQT-1_VERSION}.${CMAKE_MINOR_POLKITQT-1_VERSION}.${CMAKE_RELEASE_POLKITQT-1_VERSION}")
-
- 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)
-
- 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)
- add_subdirectory(test)
- endif (BUILD_TEST)
-
- add_subdirectory(core)
- add_subdirectory(gui)
- add_subdirectory(agent)
-else(POLKIT_FOUND)
- message(STATUS "polkit-1 was not found on this system. Skipping polkit-qt-1 compilation")
-endif(POLKIT_FOUND)
+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}
+ ${GOBJECT_INCLUDE_DIR}
+ ${GIO_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/core
+ ${CMAKE_CURRENT_SOURCE_DIR}/includes
+ ${QT_QTXML_INCLUDE_DIR}
+)
+
+# 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 <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)
+
+set(POLKITQT-1_VERSION_MAJOR 0 CACHE INT "PolkitQt-1's major version number" FORCE)
+set(POLKITQT-1_VERSION_MINOR 99 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_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)
+ add_subdirectory(test)
+endif (BUILD_TEST)
+
+add_subdirectory(core)
+add_subdirectory(gui)
+add_subdirectory(agent)
+
+# Always last!
+include (PolkitQt-1Dist)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/PolkitQt-1Config.cmake.in new/polkit-qt-1-0.99.1/PolkitQt-1Config.cmake.in
--- old/polkit-qt-1-0.98.1/PolkitQt-1Config.cmake.in 1970-01-01 01:00:00.000000000 +0100
+++ new/polkit-qt-1-0.99.1/PolkitQt-1Config.cmake.in 2010-12-09 10:15:16.000000000 +0100
@@ -0,0 +1,41 @@
+# 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 "@INCLUDE_INSTALL_DIR@/polkit-qt-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
+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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/agent/CMakeLists.txt new/polkit-qt-1-0.99.1/agent/CMakeLists.txt
--- old/polkit-qt-1-0.98.1/agent/CMakeLists.txt 2010-10-26 18:52:00.000000000 +0200
+++ new/polkit-qt-1-0.99.1/agent/CMakeLists.txt 2010-12-09 10:15:16.000000000 +0100
@@ -1,6 +1,6 @@
include_directories(
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
)
set(polkit_qt_agent_SRCS
@@ -12,15 +12,14 @@
automoc4_add_library(polkit-qt-agent-1 SHARED ${polkit_qt_agent_SRCS})
target_link_libraries(polkit-qt-agent-1
- ${POLKIT_LIBRARIES}
- ${QT_QTCORE_LIBRARY}
- ${POLKIT_AGENT_LIBRARY}
- polkit-qt-core-1
+ ${POLKIT_LIBRARIES}
+ ${QT_QTCORE_LIBRARY}
+ ${POLKIT_AGENT_LIBRARY}
+ polkit-qt-core-1
)
-set_target_properties(polkit-qt-agent-1 PROPERTIES VERSION ${CMAKE_POLKITQT-1_VERSION_STRING}
- SOVERSION ${CMAKE_MAJOR_POLKITQT-1_VERSION}
- DEFINE_SYMBOL MAKE_POLKITQT1_LIB
- )
+set_target_properties(polkit-qt-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})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/agent/listeneradapter.cpp new/polkit-qt-1-0.99.1/agent/listeneradapter.cpp
--- old/polkit-qt-1-0.98.1/agent/listeneradapter.cpp 2010-10-26 18:52:00.000000000 +0200
+++ new/polkit-qt-1-0.99.1/agent/listeneradapter.cpp 2010-12-09 10:15:16.000000000 +0100
@@ -64,9 +64,9 @@
Q_FOREACH(listItem, m_listeners) {
Q_ASSERT(listItem);
- if (listItem->listener() == listener)
+ if (listItem->listener() == listener) {
return listItem;
-
+ }
}
return NULL;
@@ -89,8 +89,9 @@
Listener *list = findListener(listener);
- for (GList *identity = g_list_first(identities); identity != NULL; identity = g_list_next(identity))
+ for (GList *identity = g_list_first(identities); identity != NULL; identity = g_list_next(identity)) {
idents.append(PolkitQt1::Identity((PolkitIdentity *)identity->data));
+ }
list->initiateAuthentication(QString::fromUtf8(action_id),
QString::fromUtf8(message),
@@ -108,8 +109,9 @@
qDebug() << "polkit_qt_listener_initiate_authentication_finish callback for " << listener;
GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT(res);
- if (g_simple_async_result_propagate_error(simple, error))
+ if (g_simple_async_result_propagate_error(simple, error)) {
return false;
+ }
return true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/agent/polkitqt1-agent-listener.cpp new/polkit-qt-1-0.99.1/agent/polkitqt1-agent-listener.cpp
--- old/polkit-qt-1-0.98.1/agent/polkitqt1-agent-listener.cpp 2010-10-26 18:52:00.000000000 +0200
+++ new/polkit-qt-1-0.99.1/agent/polkitqt1-agent-listener.cpp 2010-12-09 10:15:16.000000000 +0100
@@ -39,7 +39,9 @@
{
public:
PolkitAgentListener *listener;
+#ifndef POLKIT_QT_1_COMPATIBILITY_MODE
void *registeredHandle;
+#endif
};
Listener::Listener(QObject *parent)
@@ -67,21 +69,31 @@
qDebug("Destroying listener");
ListenerAdapter::instance()->removeListener(this);
- if (d->registeredHandle)
+#ifndef POLKIT_QT_1_COMPATIBILITY_MODE
+ if (d->registeredHandle) {
polkit_agent_listener_unregister(d->registeredHandle);
- if (d->listener != NULL)
+ }
+#endif
+ if (d->listener != NULL) {
g_object_unref(d->listener);
+ }
}
bool Listener::registerListener(const PolkitQt1::Subject &subject, const QString &objectPath)
{
GError *error = NULL;
+#ifndef POLKIT_QT_1_COMPATIBILITY_MODE
d->registeredHandle = polkit_agent_listener_register(d->listener,
POLKIT_AGENT_REGISTER_FLAGS_NONE,
+#else
+ bool r = polkit_agent_register_listener(d->listener,
+#endif
subject.subject(),
objectPath.toAscii().data(),
+#ifndef POLKIT_QT_1_COMPATIBILITY_MODE
NULL,
+#endif
&error);
if (error != NULL) {
@@ -89,12 +101,15 @@
g_error_free(error);
return false;
}
- if (d->registeredHandle == NULL)
- {
+#ifndef POLKIT_QT_1_COMPATIBILITY_MODE
+ if (d->registeredHandle == NULL) {
qWarning() << QString("Cannot register authentication agent!");
return false;
}
return true;
+#else
+ return r;
+#endif
}
const PolkitAgentListener *Listener::listener()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/agent/polkitqtlistener.cpp new/polkit-qt-1-0.99.1/agent/polkitqtlistener.cpp
--- old/polkit-qt-1-0.98.1/agent/polkitqtlistener.cpp 2010-10-26 18:52:00.000000000 +0200
+++ new/polkit-qt-1-0.99.1/agent/polkitqtlistener.cpp 2010-12-09 10:15:16.000000000 +0100
@@ -72,8 +72,9 @@
listener = POLKIT_QT_LISTENER(object);
- if (G_OBJECT_CLASS(polkit_qt_listener_parent_class)->finalize != NULL)
+ if (G_OBJECT_CLASS(polkit_qt_listener_parent_class)->finalize != NULL) {
G_OBJECT_CLASS(polkit_qt_listener_parent_class)->finalize(object);
+ }
}
static void polkit_qt_listener_class_init(PolkitQtListenerClass *klass)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/cmake/modules/BasicFindPackageVersion.cmake.in new/polkit-qt-1-0.99.1/cmake/modules/BasicFindPackageVersion.cmake.in
--- old/polkit-qt-1-0.98.1/cmake/modules/BasicFindPackageVersion.cmake.in 1970-01-01 01:00:00.000000000 +0100
+++ new/polkit-qt-1-0.99.1/cmake/modules/BasicFindPackageVersion.cmake.in 2010-12-09 10:15:16.000000000 +0100
@@ -0,0 +1,30 @@
+# This is a very basic file for the new style find_package() search mode,
+# i.e. Config-mode. It is used by MACRO_WRITE_BASIC_CMAKE_VERSION_FILE() from
+# MacroWriteBasicCMakeVersionFile.cmake.
+# In this mode find_package() searches for a <package>Config.cmake
+# file and an associated <package>Version.cmake file, which it loads to check
+# the version number.
+# This file can be used with configure_file() to generate such a file for a project
+# with very basic logic.
+# It sets PACKAGE_VERSION_EXACT if the current version string and the requested
+# version string are exactly the same and it sets PACKAGE_VERSION_COMPATIBLE
+# if the current version is >= requested version.
+# If this is not good enough for your project, you need to write your own
+# improved <package>Version.cmake file.
+# This file requires the following three variables to be set:
+# PROJECT_VERSION_MAJOR
+# PROJECT_VERSION_MINOR
+# PROJECT_VERSION_PATCH
+
+
+set(PACKAGE_VERSION @PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@)
+
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
+ if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+endif("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/cmake/modules/FindPolkit.cmake new/polkit-qt-1-0.99.1/cmake/modules/FindPolkit.cmake
--- old/polkit-qt-1-0.98.1/cmake/modules/FindPolkit.cmake 2010-10-26 18:52:00.000000000 +0200
+++ new/polkit-qt-1-0.99.1/cmake/modules/FindPolkit.cmake 2010-12-09 10:15:16.000000000 +0100
@@ -21,8 +21,8 @@
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig)
- pkg_check_modules(PC_POLKIT polkit-gobject-1)
- pkg_check_modules(PC_POLKIT_AGENT polkit-agent-1)
+ pkg_check_modules(PC_POLKIT REQUIRED polkit-gobject-1)
+ pkg_check_modules(PC_POLKIT_AGENT REQUIRED polkit-agent-1)
set(POLKIT_DEFINITIONS ${PC_POLKIT_CFLAGS_OTHER})
endif (NOT WIN32)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/cmake/modules/FindPolkitQt-1.cmake new/polkit-qt-1-0.99.1/cmake/modules/FindPolkitQt-1.cmake
--- old/polkit-qt-1-0.98.1/cmake/modules/FindPolkitQt-1.cmake 2010-10-26 18:52:00.000000000 +0200
+++ new/polkit-qt-1-0.99.1/cmake/modules/FindPolkitQt-1.cmake 2010-12-09 10:15:16.000000000 +0100
@@ -8,92 +8,30 @@
# 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) 2009, Dario Freddi,
+# 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.
-if (POLKITQT-1_INCLUDE_DIR AND POLKITQT-1_LIB)
- set(POLKITQT-1_FIND_QUIETLY TRUE)
-endif (POLKITQT-1_INCLUDE_DIR AND POLKITQT-1_LIB)
-
-if (NOT POLKITQT-1_MIN_VERSION)
- set(POLKITQT-1_MIN_VERSION "0.95.1")
-endif (NOT POLKITQT-1_MIN_VERSION)
-
-if (NOT WIN32)
- # use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- find_package(PkgConfig)
- pkg_check_modules(PC_POLKITQT-1 QUIET polkit-qt-1)
- set(POLKITQT-1_DEFINITIONS ${PC_POLKITQT-1_CFLAGS_OTHER})
-endif (NOT WIN32)
-
-find_path( POLKITQT-1_INCLUDE_DIR
- NAMES polkitqt1-authority.h
- PATH_SUFFIXES polkit-qt-1
-)
-
-find_path( POLKITQT-1_VERSION_FILE
- NAMES polkitqt1-version.h
- PATH_SUFFIXES polkit-qt-1
-)
-
-set(POLKITQT-1_VERSION_OK TRUE)
-if(POLKITQT-1_VERSION_FILE)
- file(READ ${POLKITQT-1_INCLUDE_DIR}/polkitqt1-version.h POLKITQT-1_VERSION_CONTENT)
- string (REGEX MATCH "POLKITQT1_VERSION_STRING \".*\"\n" POLKITQT-1_VERSION_MATCH "${POLKITQT-1_VERSION_CONTENT}")
-
- if(POLKITQT-1_VERSION_MATCH)
- string(REGEX REPLACE "POLKITQT1_VERSION_STRING \"(.*)\"\n" "\\1" POLKITQT-1_VERSION ${POLKITQT-1_VERSION_MATCH})
- if(POLKITQT-1_VERSION STRLESS "${POLKITQT-1_MIN_VERSION}")
- set(POLKITQT-1_VERSION_OK FALSE)
- if(PolkitQt-1_FIND_REQUIRED)
- message(FATAL_ERROR "PolkitQt-1 version ${POLKITQT-1_VERSION} was found, but it is too old. Please install ${POLKITQT-1_MIN_VERSION} or newer.")
- else(PolkitQt-1_FIND_REQUIRED)
- message(STATUS "PolkitQt-1 version ${POLKITQT-1_VERSION} is too old. Please install ${POLKITQT-1_MIN_VERSION} or newer.")
- endif(PolkitQt-1_FIND_REQUIRED)
- endif(POLKITQT-1_VERSION STRLESS "${POLKITQT-1_MIN_VERSION}")
- endif(POLKITQT-1_VERSION_MATCH)
-elseif(POLKITQT-1_INCLUDE_DIR)
- # The version is so old that it does not even have the file
- set(POLKITQT-1_VERSION_OK FALSE)
- if(PolkitQt_FIND_REQUIRED)
- message(FATAL_ERROR "It looks like PolkitQt-1 is too old. Please install PolkitQt-1 version ${POLKITQT-1_MIN_VERSION} or newer.")
- else(PolkitQt_FIND_REQUIRED)
- message(STATUS "It looks like PolkitQt-1 is too old. Please install PolkitQt-1 version ${POLKITQT-1_MIN_VERSION} or newer.")
- endif(PolkitQt_FIND_REQUIRED)
-endif(POLKITQT-1_VERSION_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} )
-find_library( POLKITQT-1_CORE_LIBRARY
- NAMES polkit-qt-core-1
- HINTS ${PC_POLKITQT-1_LIBDIR}
-)
-find_library( POLKITQT-1_GUI_LIBRARY
- NAMES polkit-qt-gui-1
- HINTS ${PC_POLKITQT-1_LIBDIR}
-)
-find_library( POLKITQT-1_AGENT_LIBRARY
- NAMES polkit-qt-agent-1
- HINTS ${PC_POLKITQT-1_LIBDIR}
-)
-
-set(POLKITQT-1_LIBRARIES ${POLKITQT-1_GUI_LIBRARY} ${POLKITQT-1_CORE_LIBRARY} ${POLKITQT-1_AGENT_LIBRARY})
-
-include(FindPackageHandleStandardArgs)
-
-# handle the QUIETLY and REQUIRED arguments and set POLKITQT-1_FOUND to TRUE if
-# all listed variables are TRUE
-find_package_handle_standard_args(PolkitQt-1 DEFAULT_MSG POLKITQT-1_LIBRARIES POLKITQT-1_INCLUDE_DIR POLKITQT-1_VERSION_OK)
-
-mark_as_advanced(POLKITQT-1_INCLUDE_DIR POLKITQT-1_CORE_LIBRARY POLKITQT-1_GUI_LIBRARY POLKITQT-1_LIBRARIES POLKITQT-1_VERSION_OK)
+include( FindPackageHandleStandardArgs )
+find_package_handle_standard_args( PolkitQt-1 DEFAULT_MSG PolkitQt-1_CONFIG )
if (POLKITQT-1_FOUND)
- if (NOT PC_POLKITQT-1_PREFIX STREQUAL CMAKE_INSTALL_PREFIX)
+ if (NOT POLKITQT-1_INSTALL_DIR STREQUAL CMAKE_INSTALL_PREFIX)
message("WARNING: Installation prefix does not match PolicyKit install prefixes. You probably will need to move files installed "
- "in POLICY_FILES_INSTALL_DIR and by dbus_add_activation_system_service to the ${PC_POLKITQT-1_PREFIX} prefix")
- endif (NOT PC_POLKITQT-1_PREFIX STREQUAL CMAKE_INSTALL_PREFIX)
+ "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)
-
-set(POLKITQT-1_POLICY_FILES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/cmake/modules/MacroWriteBasicCMakeVersionFile.cmake new/polkit-qt-1-0.99.1/cmake/modules/MacroWriteBasicCMakeVersionFile.cmake
--- old/polkit-qt-1-0.98.1/cmake/modules/MacroWriteBasicCMakeVersionFile.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/polkit-qt-1-0.99.1/cmake/modules/MacroWriteBasicCMakeVersionFile.cmake 2010-12-09 10:15:16.000000000 +0100
@@ -0,0 +1,22 @@
+# MACRO_WRITE_BASIC_CMAKE_VERSION_FILE( _filename _major _minor _patch)
+# Writes a file for use as <package>ConfigVersion.cmake file to <_filename>.
+# See the documentation of FIND_PACKAGE() for details on this.
+# _filename is the output filename, it should be in the build tree.
+# _major is the major version number of the project to be installed
+# _minor is the minor version number of the project to be installed
+# _patch is the patch version number of the project to be installed
+#
+
+# Copyright (c) 2008, Alexander Neundorf,
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+get_filename_component(_currentListFileDir ${CMAKE_CURRENT_LIST_FILE} PATH)
+
+function(MACRO_WRITE_BASIC_CMAKE_VERSION_FILE _filename _major _minor _patch)
+ set(PROJECT_VERSION_MAJOR ${_major})
+ set(PROJECT_VERSION_MINOR ${_minor})
+ set(PROJECT_VERSION_PATCH ${_patch})
+ configure_file(${_currentListFileDir}/BasicFindPackageVersion.cmake.in "${_filename}" @ONLY)
+endfunction(MACRO_WRITE_BASIC_CMAKE_VERSION_FILE _major _minor _patch)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/cmake/modules/PolkitQt-1Dist.cmake new/polkit-qt-1-0.99.1/cmake/modules/PolkitQt-1Dist.cmake
--- old/polkit-qt-1-0.98.1/cmake/modules/PolkitQt-1Dist.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/polkit-qt-1-0.99.1/cmake/modules/PolkitQt-1Dist.cmake 2010-12-09 10:15:16.000000000 +0100
@@ -0,0 +1,16 @@
+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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/core/CMakeLists.txt new/polkit-qt-1-0.99.1/core/CMakeLists.txt
--- old/polkit-qt-1-0.98.1/core/CMakeLists.txt 2010-10-26 18:52:00.000000000 +0200
+++ new/polkit-qt-1-0.99.1/core/CMakeLists.txt 2010-12-09 10:15:16.000000000 +0100
@@ -1,6 +1,6 @@
include_directories(
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
)
set(polkit_qt_core_SRCS
@@ -15,18 +15,17 @@
automoc4_add_library(polkit-qt-core-1 SHARED ${polkit_qt_core_SRCS})
target_link_libraries(polkit-qt-core-1
- ${QT_QTCORE_LIBRARY}
- ${QT_QTDBUS_LIBRARY}
- ${QT_QTXML_LIBRARY}
- ${POLKIT_LIBRARIES}
- ${GLIB2_LIBRARIES}
- ${GOBJECT_LIBRARIES}
- ${GIO_LIBRARIES}
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTDBUS_LIBRARY}
+ ${QT_QTXML_LIBRARY}
+ ${POLKIT_LIBRARIES}
+ ${GLIB2_LIBRARIES}
+ ${GOBJECT_LIBRARIES}
+ ${GIO_LIBRARIES}
)
-set_target_properties(polkit-qt-core-1 PROPERTIES VERSION ${CMAKE_POLKITQT-1_VERSION_STRING}
- SOVERSION ${CMAKE_MAJOR_POLKITQT-1_VERSION}
- DEFINE_SYMBOL MAKE_POLKITQT1_LIB
- )
+set_target_properties(polkit-qt-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})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/core/polkitqt1-authority.cpp new/polkit-qt-1-0.99.1/core/polkitqt1-authority.cpp
--- old/polkit-qt-1-0.98.1/core/polkitqt1-authority.cpp 2010-10-26 18:52:00.000000000 +0200
+++ new/polkit-qt-1-0.99.1/core/polkitqt1-authority.cpp 2010-12-09 10:15:16.000000000 +0100
@@ -54,12 +54,13 @@
Authority::Result polkitResultToResult(PolkitAuthorizationResult *result)
{
- if (polkit_authorization_result_get_is_challenge(result))
+ if (polkit_authorization_result_get_is_challenge(result)) {
return Authority::Challenge;
- else if (polkit_authorization_result_get_is_authorized(result))
+ } else if (polkit_authorization_result_get_is_authorized(result)) {
return Authority::Yes;
- else
+ } else {
return Authority::No;
+ }
}
ActionDescription::List actionsToListAndFree(GList *glist)
@@ -177,17 +178,26 @@
m_revokeTemporaryAuthorizationsCancellable = g_cancellable_new();
m_revokeTemporaryAuthorizationCancellable = g_cancellable_new();
+#ifndef POLKIT_QT_1_COMPATIBILITY_MODE
GError *gerror = NULL;
+#endif
if (pkAuthority == NULL) {
+#ifndef POLKIT_QT_1_COMPATIBILITY_MODE
pkAuthority = polkit_authority_get_sync(NULL, &gerror);
if (gerror != NULL) {
setError(E_GetAuthority, gerror->message);
g_error_free(gerror);
return;
}
+#else
+ pkAuthority = polkit_authority_get();
+#endif
}
if (pkAuthority == NULL) {
+#ifdef POLKIT_QT_1_COMPATIBILITY_MODE
+ (E_GetAuthority);
+#endif
return;
}
@@ -220,8 +230,9 @@
void Authority::Private::setError(Authority::ErrorCode code, const QString &details, bool recover)
{
- if (recover)
+ if (recover) {
init();
+ }
m_lastError = code;
m_errorDetails = details;
m_hasError = true;
@@ -252,8 +263,9 @@
Q_EMIT q->consoleKitDBChanged();
// TODO: Test this with the multiseat support
- if (message.member() == "SeatAdded")
+ if (message.member() == "SeatAdded") {
seatSignalsConnect(qVariantValue<QDBusObjectPath> (message.arguments()[0]).path());
+ }
}
}
@@ -269,10 +281,11 @@
const QString Authority::errorDetails() const
{
- if (d->m_lastError == E_None)
+ if (d->m_lastError == E_None) {
return QString();
- else
+ } else {
return d->m_errorDetails;
+ }
}
void Authority::clearError()
@@ -360,8 +373,9 @@
if (error != NULL) {
// We don't want to set error if this is cancellation of some action
- if (error->code != 1)
+ if (error->code != 1) {
authority->d->setError(E_CheckFailed, error->message);
+ }
g_error_free(error);
return;
}
@@ -375,8 +389,9 @@
void Authority::checkAuthorizationCancel()
{
- if (!g_cancellable_is_cancelled(d->m_checkAuthorizationCancellable))
+ if (!g_cancellable_is_cancelled(d->m_checkAuthorizationCancellable)) {
g_cancellable_cancel(d->m_checkAuthorizationCancellable);
+ }
}
ActionDescription::List Authority::enumerateActionsSync()
@@ -420,8 +435,9 @@
GList *list = polkit_authority_enumerate_actions_finish((PolkitAuthority *) object, result, &error);
if (error != NULL) {
// We don't want to set error if this is cancellation of some action
- if (error->code != 1)
+ if (error->code != 1) {
authority->d->setError(E_EnumFailed, error->message);
+ }
g_error_free(error);
return;
}
@@ -431,8 +447,9 @@
void Authority::enumerateActionsCancel()
{
- if (!g_cancellable_is_cancelled(d->m_enumerateActionsCancellable))
+ if (!g_cancellable_is_cancelled(d->m_enumerateActionsCancellable)) {
g_cancellable_cancel(d->m_enumerateActionsCancellable);
+ }
}
bool Authority::registerAuthenticationAgentSync(const Subject &subject, const QString &locale, const QString &objectPath)
@@ -490,8 +507,9 @@
bool res = polkit_authority_register_authentication_agent_finish((PolkitAuthority *) object, result, &error);
if (error != NULL) {
// We don't want to set error if this is cancellation of some action
- if (error->code != 1)
+ if (error->code != 1) {
authority->d->setError(E_EnumFailed , error->message);
+ }
g_error_free(error);
return;
}
@@ -501,14 +519,16 @@
void Authority::registerAuthenticationAgentCancel()
{
- if (!g_cancellable_is_cancelled(d->m_registerAuthenticationAgentCancellable))
+ if (!g_cancellable_is_cancelled(d->m_registerAuthenticationAgentCancellable)) {
g_cancellable_cancel(d->m_registerAuthenticationAgentCancellable);
+ }
}
bool Authority::unregisterAuthenticationAgentSync(const Subject &subject, const QString &objectPath)
{
- if (d->pkAuthority)
+ if (d->pkAuthority) {
return false;
+ }
if (!subject.isValid()) {
d->setError(E_WrongSubject);
@@ -534,8 +554,9 @@
void Authority::unregisterAuthenticationAgent(const Subject &subject, const QString &objectPath)
{
- if (Authority::instance()->hasError())
+ if (Authority::instance()->hasError()) {
return;
+ }
if (!subject.isValid()) {
d->setError(E_WrongSubject);
@@ -558,8 +579,9 @@
bool res = polkit_authority_unregister_authentication_agent_finish((PolkitAuthority *) object, result, &error);
if (error != NULL) {
// We don't want to set error if this is cancellation of some action
- if (error->code != 1)
+ if (error->code != 1) {
authority->d->setError(E_UnregisterFailed, error->message);
+ }
g_error_free(error);
return;
}
@@ -569,14 +591,16 @@
void Authority::unregisterAuthenticationAgentCancel()
{
- if (!g_cancellable_is_cancelled(d->m_unregisterAuthenticationAgentCancellable))
+ if (!g_cancellable_is_cancelled(d->m_unregisterAuthenticationAgentCancellable)) {
g_cancellable_cancel(d->m_unregisterAuthenticationAgentCancellable);
+ }
}
bool Authority::authenticationAgentResponseSync(const QString &cookie, const Identity &identity)
{
- if (Authority::instance()->hasError())
+ if (Authority::instance()->hasError()) {
return false;
+ }
if (cookie.isEmpty() || !identity.isValid()) {
d->setError(E_CookieOrIdentityEmpty);
@@ -601,8 +625,9 @@
void Authority::authenticationAgentResponse(const QString &cookie, const Identity &identity)
{
- if (Authority::instance()->hasError())
+ if (Authority::instance()->hasError()) {
return;
+ }
if (cookie.isEmpty() || !identity.isValid()) {
d->setError(E_CookieOrIdentityEmpty);
@@ -625,8 +650,9 @@
bool res = polkit_authority_authentication_agent_response_finish((PolkitAuthority *) object, result, &error);
if (error != NULL) {
// We don't want to set error if this is cancellation of some action
- if (error->code != 1)
+ if (error->code != 1) {
authority->d->setError(E_AgentResponseFailed, error->message);
+ }
g_error_free(error);
return;
}
@@ -636,8 +662,9 @@
void Authority::authenticationAgentResponseCancel()
{
- if (!g_cancellable_is_cancelled(d->m_authenticationAgentResponseCancellable))
+ if (!g_cancellable_is_cancelled(d->m_authenticationAgentResponseCancellable)) {
g_cancellable_cancel(d->m_authenticationAgentResponseCancellable);
+ }
}
TemporaryAuthorization::List Authority::enumerateTemporaryAuthorizationsSync(const Subject &subject)
@@ -676,8 +703,9 @@
if (error != NULL) {
// We don't want to set error if this is cancellation of some action
- if (error->code != 1)
+ if (error->code != 1) {
authority->d->setError(E_EnumFailed, error->message);
+ }
g_error_free(error);
return;
}
@@ -695,15 +723,17 @@
void Authority::enumerateTemporaryAuthorizationsCancel()
{
- if (!g_cancellable_is_cancelled(d->m_enumerateTemporaryAuthorizationsCancellable))
+ if (!g_cancellable_is_cancelled(d->m_enumerateTemporaryAuthorizationsCancellable)) {
g_cancellable_cancel(d->m_enumerateTemporaryAuthorizationsCancellable);
+ }
}
bool Authority::revokeTemporaryAuthorizationsSync(const Subject &subject)
{
bool result;
- if (Authority::instance()->hasError())
+ if (Authority::instance()->hasError()) {
return false;
+ }
GError *error = NULL;
result = polkit_authority_revoke_temporary_authorizations_sync(d->pkAuthority,
@@ -720,8 +750,9 @@
void Authority::revokeTemporaryAuthorizations(const Subject &subject)
{
- if (Authority::instance()->hasError())
+ if (Authority::instance()->hasError()) {
return;
+ }
polkit_authority_revoke_temporary_authorizations(d->pkAuthority,
subject.subject(),
@@ -740,8 +771,9 @@
if (error != NULL) {
// We don't want to set error if this is cancellation of some action
- if (error->code != 1)
+ if (error->code != 1) {
authority->d->setError(E_RevokeFailed, error->message);
+ }
g_error_free(error);
return;
}
@@ -751,15 +783,17 @@
void Authority::revokeTemporaryAuthorizationsCancel()
{
- if (!g_cancellable_is_cancelled(d->m_revokeTemporaryAuthorizationsCancellable))
+ if (!g_cancellable_is_cancelled(d->m_revokeTemporaryAuthorizationsCancellable)) {
g_cancellable_cancel(d->m_revokeTemporaryAuthorizationsCancellable);
+ }
}
bool Authority::revokeTemporaryAuthorizationSync(const QString &id)
{
bool result;
- if (Authority::instance()->hasError())
+ if (Authority::instance()->hasError()) {
return false;
+ }
GError *error = NULL;
result = polkit_authority_revoke_temporary_authorization_by_id_sync(d->pkAuthority,
@@ -776,8 +810,9 @@
void Authority::revokeTemporaryAuthorization(const QString &id)
{
- if (Authority::instance()->hasError())
+ if (Authority::instance()->hasError()) {
return;
+ }
polkit_authority_revoke_temporary_authorization_by_id(d->pkAuthority,
id.toUtf8().data(),
@@ -796,8 +831,9 @@
if (error != NULL) {
// We don't want to set error if this is cancellation of some action
- if (error->code != 1)
+ if (error->code != 1) {
authority->d->setError(E_RevokeFailed, error->message);
+ }
g_error_free(error);
return;
}
@@ -807,8 +843,9 @@
void Authority::revokeTemporaryAuthorizationCancel()
{
- if (!g_cancellable_is_cancelled(d->m_revokeTemporaryAuthorizationCancellable))
+ if (!g_cancellable_is_cancelled(d->m_revokeTemporaryAuthorizationCancellable)) {
g_cancellable_cancel(d->m_revokeTemporaryAuthorizationCancellable);
+ }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/core/polkitqt1-details.cpp new/polkit-qt-1-0.99.1/core/polkitqt1-details.cpp
--- old/polkit-qt-1-0.98.1/core/polkitqt1-details.cpp 2010-10-26 18:52:00.000000000 +0200
+++ new/polkit-qt-1-0.99.1/core/polkitqt1-details.cpp 2010-12-09 10:15:16.000000000 +0100
@@ -72,10 +72,11 @@
QString Details::lookup(const QString &key) const
{
const gchar *result = polkit_details_lookup(d->polkitDetails, key.toUtf8().data());
- if (result != NULL)
+ if (result != NULL) {
return QString::fromUtf8(result);
- else
+ } else {
return QString();
+ }
}
void Details::insert(const QString &key, const QString &value)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/gui/CMakeLists.txt new/polkit-qt-1-0.99.1/gui/CMakeLists.txt
--- old/polkit-qt-1-0.98.1/gui/CMakeLists.txt 2010-10-26 18:52:00.000000000 +0200
+++ new/polkit-qt-1-0.99.1/gui/CMakeLists.txt 2010-12-09 10:15:16.000000000 +0100
@@ -1,6 +1,6 @@
include_directories(
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
)
set(polkit_qt_gui_SRCS
@@ -12,16 +12,15 @@
automoc4_add_library(polkit-qt-gui-1 SHARED ${polkit_qt_gui_SRCS})
target_link_libraries(polkit-qt-gui-1
- polkit-qt-core-1
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
- ${QT_QTDBUS_LIBRARY}
- ${POLKIT_LIBRARIES}
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+ ${QT_QTDBUS_LIBRARY}
+ ${POLKIT_LIBRARIES}
+ polkit-qt-core-1
)
-set_target_properties(polkit-qt-gui-1 PROPERTIES VERSION ${CMAKE_POLKITQT-1_VERSION_STRING}
- SOVERSION ${CMAKE_MAJOR_POLKITQT-1_VERSION}
- DEFINE_SYMBOL MAKE_POLKITQT1_LIB
- )
+set_target_properties(polkit-qt-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})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/gui/polkitqt1-gui-action.cpp new/polkit-qt-1-0.99.1/gui/polkitqt1-gui-action.cpp
--- old/polkit-qt-1-0.98.1/gui/polkitqt1-gui-action.cpp 2010-10-26 18:52:00.000000000 +0200
+++ new/polkit-qt-1-0.99.1/gui/polkitqt1-gui-action.cpp 2010-12-09 10:15:16.000000000 +0100
@@ -164,48 +164,48 @@
}
switch (pkResult) {
- default:
- case Authority::Unknown:
- case Authority::No:
- qobject_cast(parent)->setVisible(noVisible);
- qobject_cast(parent)->setEnabled(noEnabled);
- qobject_cast(parent)->setText(noText);
- if (!noWhatsThis.isNull()) {
- qobject_cast(parent)->setWhatsThis(noWhatsThis);
- }
- if (!noToolTip.isNull()) {
- qobject_cast(parent)->setToolTip(noToolTip);
- }
- qobject_cast(parent)->setIcon(noIcon);
- break;
-
- case Authority::Challenge:
- qobject_cast(parent)->setVisible(authVisible);
- qobject_cast(parent)->setEnabled(authEnabled);
- qobject_cast(parent)->setText(authText);
- if (!authWhatsThis.isNull()) {
- qobject_cast(parent)->setWhatsThis(authWhatsThis);
- }
- if (!authToolTip.isNull()) {
- qobject_cast(parent)->setToolTip(authToolTip);
- }
- qobject_cast(parent)->setIcon(authIcon);
- break;
- case Authority::Yes:
- qobject_cast(parent)->setVisible(yesVisible);
- qobject_cast(parent)->setEnabled(yesEnabled);
- qobject_cast(parent)->setText(yesText);
- if (!yesWhatsThis.isNull()) {
- qobject_cast(parent)->setWhatsThis(yesWhatsThis);
- }
- if (!yesToolTip.isNull()) {
- qobject_cast(parent)->setToolTip(yesToolTip);
- }
- qobject_cast(parent)->setIcon(yesIcon);
- if (parent->isCheckable()) {
- qobject_cast(parent)->setChecked(!initiallyChecked);
- }
- break;
+ default:
+ case Authority::Unknown:
+ case Authority::No:
+ qobject_cast(parent)->setVisible(noVisible);
+ qobject_cast(parent)->setEnabled(noEnabled);
+ qobject_cast(parent)->setText(noText);
+ if (!noWhatsThis.isNull()) {
+ qobject_cast(parent)->setWhatsThis(noWhatsThis);
+ }
+ if (!noToolTip.isNull()) {
+ qobject_cast(parent)->setToolTip(noToolTip);
+ }
+ qobject_cast(parent)->setIcon(noIcon);
+ break;
+
+ case Authority::Challenge:
+ qobject_cast(parent)->setVisible(authVisible);
+ qobject_cast(parent)->setEnabled(authEnabled);
+ qobject_cast(parent)->setText(authText);
+ if (!authWhatsThis.isNull()) {
+ qobject_cast(parent)->setWhatsThis(authWhatsThis);
+ }
+ if (!authToolTip.isNull()) {
+ qobject_cast(parent)->setToolTip(authToolTip);
+ }
+ qobject_cast(parent)->setIcon(authIcon);
+ break;
+ case Authority::Yes:
+ qobject_cast(parent)->setVisible(yesVisible);
+ qobject_cast(parent)->setEnabled(yesEnabled);
+ qobject_cast(parent)->setText(yesText);
+ if (!yesWhatsThis.isNull()) {
+ qobject_cast(parent)->setWhatsThis(yesWhatsThis);
+ }
+ if (!yesToolTip.isNull()) {
+ qobject_cast(parent)->setToolTip(yesToolTip);
+ }
+ qobject_cast(parent)->setIcon(yesIcon);
+ if (parent->isCheckable()) {
+ qobject_cast(parent)->setChecked(!initiallyChecked);
+ }
+ break;
}
Q_EMIT parent->dataChanged();
}
@@ -234,10 +234,11 @@
qint64 Action::targetPID() const
{
- if (d->targetPID != 0)
+ if (d->targetPID != 0) {
return d->targetPID;
- else
+ } else {
return QCoreApplication::applicationPid();
+ }
}
void Action::setTargetPID(qint64 pid)
@@ -286,18 +287,18 @@
QString Action::text(Action::State state) const
{
switch (state) {
- case Yes:
- return d->yesText;
- case No:
- return d->noText;
- case Auth:
- return d->authText;
- case SelfBlocked:
- return d->selfBlockedText;
- case None:
- return QAction::text();
- default:
- return QString();
+ case Yes:
+ return d->yesText;
+ case No:
+ return d->noText;
+ case Auth:
+ return d->authText;
+ case SelfBlocked:
+ return d->selfBlockedText;
+ case None:
+ return QAction::text();
+ default:
+ return QString();
}
}
@@ -324,18 +325,18 @@
QString Action::toolTip(Action::State state) const
{
switch (state) {
- case Yes:
- return d->yesToolTip;
- case No:
- return d->noToolTip;
- case Auth:
- return d->authToolTip;
- case SelfBlocked:
- return d->selfBlockedToolTip;
- case None:
- return QAction::toolTip();
- default:
- return QString();
+ case Yes:
+ return d->yesToolTip;
+ case No:
+ return d->noToolTip;
+ case Auth:
+ return d->authToolTip;
+ case SelfBlocked:
+ return d->selfBlockedToolTip;
+ case None:
+ return QAction::toolTip();
+ default:
+ return QString();
}
}
@@ -362,18 +363,18 @@
QString Action::whatsThis(Action::State state) const
{
switch (state) {
- case Yes:
- return d->yesWhatsThis;
- case No:
- return d->noWhatsThis;
- case Auth:
- return d->authWhatsThis;
- case SelfBlocked:
- return d->selfBlockedWhatsThis;
- case None:
- return QAction::whatsThis();
- default:
- return QString();
+ case Yes:
+ return d->yesWhatsThis;
+ case No:
+ return d->noWhatsThis;
+ case Auth:
+ return d->authWhatsThis;
+ case SelfBlocked:
+ return d->selfBlockedWhatsThis;
+ case None:
+ return QAction::whatsThis();
+ default:
+ return QString();
}
}
@@ -400,18 +401,18 @@
QIcon Action::icon(Action::State state) const
{
switch (state) {
- case Yes:
- return d->yesIcon;
- case No:
- return d->noIcon;
- case Auth:
- return d->authIcon;
- case SelfBlocked:
- return d->selfBlockedIcon;
- case None:
- return QAction::icon();
- default:
- return QIcon();
+ case Yes:
+ return d->yesIcon;
+ case No:
+ return d->noIcon;
+ case Auth:
+ return d->authIcon;
+ case SelfBlocked:
+ return d->selfBlockedIcon;
+ case None:
+ return QAction::icon();
+ default:
+ return QIcon();
}
}
@@ -438,18 +439,18 @@
bool Action::isEnabled(Action::State state) const
{
switch (state) {
- case Yes:
- return d->yesEnabled;
- case No:
- return d->noEnabled;
- case Auth:
- return d->authEnabled;
- case SelfBlocked:
- return d->selfBlockedEnabled;
- case None:
- return QAction::isEnabled();
- default:
- return false;
+ case Yes:
+ return d->yesEnabled;
+ case No:
+ return d->noEnabled;
+ case Auth:
+ return d->authEnabled;
+ case SelfBlocked:
+ return d->selfBlockedEnabled;
+ case None:
+ return QAction::isEnabled();
+ default:
+ return false;
}
}
@@ -476,18 +477,18 @@
bool Action::isVisible(Action::State state) const
{
switch (state) {
- case Yes:
- return d->yesVisible;
- case No:
- return d->noVisible;
- case Auth:
- return d->authVisible;
- case SelfBlocked:
- return d->selfBlockedVisible;
- case None:
- return QAction::isVisible();
- default:
- return false;
+ case Yes:
+ return d->yesVisible;
+ case No:
+ return d->noVisible;
+ case Auth:
+ return d->authVisible;
+ case SelfBlocked:
+ return d->selfBlockedVisible;
+ case None:
+ return QAction::isVisible();
+ default:
+ return false;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/polkit-qt-1.pc.cmake new/polkit-qt-1-0.99.1/polkit-qt-1.pc.cmake
--- old/polkit-qt-1-0.98.1/polkit-qt-1.pc.cmake 2010-10-26 18:52:00.000000000 +0200
+++ new/polkit-qt-1-0.99.1/polkit-qt-1.pc.cmake 2010-12-09 10:15:16.000000000 +0100
@@ -5,7 +5,7 @@
Name: polkit-qt-1
Description: Convenience library for using polkit with a Qt-styled API
-Version: @CMAKE_POLKITQT-1_VERSION_STRING@
+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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/polkit-qt-agent-1.pc.cmake new/polkit-qt-1-0.99.1/polkit-qt-agent-1.pc.cmake
--- old/polkit-qt-1-0.98.1/polkit-qt-agent-1.pc.cmake 2010-10-26 18:52:00.000000000 +0200
+++ new/polkit-qt-1-0.99.1/polkit-qt-agent-1.pc.cmake 2010-12-09 10:15:16.000000000 +0100
@@ -5,7 +5,7 @@
Name: polkit-qt-agent-1
Description: Convenience library for using polkit Agent with a Qt-styled API
-Version: @CMAKE_POLKITQT-1_VERSION_STRING@
+Version: @POLKITQT-1_VERSION_STRING@
Requires: QtCore QtGui
Libs: -L${libdir} -lpolkit-qt-agent-1
Cflags: -I${includedir}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/polkit-qt-core-1.pc.cmake new/polkit-qt-1-0.99.1/polkit-qt-core-1.pc.cmake
--- old/polkit-qt-1-0.98.1/polkit-qt-core-1.pc.cmake 2010-10-26 18:52:00.000000000 +0200
+++ new/polkit-qt-1-0.99.1/polkit-qt-core-1.pc.cmake 2010-12-09 10:15:16.000000000 +0100
@@ -5,7 +5,7 @@
Name: polkit-qt-core-1
Description: Convenience library for using polkit with a Qt-styled API, non-GUI classes
-Version: @CMAKE_POLKITQT-1_VERSION_STRING@
+Version: @POLKITQT-1_VERSION_STRING@
Requires: QtCore
Libs: -L${libdir} -lpolkit-qt-core-1
Cflags: -I${includedir}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/polkit-qt-gui-1.pc.cmake new/polkit-qt-1-0.99.1/polkit-qt-gui-1.pc.cmake
--- old/polkit-qt-1-0.98.1/polkit-qt-gui-1.pc.cmake 2010-10-26 18:52:00.000000000 +0200
+++ new/polkit-qt-1-0.99.1/polkit-qt-gui-1.pc.cmake 2010-12-09 10:15:16.000000000 +0100
@@ -5,7 +5,7 @@
Name: polkit-qt-gui-1
Description: Convenience library for using polkit with a Qt-styled API, GUI classes
-Version: @CMAKE_POLKITQT-1_VERSION_STRING@
+Version: @POLKITQT-1_VERSION_STRING@
Requires: QtCore QtGui polkit-qt-core-1
Libs: -L${libdir} -lpolkit-qt-gui-1
Cflags: -I${includedir}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.98.1/polkitqt1-version.h.cmake new/polkit-qt-1-0.99.1/polkitqt1-version.h.cmake
--- old/polkit-qt-1-0.98.1/polkitqt1-version.h.cmake 2010-10-26 18:52:00.000000000 +0200
+++ new/polkit-qt-1-0.99.1/polkitqt1-version.h.cmake 2010-12-09 10:15:16.000000000 +0100
@@ -24,16 +24,16 @@
#include "polkitqt1-export.h"
/// @brief PolkitQt-1 version as string at compile time.
-#define POLKITQT1_VERSION_STRING "${CMAKE_POLKITQT-1_VERSION_STRING}"
+#define POLKITQT1_VERSION_STRING "${POLKITQT-1_VERSION_STRING}"
/// @brief The major PolkitQt-1 version number at compile time
-#define POLKITQT1_VERSION_MAJOR ${CMAKE_MAJOR_POLKITQT-1_VERSION}
+#define POLKITQT1_VERSION_MAJOR ${POLKITQT-1_VERSION_MAJOR}
/// @brief The minor PolkitQt-1 version number at compile time
-#define POLKITQT1_VERSION_MINOR ${CMAKE_MINOR_POLKITQT-1_VERSION}
+#define POLKITQT1_VERSION_MINOR ${POLKITQT-1_VERSION_MINOR}
-/// @brief The PolkitQt-1 release version number at compile time
-#define POLKITQT1_VERSION_RELEASE ${CMAKE_RELEASE_POLKITQT-1_VERSION}
+/// @brief The PolkitQt-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
@@ -51,7 +51,7 @@
* use the version methods in the PolkitQt-1 namespace.
*/
#define POLKITQT1_VERSION \
- POLKITQT1_MAKE_VERSION(POLKITQT1_VERSION_MAJOR,POLKITQT1_VERSION_MINOR,POLKITQT1_VERSION_RELEASE)
+ 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
@@ -87,11 +87,11 @@
POLKITQT1_EXPORT unsigned int versionMinor();
/**
- * @brief Returns the release of PolkitQt-1's version, e.g.
+ * @brief Returns the patch number of PolkitQt-1's version, e.g.
* 2 for %PolkitQt-1 1.0.2.
* @return the release number at runtime.
*/
- POLKITQT1_EXPORT unsigned int versionRelease();
+ POLKITQT1_EXPORT unsigned int versionPatch();
/**
* @brief Returns the %PolkitQt-1 version as string, e.g. "1.0.2".
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org