Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kf6-knotifications for openSUSE:Factory checked in at 2024-07-14 08:50:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kf6-knotifications (Old) and /work/SRC/openSUSE:Factory/.kf6-knotifications.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kf6-knotifications" Sun Jul 14 08:50:00 2024 rev:5 rq:1187127 version:6.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kf6-knotifications/kf6-knotifications.changes 2024-06-09 20:22:55.983367087 +0200 +++ /work/SRC/openSUSE:Factory/.kf6-knotifications.new.17339/kf6-knotifications.changes 2024-07-14 08:53:20.594683899 +0200 @@ -1,0 +2,12 @@ +Tue Jul 9 09:41:51 UTC 2024 - Christophe Marin <christophe@krop.fr> + +- Update to 6.4.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/6/6.4.0 +- Changes since 6.3.0: + * fix missing HAVE_DBUS usages + * support USE_DBUS option to enable/disable dbus use + * Adapt Android default notifications and documentations to KF6 search path + +------------------------------------------------------------------- Old: ---- knotifications-6.3.0.tar.xz knotifications-6.3.0.tar.xz.sig New: ---- knotifications-6.4.0.tar.xz knotifications-6.4.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kf6-knotifications.spec ++++++ --- /var/tmp/diff_new_pack.ojz3sZ/_old 2024-07-14 08:53:21.150704214 +0200 +++ /var/tmp/diff_new_pack.ojz3sZ/_new 2024-07-14 08:53:21.154704361 +0200 @@ -19,13 +19,13 @@ %define qt6_version 6.6.0 %define rname knotifications -# Full KF6 version (e.g. 6.3.0) +# Full KF6 version (e.g. 6.4.0) %{!?_kf6_version: %global _kf6_version %{version}} # Last major and minor KF6 version (e.g. 6.0) %{!?_kf6_bugfix_version: %define _kf6_bugfix_version %(echo %{_kf6_version} | awk -F. '{print $1"."$2}')} %bcond_without released Name: kf6-knotifications -Version: 6.3.0 +Version: 6.4.0 Release: 0 Summary: KDE Desktop notifications License: LGPL-2.1-or-later ++++++ knotifications-6.3.0.tar.xz -> knotifications-6.4.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-6.3.0/CMakeLists.txt new/knotifications-6.4.0/CMakeLists.txt --- old/knotifications-6.3.0/CMakeLists.txt 2024-05-31 15:27:13.000000000 +0200 +++ new/knotifications-6.4.0/CMakeLists.txt 2024-07-05 22:08:12.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "6.3.0") # handled by release scripts -set(KF_DEP_VERSION "6.3.0") # handled by release scripts +set(KF_VERSION "6.4.0") # handled by release scripts +set(KF_DEP_VERSION "6.4.0") # handled by release scripts project(KNotifications VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 6.3.0 NO_MODULE) +find_package(ECM 6.4.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -50,8 +50,17 @@ find_package(Gradle REQUIRED) endif() -if (NOT ANDROID AND NOT WIN32 AND NOT APPLE) +# shall we use DBus? +# enabled per default on Linux & BSD systems +set(USE_DBUS_DEFAULT OFF) +if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU) + set(USE_DBUS_DEFAULT ON) +endif() +option(USE_DBUS "Build components using DBus" ${USE_DBUS_DEFAULT}) +if(USE_DBUS) find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) + set(HAVE_DBUS TRUE) + add_definitions(-DHAVE_DBUS) endif() find_package(Qt6 ${REQUIRED_QT_VERSION} QUIET OPTIONAL_COMPONENTS Qml) @@ -78,11 +87,6 @@ endif() endif() -set(HAVE_DBUS FALSE) -if (TARGET Qt6::DBus) - set(HAVE_DBUS TRUE) -endif() - remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) ecm_install_po_files_as_qm(poqm) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-6.3.0/Mainpage.dox new/knotifications-6.4.0/Mainpage.dox --- old/knotifications-6.3.0/Mainpage.dox 2024-05-31 15:27:13.000000000 +0200 +++ new/knotifications-6.4.0/Mainpage.dox 2024-07-05 22:08:12.000000000 +0200 @@ -10,9 +10,9 @@ \section file The global config file In order to perform a notification, you need to create a description file, which contains -default parameters of the notification. It needs to be installed to <em>knotifications5/appname.notifyrc</em> +default parameters of the notification. It needs to be installed to <em>knotifications6/appname.notifyrc</em> in a QStandardPaths::GenericDataLocation directory. -On Android, this path is <em>qrc:/knotifications5/</em>. +On Android, this path is <em>qrc:/knotifications6/</em>. The filename must either match QCoreApplication::applicationName or be specified as the component name to the KNotification object. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-6.3.0/autotests/CMakeLists.txt new/knotifications-6.4.0/autotests/CMakeLists.txt --- old/knotifications-6.3.0/autotests/CMakeLists.txt 2024-05-31 15:27:13.000000000 +0200 +++ new/knotifications-6.4.0/autotests/CMakeLists.txt 2024-07-05 22:08:12.000000000 +0200 @@ -7,7 +7,7 @@ return() endif() -#if (TARGET Qt6::DBus) +#if (HAVE_DBUS) # set(KNotificationTest_SRCS knotification_test.cpp fake_notifications_server.cpp) # ecm_add_test(${KNotificationTest_SRCS} TEST_NAME "KNotificationTest" LINK_LIBRARIES Qt6::Test Qt6::DBus KF6::Notifications) #endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-6.3.0/autotests/knotification_test.cpp new/knotifications-6.4.0/autotests/knotification_test.cpp --- old/knotifications-6.3.0/autotests/knotification_test.cpp 2024-05-31 15:27:13.000000000 +0200 +++ new/knotifications-6.4.0/autotests/knotification_test.cpp 2024-07-05 22:08:12.000000000 +0200 @@ -39,12 +39,12 @@ qDebug() << dataDir; QDir dir; - bool pathOk = dir.mkpath(dataDir + QStringLiteral("/knotifications5/")); + bool pathOk = dir.mkpath(dataDir + QStringLiteral("/knotifications6/")); QVERIFY(pathOk); - QFile testFile(QFINDTESTDATA(QStringLiteral("knotifications5/qttest.notifyrc"))); - bool fileOk = testFile.copy(dataDir + QStringLiteral("/knotifications5/qttest.notifyrc")); + QFile testFile(QFINDTESTDATA(QStringLiteral("knotifications6/qttest.notifyrc"))); + bool fileOk = testFile.copy(dataDir + QStringLiteral("/knotifications6/qttest.notifyrc")); QVERIFY(fileOk); @@ -61,12 +61,12 @@ { // Cleanup const QString dataDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); - QFile testFile(dataDir + QStringLiteral("/knotifications5/qttest.notifyrc")); + QFile testFile(dataDir + QStringLiteral("/knotifications6/qttest.notifyrc")); bool fileRemoveOk = testFile.remove(); QVERIFY(fileRemoveOk); - QDir dir(dataDir + QStringLiteral("/knotifications5")); + QDir dir(dataDir + QStringLiteral("/knotifications6")); bool dirRemoveOk = dir.removeRecursively(); QVERIFY(dirRemoveOk); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-6.3.0/autotests/knotifications5/qttest.notifyrc new/knotifications-6.4.0/autotests/knotifications5/qttest.notifyrc --- old/knotifications-6.3.0/autotests/knotifications5/qttest.notifyrc 2024-05-31 15:27:13.000000000 +0200 +++ new/knotifications-6.4.0/autotests/knotifications5/qttest.notifyrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -[Global] - -[Event/testEvent] -Action=Popup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-6.3.0/autotests/knotifications6/qttest.notifyrc new/knotifications-6.4.0/autotests/knotifications6/qttest.notifyrc --- old/knotifications-6.3.0/autotests/knotifications6/qttest.notifyrc 1970-01-01 01:00:00.000000000 +0100 +++ new/knotifications-6.4.0/autotests/knotifications6/qttest.notifyrc 2024-07-05 22:08:12.000000000 +0200 @@ -0,0 +1,4 @@ +[Global] + +[Event/testEvent] +Action=Popup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-6.3.0/poqm/ar/knotifications6_qt.po new/knotifications-6.4.0/poqm/ar/knotifications6_qt.po --- old/knotifications-6.3.0/poqm/ar/knotifications6_qt.po 2024-05-31 15:27:13.000000000 +0200 +++ new/knotifications-6.4.0/poqm/ar/knotifications6_qt.po 2024-07-05 22:08:12.000000000 +0200 @@ -14,7 +14,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: Lokalize 21.07.70\n" "X-Qt-Contexts: true\n" #~ msgctxt "KNotificationJobUiDelegate|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-6.3.0/poqm/be/knotifications6_qt.po new/knotifications-6.4.0/poqm/be/knotifications6_qt.po --- old/knotifications-6.3.0/poqm/be/knotifications6_qt.po 2024-05-31 15:27:13.000000000 +0200 +++ new/knotifications-6.4.0/poqm/be/knotifications6_qt.po 2024-07-05 22:08:12.000000000 +0200 @@ -9,10 +9,10 @@ # kom <me@komzpa.net>, 2008. msgid "" msgstr "" -"Project-Id-Version: 86ff119b1606fcaa910d6b44fc14b611\n" +"Project-Id-Version: fc57ad16a28d02dea100ceb1c60de14e\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2023-01-18 04:31\n" +"PO-Revision-Date: 2024-02-11 10:51\n" "Last-Translator: Darafei Praliaskouski <komzpa@gmail.com>\n" "Language-Team: Belarusian\n" "Language: be\n" @@ -24,11 +24,12 @@ "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || n%10>=5 && n%10<=9 || n" "%100>=11 && n%100<=14 ? 2 : 3);\n" "X-Qt-Contexts: true\n" -"X-Crowdin-Project: 86ff119b1606fcaa910d6b44fc14b611\n" -"X-Crowdin-Project-ID: 127\n" +"X-Crowdin-Project: fc57ad16a28d02dea100ceb1c60de14e\n" +"X-Crowdin-Project-ID: 136\n" "X-Crowdin-Language: be\n" -"X-Crowdin-File: /main/be/knotifications/knotifications5_qt.po\n" -"X-Crowdin-File-ID: 8137\n" +"X-Crowdin-File: /[antikruk.KDE] main/KDE6/be/messages/knotifications/" +"knotifications6_qt.po\n" +"X-Crowdin-File-ID: 10236\n" #~ msgctxt "KNotificationJobUiDelegate|" #~ msgid "%1 (Failed)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-6.3.0/poqm/ro/knotifications6_qt.po new/knotifications-6.4.0/poqm/ro/knotifications6_qt.po --- old/knotifications-6.3.0/poqm/ro/knotifications6_qt.po 2024-05-31 15:27:13.000000000 +0200 +++ new/knotifications-6.4.0/poqm/ro/knotifications6_qt.po 2024-07-05 22:08:12.000000000 +0200 @@ -57,7 +57,7 @@ #~ msgctxt "EMAIL OF TRANSLATORS" #~ msgid "Your emails" -#~ msgstr ",sergiu@ase.md,lbuz@rolix.org,onet.cristian@gmail.com" +#~ msgstr ",sergiu@cip.md,lbuz@rolix.org,onet.cristian@gmail.com" #~ msgid "Name" #~ msgstr "Denumire" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-6.3.0/poqm/sv/knotifications6_qt.po new/knotifications-6.4.0/poqm/sv/knotifications6_qt.po --- old/knotifications-6.3.0/poqm/sv/knotifications6_qt.po 2024-05-31 15:27:13.000000000 +0200 +++ new/knotifications-6.4.0/poqm/sv/knotifications6_qt.po 2024-07-05 22:08:12.000000000 +0200 @@ -1,9 +1,9 @@ -# Stefan Asserhäll <stefan.asserhall@bredband.net>, 2014, 2020, 2022. +# Stefan Asserhäll <stefan.asserhall@gmail.com>, 2014, 2020, 2022. msgid "" msgstr "" "Project-Id-Version: \n" "PO-Revision-Date: 2022-01-02 14:23+0100\n" -"Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n" +"Last-Translator: Stefan Asserhäll <stefan.asserhall@gmail.com>\n" "Language-Team: Swedish <kde-i18n-doc@kde.org>\n" "Language: sv\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-6.3.0/src/CMakeLists.txt new/knotifications-6.4.0/src/CMakeLists.txt --- old/knotifications-6.3.0/src/CMakeLists.txt 2024-05-31 15:27:13.000000000 +0200 +++ new/knotifications-6.4.0/src/CMakeLists.txt 2024-07-05 22:08:12.000000000 +0200 @@ -21,7 +21,7 @@ knotificationplugin.cpp ) -if (TARGET Qt6::DBus) +if (HAVE_DBUS) target_sources(KF6Notifications PRIVATE imageconverter.cpp #needed to marshal images for sending over dbus by NotifyByPopup notifybypopup.cpp @@ -60,7 +60,7 @@ ) endif() -if (TARGET Qt6::DBus) +if (HAVE_DBUS) set(notifications_xml org.freedesktop.Notifications.xml) qt_add_dbus_interface(knotifications_dbus_SRCS ${notifications_xml} notifications_interface) target_sources(KF6Notifications PRIVATE ${knotifications_dbus_SRCS}) @@ -82,7 +82,7 @@ target_include_directories(KF6Notifications INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KNotifications>") target_link_libraries(KF6Notifications PUBLIC Qt6::Gui) -if (TARGET Qt6::DBus) +if (HAVE_DBUS) target_link_libraries(KF6Notifications PUBLIC Qt6::DBus) endif() target_link_libraries(KF6Notifications PRIVATE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-6.3.0/src/knotificationmanager.cpp new/knotifications-6.4.0/src/knotificationmanager.cpp --- old/knotifications-6.3.0/src/knotificationmanager.cpp 2024-05-31 15:27:13.000000000 +0200 +++ new/knotifications-6.4.0/src/knotificationmanager.cpp 2024-07-05 22:08:12.000000000 +0200 @@ -17,7 +17,7 @@ #include <QFileInfo> #include <QHash> -#ifdef QT_DBUS_LIB +#ifdef HAVE_DBUS #include <QDBusConnection> #include <QDBusConnectionInterface> #endif @@ -71,7 +71,7 @@ qDeleteAll(d->notifyPlugins); d->notifyPlugins.clear(); -#ifdef QT_DBUS_LIB +#ifdef HAVE_DBUS if (isInsideSandbox()) { QDBusConnectionInterface *interface = QDBusConnection::sessionBus().interface(); d->portalDBusServiceExists = interface->isServiceRegistered(QStringLiteral("org.freedesktop.portal.Desktop")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-6.3.0/src/knotifications.qrc new/knotifications-6.4.0/src/knotifications.qrc --- old/knotifications-6.3.0/src/knotifications.qrc 2024-05-31 15:27:13.000000000 +0200 +++ new/knotifications-6.4.0/src/knotifications.qrc 2024-07-05 22:08:12.000000000 +0200 @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/knotifications5"> + <qresource prefix="/knotifications6"> <file>android_defaults.notifyrc</file> </qresource> </RCC> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-6.3.0/tests/CMakeLists.txt new/knotifications-6.4.0/tests/CMakeLists.txt --- old/knotifications-6.3.0/tests/CMakeLists.txt 2024-05-31 15:27:13.000000000 +0200 +++ new/knotifications-6.4.0/tests/CMakeLists.txt 2024-07-05 22:08:12.000000000 +0200 @@ -8,7 +8,7 @@ endforeach(_testname) endmacro() -if (TARGET Qt6::DBus) +if (HAVE_DBUS) knotifications_executable_tests( unitylaunchertest knotificationdbustest