Hello community, here is the log from the commit of package kauth for openSUSE:Factory checked in at 2015-06-23 12:06:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kauth (Old) and /work/SRC/openSUSE:Factory/.kauth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kauth" Changes: -------- --- /work/SRC/openSUSE:Factory/kauth/kauth.changes 2015-05-11 19:48:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kauth.new/kauth.changes 2015-06-23 12:06:06.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Jun 7 19:07:11 UTC 2015 - [email protected] + +- Update to 5.11.0 + * Make KAUTH_HELPER_INSTALL_ABSOLUTE_DIR available to all KAuth users + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.11.0.php +- Drop 0001-Create-reproducible-builds.patch, merged upstream + +------------------------------------------------------------------- Old: ---- 0001-Create-reproducible-builds.patch kauth-5.10.0.tar.xz New: ---- kauth-5.11.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kauth.spec ++++++ --- /var/tmp/diff_new_pack.EvQqXN/_old 2015-06-23 12:06:06.000000000 +0200 +++ /var/tmp/diff_new_pack.EvQqXN/_new 2015-06-23 12:06:06.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Auth5 -%define _tar_path 5.10 +%define _tar_path 5.11 Name: kauth -Version: 5.10.0 +Version: 5.11.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 @@ -40,8 +40,6 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-UPSTREAM 0001-Create-reproducible-builds.patch -Patch0: 0001-Create-reproducible-builds.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -72,7 +70,6 @@ %lang_package -n %lname %prep %setup -q -%patch0 -p1 %build %cmake_kf5 -d build -- -DSYSCONF_INSTALL_DIR=%{_kf5_sysconfdir} ++++++ kauth-5.10.0.tar.xz -> kauth-5.11.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.10.0/CMakeLists.txt new/kauth-5.11.0/CMakeLists.txt --- old/kauth-5.10.0/CMakeLists.txt 2015-05-03 17:03:47.000000000 +0200 +++ new/kauth-5.11.0/CMakeLists.txt 2015-06-06 23:07:56.000000000 +0200 @@ -2,7 +2,11 @@ project(KAuth) -find_package(ECM 5.10.0 REQUIRED NO_MODULE) +include(FeatureSummary) +find_package(ECM 5.11.0 NO_MODULE) +set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) +feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) set(REQUIRED_QT_VERSION 5.2.0) @@ -13,15 +17,15 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -include(FeatureSummary) + include(GenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) include(ECMPoQmTools) -set(KF5_VERSION "5.10.0") # handled by release scripts -set(KF5_DEP_VERSION "5.10.0") # handled by release scripts +set(KF5_VERSION "5.11.0") # handled by release scripts +set(KF5_DEP_VERSION "5.11.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KAUTH VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kauth_version.h" @@ -32,6 +36,12 @@ set(KAUTH_HELPER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR}/kauth") +if(IS_ABSOLUTE ${KAUTH_HELPER_INSTALL_DIR}) + set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR ${KAUTH_HELPER_INSTALL_DIR}) +else() + set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "${CMAKE_INSTALL_PREFIX}/${KAUTH_HELPER_INSTALL_DIR}") +endif() + if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") ecm_install_po_files_as_qm(po) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.10.0/KF5AuthConfig.cmake.in new/kauth-5.11.0/KF5AuthConfig.cmake.in --- old/kauth-5.10.0/KF5AuthConfig.cmake.in 2015-05-03 17:03:47.000000000 +0200 +++ new/kauth-5.11.0/KF5AuthConfig.cmake.in 2015-06-06 23:07:56.000000000 +0200 @@ -6,6 +6,7 @@ set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@") set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@") set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@") +set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@") find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.10.0/autotests/CMakeLists.txt new/kauth-5.11.0/autotests/CMakeLists.txt --- old/kauth-5.10.0/autotests/CMakeLists.txt 2015-05-03 17:03:47.000000000 +0200 +++ new/kauth-5.11.0/autotests/CMakeLists.txt 2015-06-06 23:07:56.000000000 +0200 @@ -18,6 +18,7 @@ ../src/kauthactionreply.cpp ../src/kauthexecutejob.cpp ../src/AuthBackend.cpp + ../src/kauthdebug.cpp # Use our "special" backends manager BackendsManager.cpp ../src/HelperProxy.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.10.0/cmake/KF5AuthMacros.cmake new/kauth-5.11.0/cmake/KF5AuthMacros.cmake --- old/kauth-5.10.0/cmake/KF5AuthMacros.cmake 2015-05-03 17:03:47.000000000 +0200 +++ new/kauth-5.11.0/cmake/KF5AuthMacros.cmake 2015-06-06 23:07:56.000000000 +0200 @@ -39,11 +39,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d/) - if(IS_ABSOLUTE ${KAUTH_HELPER_INSTALL_DIR}) - set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR ${KAUTH_HELPER_INSTALL_DIR}) - else() - set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "${CMAKE_INSTALL_PREFIX}/${KAUTH_HELPER_INSTALL_DIR}") - endif() configure_file(${KAUTH_STUB_FILES_DIR}/dbus_service.stub ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service @@ -73,7 +68,7 @@ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Generating ${HELPER_ID}.policy" DEPENDS KF5::kauth-policy-gen) - add_custom_target("actions for ${HELPER_ID}" ALL DEPENDS ${_output}) + add_custom_target(${HELPER_ID}.policy ALL COMMENT "actions for ${HELPER_ID}" DEPENDS ${_output}) install(FILES ${_output} DESTINATION ${KAUTH_POLICY_FILES_INSTALL_DIR}) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.10.0/po/nb/kauth5_qt.po new/kauth-5.11.0/po/nb/kauth5_qt.po --- old/kauth-5.10.0/po/nb/kauth5_qt.po 2015-05-03 17:03:47.000000000 +0200 +++ new/kauth-5.11.0/po/nb/kauth5_qt.po 2015-06-06 23:07:56.000000000 +0200 @@ -1,10 +1,10 @@ # Translation of kauth5_qt to Norwegian Bokmål # -# Knut Yrvin <[email protected]>, 2002, 2003, 2004, 2005. +# Knut Yrvin <[email protected]>, 2002, 2003, 2004, 2005. # Bjørn Steensrud <[email protected]>, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. # Eskild Hustvedt <[email protected]>, 2004, 2005. # Gaute Hvoslef Kvalnes <[email protected]>, 2004, 2005. -# Axel Bojer <[email protected]>, 2005, 2006. +# Axel Bojer <[email protected]>, 2005, 2006. # Nils Kristian Tomren <[email protected]>, 2005, 2007. # Øyvind A. Holm <[email protected]>, 2009. msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.10.0/po/nn/kauth5_qt.po new/kauth-5.11.0/po/nn/kauth5_qt.po --- old/kauth-5.10.0/po/nn/kauth5_qt.po 2015-05-03 17:03:47.000000000 +0200 +++ new/kauth-5.11.0/po/nn/kauth5_qt.po 2015-06-06 23:07:56.000000000 +0200 @@ -2,21 +2,21 @@ # # Gaute Hvoslef Kvalnes <[email protected]>, 2003, 2004, 2005, 2006. # Håvard Korsvoll <[email protected]>, 2003, 2005. -# Karl Ove Hufthammer <[email protected]>, 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. +# Karl Ove Hufthammer <[email protected]>, 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. # Eirik U. Birkeland <[email protected]>, 2008, 2009, 2010. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-02-28 03:44+0000\n" -"PO-Revision-Date: 2013-05-12 14:38+0200\n" +"PO-Revision-Date: 2015-06-01 20:23+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" "Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" @@ -24,39 +24,35 @@ "X-Qt-Contexts: true\n" #: backends/dbus/DBusHelperProxy.cpp:80 -#, fuzzy msgctxt "KAuth::DBusHelperProxy|" msgid "DBus Backend error: connection to helper failed. " -msgstr "D-Bus-feil: Klarte ikkje kopla til hjelparen. %1" +msgstr "Feil ved DBus-motor: klarte ikkje kopla til hjelparen." #: backends/dbus/DBusHelperProxy.cpp:98 -#, fuzzy msgctxt "KAuth::DBusHelperProxy|" msgid "DBus Backend error: could not contact the helper. Connection error: " msgstr "" -"D-Bus-feil: Klarte ikkje kontakta hjelparen. Sambandsfeil: %1. " -"Meldingsfeil: %2" +"Feil ved DBus-motor: klarte ikkje kontakta hjelparen. Tilkoplingsfeil: " #: backends/dbus/DBusHelperProxy.cpp:99 -#, fuzzy msgctxt "KAuth::DBusHelperProxy|" msgid ". Message error: " -msgstr "systemfeil: %1" +msgstr ". Meldingsfeil: " #: kauthexecutejob.cpp:88 msgctxt "KAuth::ExecuteJob|" msgid "Tried to start an invalid action" -msgstr "" +msgstr "Prøvde å starta ei ugyldig handling" #: kauthexecutejob.cpp:102 msgctxt "KAuth::ExecuteJob|" msgid "Unknown execution mode chosen" -msgstr "" +msgstr "Ukjend køyremodus vald" #: kauthexecutejob.cpp:140 msgctxt "KAuth::ExecuteJob|" msgid "Unknown status for the authentication procedure" -msgstr "" +msgstr "Ukjend status for autentiseringsprosedyren" #: kauthexecutejob.cpp:149 msgctxt "KAuth::ExecuteJob|" @@ -64,8 +60,10 @@ "The current backend only allows helper authorization, but this action does " "not have a helper." msgstr "" +"Den gjeldande motoren tillèt berre hjelparautorisering, men denne handlinga " +"har ikkje nokon hjelpar." #: kauthexecutejob.cpp:157 kauthexecutejob.cpp:181 msgctxt "KAuth::ExecuteJob|" msgid "The backend does not specify how to authorize" -msgstr "" +msgstr "Denne motoren definerer ikkje korleis autoriseringa skal føregå" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.10.0/src/BackendsManager.cpp new/kauth-5.11.0/src/BackendsManager.cpp --- old/kauth-5.10.0/src/BackendsManager.cpp 2015-05-03 17:03:47.000000000 +0200 +++ new/kauth-5.11.0/src/BackendsManager.cpp 2015-06-06 23:07:56.000000000 +0200 @@ -24,10 +24,10 @@ // Include fake backends #include "backends/fake/FakeBackend.h" #include "backends/fakehelper/FakeHelperProxy.h" +#include "kauthdebug.h" #include <QPluginLoader> #include <QDir> -#include <QDebug> #include <QCoreApplication> namespace KAuth @@ -63,7 +63,7 @@ if (instance) { retlist.append(instance); } else { - qWarning() << "Couldn't load" << filePath << "error:" << loader.errorString(); + qCWarning(KAUTH) << "Couldn't load" << filePath << "error:" << loader.errorString(); } } return retlist; @@ -96,7 +96,7 @@ auth = new FakeBackend; #if !KAUTH_COMPILING_FAKE_BACKEND // Spit a fat warning - qWarning() << "WARNING: KAuth was compiled with a working backend, but was unable to load it! Check your installation!"; + qCWarning(KAUTH) << "WARNING: KAuth was compiled with a working backend, but was unable to load it! Check your installation!"; #endif } @@ -105,7 +105,7 @@ helper = new FakeHelperProxy; #if !KAUTH_COMPILING_FAKE_BACKEND // Spit a fat warning - qWarning() << "WARNING: KAuth was compiled with a working helper backend, but was unable to load it! " + qCWarning(KAUTH) << "WARNING: KAuth was compiled with a working helper backend, but was unable to load it! " "Check your installation!"; #endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.10.0/src/CMakeLists.txt new/kauth-5.11.0/src/CMakeLists.txt --- old/kauth-5.10.0/src/CMakeLists.txt 2015-05-03 17:03:47.000000000 +0200 +++ new/kauth-5.11.0/src/CMakeLists.txt 2015-06-06 23:07:56.000000000 +0200 @@ -18,6 +18,7 @@ BackendsManager.cpp HelperProxy.cpp kauthhelpersupport.cpp + kauthdebug.cpp backends/fake/FakeBackend.cpp backends/fakehelper/FakeHelperProxy.cpp ${KAuth_QM_LOADER} @@ -68,7 +69,7 @@ if (NOT "${KAUTH_BACKEND_NAME}" STREQUAL "FAKE") set(KAUTH_BACKEND_SRCS ${KAUTH_BACKEND_SRCS}) # KAuth::AuthBackend is not exported - add_library(kauth_backend_plugin MODULE ${KAUTH_BACKEND_SRCS} AuthBackend.cpp) + add_library(kauth_backend_plugin MODULE ${KAUTH_BACKEND_SRCS} AuthBackend.cpp kauthdebug.cpp) target_link_libraries(kauth_backend_plugin PRIVATE ${KAUTH_BACKEND_LIBS}) set_target_properties(kauth_backend_plugin PROPERTIES PREFIX "") @@ -83,7 +84,7 @@ if (NOT "${KAUTH_HELPER_BACKEND_NAME}" STREQUAL "FAKE") # KAuth::HelperProxy is not exported - add_library(kauth_helper_plugin MODULE ${KAUTH_HELPER_BACKEND_SRCS} HelperProxy.cpp) + add_library(kauth_helper_plugin MODULE ${KAUTH_HELPER_BACKEND_SRCS} HelperProxy.cpp kauthdebug.cpp) target_link_libraries(kauth_helper_plugin PRIVATE ${KAUTH_HELPER_BACKEND_LIBS}) set_target_properties(kauth_helper_plugin PROPERTIES PREFIX "") install(TARGETS kauth_helper_plugin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.10.0/src/backends/dbus/DBusHelperProxy.cpp new/kauth-5.11.0/src/backends/dbus/DBusHelperProxy.cpp --- old/kauth-5.10.0/src/backends/dbus/DBusHelperProxy.cpp 2015-05-03 17:03:47.000000000 +0200 +++ new/kauth-5.11.0/src/backends/dbus/DBusHelperProxy.cpp 2015-06-06 23:07:56.000000000 +0200 @@ -25,11 +25,11 @@ #include <QMap> #include <QtDBus/QDBusMessage> #include <QtDBus/QDBusConnection> -#include <QDebug> #include <QTimer> #include "BackendsManager.h" #include "kf5authadaptor.h" +#include "kauthdebug.h" namespace KAuth { @@ -97,7 +97,7 @@ ActionReply r = ActionReply::DBusErrorReply(); r.setErrorDescription(tr("DBus Backend error: could not contact the helper. " "Connection error: ") + m_busConnection.lastError().message() + tr(". Message error: ") + pendingCall.reply().errorMessage()); - qDebug() << pendingCall.reply().errorMessage(); + qCDebug(KAUTH) << pendingCall.reply().errorMessage(); emit actionPerformed(action, r); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.10.0/src/backends/fake/kauth-policy-gen-polkit.cpp new/kauth-5.11.0/src/backends/fake/kauth-policy-gen-polkit.cpp --- old/kauth-5.10.0/src/backends/fake/kauth-policy-gen-polkit.cpp 2015-05-03 17:03:47.000000000 +0200 +++ new/kauth-5.11.0/src/backends/fake/kauth-policy-gen-polkit.cpp 2015-06-06 23:07:56.000000000 +0200 @@ -38,7 +38,7 @@ const char dent[] = " "; -void output(QList<Action> actions, QHash<QString, QString> domain) +void output(QList<Action> actions, QMap<QString, QString> domain) { Q_UNUSED(domain) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.10.0/src/backends/mac/kauth-policy-gen-mac.cpp new/kauth-5.11.0/src/backends/mac/kauth-policy-gen-mac.cpp --- old/kauth-5.10.0/src/backends/mac/kauth-policy-gen-mac.cpp 2015-05-03 17:03:47.000000000 +0200 +++ new/kauth-5.11.0/src/backends/mac/kauth-policy-gen-mac.cpp 2015-06-06 23:07:56.000000000 +0200 @@ -24,7 +24,7 @@ using namespace std; -void output(QList<Action> actions, QHash<QString, QString> domain) +void output(QList<Action> actions, QMap<QString, QString> domain) { AuthorizationRef auth; AuthorizationCreate(NULL, NULL, kAuthorizationFlagDefaults, &auth); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.10.0/src/backends/polkit-1/Polkit1Backend.cpp new/kauth-5.11.0/src/backends/polkit-1/Polkit1Backend.cpp --- old/kauth-5.10.0/src/backends/polkit-1/Polkit1Backend.cpp 2015-05-03 17:03:47.000000000 +0200 +++ new/kauth-5.11.0/src/backends/polkit-1/Polkit1Backend.cpp 2015-06-06 23:07:56.000000000 +0200 @@ -23,7 +23,6 @@ #include <QtCore/qplugin.h> #include <QtCore/QCoreApplication> -#include <QtCore/QDebug> #include <QtCore/QTimer> #include <QApplication> @@ -35,6 +34,8 @@ #include <PolkitQt1/Authority> #include <PolkitQt1/Subject> +#include "kauthdebug.h" + namespace KAuth { @@ -86,7 +87,7 @@ { // If a parent was not specified, skip this if (!parent) { - qDebug() << "Parent widget does not exist, skipping"; + qCDebug(KAUTH) << "Parent widget does not exist, skipping"; return; } @@ -94,7 +95,7 @@ if (QDBusConnection::sessionBus().interface()->isServiceRegistered(QLatin1String("org.kde.Polkit1AuthAgent"))) { // Check if we actually are entitled to use GUI capabilities if (qApp == 0 || !qobject_cast<QApplication *>(qApp)) { - qDebug() << "Not streaming parent as we are on a TTY application"; + qCDebug(KAUTH) << "Not streaming parent as we are on a TTY application"; } // Retrieve the dialog root window Id @@ -112,10 +113,10 @@ call.waitForFinished(); if (call.isError()) { - qWarning() << "ERROR while streaming the parent!!" << call.error(); + qCWarning(KAUTH) << "ERROR while streaming the parent!!" << call.error(); } } else { - qDebug() << "KDE polkit agent appears too old or not registered on the bus"; + qCDebug(KAUTH) << "KDE polkit agent appears too old or not registered on the bus"; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.10.0/src/backends/polkit-1/kauth-policy-gen-polkit1.cpp new/kauth-5.11.0/src/backends/polkit-1/kauth-policy-gen-polkit1.cpp --- old/kauth-5.10.0/src/backends/polkit-1/kauth-policy-gen-polkit1.cpp 2015-05-03 17:03:47.000000000 +0200 +++ new/kauth-5.11.0/src/backends/polkit-1/kauth-policy-gen-polkit1.cpp 2015-06-06 23:07:56.000000000 +0200 @@ -39,7 +39,7 @@ const char dent[] = " "; -void output(QList<Action> actions, QHash<QString, QString> domain) +void output(QList<Action> actions, QMap<QString, QString> domain) { QTextStream out(stdout); out.setCodec("UTF-8"); @@ -47,11 +47,11 @@ out << header; // Blacklisted characters + replacements - QHash< QChar, QString > blacklist; + QMap< QChar, QString > blacklist; blacklist.insert(QLatin1Char('&'), QLatin1String("&")); if (domain.contains(QLatin1String("vendor"))) { - QHash< QChar, QString >::const_iterator blI; + QMap< QChar, QString >::const_iterator blI; QString vendor = domain[QLatin1String("vendor")]; for (blI = blacklist.constBegin(); blI != blacklist.constEnd(); ++blI) { vendor.replace(blI.key(), blI.value()); @@ -69,13 +69,13 @@ out << dent << "<action id=\"" << action.name << "\" >\n"; // Not a typo, messages and descriptions are actually inverted - for (QHash< QString, QString >::const_iterator i = action.messages.constBegin(); i != action.messages.constEnd(); ++i) { + for (QMap< QString, QString >::const_iterator i = action.messages.constBegin(); i != action.messages.constEnd(); ++i) { out << dent << dent << "<description"; if (i.key() != QLatin1String("en")) { out << " xml:lang=\"" << i.key() << '"'; } - QHash< QChar, QString >::const_iterator blI; + QMap< QChar, QString >::const_iterator blI; QString description = i.value(); for (blI = blacklist.constBegin(); blI != blacklist.constEnd(); ++blI) { description.replace(blI.key(), blI.value()); @@ -84,8 +84,8 @@ out << '>' << description << "</description>\n"; } - QHash< QString, QString >::const_iterator i; - for (QHash< QString, QString >::const_iterator i = action.descriptions.constBegin(); + QMap< QString, QString >::const_iterator i; + for (QMap< QString, QString >::const_iterator i = action.descriptions.constBegin(); i != action.descriptions.constEnd(); ++i) { out << dent << dent << "<message"; @@ -93,7 +93,7 @@ out << " xml:lang=\"" << i.key() << '"'; } - QHash< QChar, QString >::const_iterator blI; + QMap< QChar, QString >::const_iterator blI; QString message = i.value(); for (blI = blacklist.constBegin(); blI != blacklist.constEnd(); ++blI) { message.replace(blI.key(), blI.value()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.10.0/src/kauthdebug.cpp new/kauth-5.11.0/src/kauthdebug.cpp --- old/kauth-5.10.0/src/kauthdebug.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kauth-5.11.0/src/kauthdebug.cpp 2015-06-06 23:07:56.000000000 +0200 @@ -0,0 +1,18 @@ +/* + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "kauthdebug.h" + +Q_LOGGING_CATEGORY(KAUTH, "kf5.kauth") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.10.0/src/kauthdebug.h new/kauth-5.11.0/src/kauthdebug.h --- old/kauth-5.10.0/src/kauthdebug.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kauth-5.11.0/src/kauthdebug.h 2015-06-06 23:07:56.000000000 +0200 @@ -0,0 +1,24 @@ +/* + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef KAUTH_DEBUG_H +#define KAUTH_DEBUG_H + +#include <QLoggingCategory> +#include <QDebug> + +Q_DECLARE_LOGGING_CATEGORY(KAUTH) + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.10.0/src/kauthexecutejob.cpp new/kauth-5.11.0/src/kauthexecutejob.cpp --- old/kauth-5.10.0/src/kauthexecutejob.cpp 2015-05-03 17:03:47.000000000 +0200 +++ new/kauth-5.11.0/src/kauthexecutejob.cpp 2015-06-06 23:07:56.000000000 +0200 @@ -23,7 +23,7 @@ #include <QEventLoop> #include <QHash> #include <QTimer> -#include <QDebug> +#include "kauthdebug.h" namespace KAuth { @@ -83,7 +83,7 @@ void ExecuteJob::start() { if (!d->action.isValid()) { - qDebug() << "Tried to start an invalid action"; + qCDebug(KAUTH) << "Tried to start an invalid action"; ActionReply reply(ActionReply::InvalidActionError); reply.setErrorDescription(tr("Tried to start an invalid action")); d->actionPerformedSlot(d->action.name(), reply); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.10.0/src/kauthobjectdecorator.cpp new/kauth-5.11.0/src/kauthobjectdecorator.cpp --- old/kauth-5.10.0/src/kauthobjectdecorator.cpp 2015-05-03 17:03:47.000000000 +0200 +++ new/kauth-5.11.0/src/kauthobjectdecorator.cpp 2015-06-06 23:07:56.000000000 +0200 @@ -21,10 +21,10 @@ #include "kauthaction.h" #include "kauthexecutejob.h" +#include "kauthdebug.h" #include <QAbstractButton> #include <QAction> -#include <QDebug> #include <QIcon> namespace KAuth @@ -66,7 +66,7 @@ return; } - qWarning() << Q_FUNC_INFO << "We're not decorating an action or a button"; + qCWarning(KAUTH) << Q_FUNC_INFO << "We're not decorating an action or a button"; } void ObjectDecoratorPrivate::linkActionToWidget() @@ -83,7 +83,7 @@ return; } - qWarning() << Q_FUNC_INFO << "We're not decorating an action or a widget"; + qCWarning(KAUTH) << Q_FUNC_INFO << "We're not decorating an action or a widget"; } void ObjectDecoratorPrivate::slotActivated() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.10.0/src/policy-gen/policy-gen.cpp new/kauth-5.11.0/src/policy-gen/policy-gen.cpp --- old/kauth-5.10.0/src/policy-gen/policy-gen.cpp 2015-05-03 17:03:47.000000000 +0200 +++ new/kauth-5.11.0/src/policy-gen/policy-gen.cpp 2015-06-06 23:07:56.000000000 +0200 @@ -33,7 +33,7 @@ using namespace std; QList<Action> parse(QSettings &ini); -QHash<QString, QString> parseDomain(QSettings &ini); +QMap<QString, QString> parseDomain(QSettings &ini); int main(int argc, char **argv) { @@ -151,9 +151,9 @@ return actions; } -QHash<QString, QString> parseDomain(QSettings &ini) +QMap<QString, QString> parseDomain(QSettings &ini) { - QHash<QString, QString> rethash; + QMap<QString, QString> rethash; if (ini.childGroups().contains(QString::fromLatin1("Domain"))) { if (ini.contains(QString::fromLatin1("Domain/Name"))) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kauth-5.10.0/src/policy-gen/policy-gen.h new/kauth-5.11.0/src/policy-gen/policy-gen.h --- old/kauth-5.10.0/src/policy-gen/policy-gen.h 2015-05-03 17:03:47.000000000 +0200 +++ new/kauth-5.11.0/src/policy-gen/policy-gen.h 2015-06-06 23:07:56.000000000 +0200 @@ -28,14 +28,14 @@ struct Action { QString name; - QHash<QString, QString> descriptions; - QHash<QString, QString> messages; + QMap<QString, QString> descriptions; + QMap<QString, QString> messages; QString policy; QString policyInactive; QString persistence; }; -extern void output(QList<Action> actions, QHash<QString, QString> domain); +extern void output(QList<Action> actions, QMap<QString, QString> domain); #endif
