Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package knotifications for openSUSE:Factory checked in at 2021-05-10 15:35:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knotifications (Old) and /work/SRC/openSUSE:Factory/.knotifications.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "knotifications" Mon May 10 15:35:42 2021 rev:92 rq:891769 version:5.82.0 Changes: -------- --- /work/SRC/openSUSE:Factory/knotifications/knotifications.changes 2021-04-12 12:36:39.453319952 +0200 +++ /work/SRC/openSUSE:Factory/.knotifications.new.2988/knotifications.changes 2021-05-10 15:37:22.686040597 +0200 @@ -1,0 +2,14 @@ +Sat May 1 16:41:05 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.82.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.82.0 +- Changes since 5.81.0: + * Silence a couple of clazy warnings about overloaded signals + * Relicense some files to LGPL-2.0-or-later + * Allow to build KNotifications without QtWidgets on Android + * Remove the taskbar and external process backends on Android + * Don't install the notification plugin servicetype file on Android + +------------------------------------------------------------------- Old: ---- knotifications-5.81.0.tar.xz knotifications-5.81.0.tar.xz.sig New: ---- knotifications-5.82.0.tar.xz knotifications-5.82.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knotifications.spec ++++++ --- /var/tmp/diff_new_pack.deyuyO/_old 2021-05-10 15:37:23.198038614 +0200 +++ /var/tmp/diff_new_pack.deyuyO/_new 2021-05-10 15:37:23.202038599 +0200 @@ -17,14 +17,14 @@ %define lname libKF5Notifications5 -%define _tar_path 5.81 +%define _tar_path 5.82 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: knotifications -Version: 5.81.0 +Version: 5.82.0 Release: 0 Summary: KDE Desktop notifications License: LGPL-2.1-or-later @@ -43,16 +43,16 @@ BuildRequires: cmake(KF5Config) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5CoreAddons) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5WindowSystem) >= %{_kf5_bugfix_version} -BuildRequires: cmake(Qt5DBus) >= 5.14.0 -BuildRequires: cmake(Qt5Test) >= 5.14.0 -BuildRequires: cmake(Qt5TextToSpeech) >= 5.14.0 -BuildRequires: cmake(Qt5Widgets) >= 5.14.0 -BuildRequires: cmake(Qt5X11Extras) >= 5.14.0 +BuildRequires: cmake(Qt5DBus) >= 5.15.0 +BuildRequires: cmake(Qt5Test) >= 5.15.0 +BuildRequires: cmake(Qt5TextToSpeech) >= 5.15.0 +BuildRequires: cmake(Qt5Widgets) >= 5.15.0 +BuildRequires: cmake(Qt5X11Extras) >= 5.15.0 BuildRequires: pkgconfig(dbusmenu-qt5) BuildRequires: pkgconfig(libcanberra) BuildRequires: pkgconfig(x11) %if %{with lang} -BuildRequires: cmake(Qt5LinguistTools) >= 5.14.0 +BuildRequires: cmake(Qt5LinguistTools) >= 5.15.0 %endif %description @@ -75,8 +75,8 @@ Group: Development/Libraries/KDE Requires: %{lname} = %{version} Requires: extra-cmake-modules -Requires: cmake(Qt5DBus) >= 5.14.0 -Requires: cmake(Qt5Widgets) >= 5.14.0 +Requires: cmake(Qt5DBus) >= 5.15.0 +Requires: cmake(Qt5Widgets) >= 5.15.0 %description devel KNotification is used to notify the user of an event. It covers feedback and @@ -85,15 +85,15 @@ %lang_package -n %{lname} %prep -%setup -q +%autosetup -p1 %build - %cmake_kf5 -d build - %cmake_build +%cmake_kf5 -d build +%cmake_build %install - %kf5_makeinstall -C build - %fdupes %{buildroot} +%kf5_makeinstall -C build +%fdupes %{buildroot} %if %{with lang} %find_lang %{name}5 --with-qt --without-mo ++++++ knotifications-5.81.0.tar.xz -> knotifications-5.82.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.81.0/.gitignore new/knotifications-5.82.0/.gitignore --- old/knotifications-5.81.0/.gitignore 2021-04-04 13:45:42.000000000 +0200 +++ new/knotifications-5.82.0/.gitignore 2021-05-01 14:37:41.000000000 +0200 @@ -23,3 +23,6 @@ .cmake/ /.clang-format /compile_commands.json +.clangd +.idea +/cmake-build* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.81.0/CMakeLists.txt new/knotifications-5.82.0/CMakeLists.txt --- old/knotifications-5.81.0/CMakeLists.txt 2021-04-04 13:45:42.000000000 +0200 +++ new/knotifications-5.82.0/CMakeLists.txt 2021-05-01 14:37:41.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.5) -set(KF_VERSION "5.81.0") # handled by release scripts -set(KF_DEP_VERSION "5.81.0") # handled by release scripts +set(KF_VERSION "5.82.0") # handled by release scripts +set(KF_DEP_VERSION "5.82.0") # handled by release scripts project(KNotifications VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.81.0 NO_MODULE) +find_package(ECM 5.82.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) @@ -34,16 +34,22 @@ SOVERSION 5) # Dependencies -set(REQUIRED_QT_VERSION 5.14.0) +set(REQUIRED_QT_VERSION 5.15.0) set(CMAKE_AUTORCC TRUE) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) +if (ANDROID) + find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui AndroidExtras) + find_package(Gradle REQUIRED) + find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET OPTIONAL_COMPONENTS Widgets) + if (NOT TARGET Qt5::Widgets AND EXCLUDE_DEPRECATED_BEFORE_AND_AT EQUAL 0) + set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 5.79.0) + endif() +else() + find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) +endif() if (NOT ANDROID AND NOT WIN32) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) -elseif (ANDROID) - find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED AndroidExtras) - find_package(Gradle REQUIRED) endif() find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET OPTIONAL_COMPONENTS TextToSpeech) @@ -118,16 +124,18 @@ set(HAVE_DBUS TRUE) endif() +set(HAVE_WIDGETS FALSE) +if (TARGET Qt5::Widgets) + set(HAVE_WIDGETS TRUE) +endif() remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) #add_definitions(-DQT_NO_FOREACH) -if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") - ecm_install_po_files_as_qm(po) -endif() +ecm_install_po_files_as_qm(po) if (NOT APPLE) # QtMac::setBadgeLabelText is deprecated -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) endif() -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055000) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) add_subdirectory(src) if (BUILD_TESTING) add_subdirectory(tests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.81.0/KF5NotificationsConfig.cmake.in new/knotifications-5.82.0/KF5NotificationsConfig.cmake.in --- old/knotifications-5.81.0/KF5NotificationsConfig.cmake.in 2021-04-04 13:45:42.000000000 +0200 +++ new/knotifications-5.82.0/KF5NotificationsConfig.cmake.in 2021-05-01 14:37:41.000000000 +0200 @@ -3,7 +3,10 @@ set(KNOTIFICATIONS_DBUS_INTERFACES_DIR "@PACKAGE_KDE_INSTALL_DBUSINTERFACEDIR@") include(CMakeFindDependencyMacro) -find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) +find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) +if (@HAVE_WIDGETS@) + find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) +endif() if (@HAVE_DBUS@) find_dependency(Qt5DBus @REQUIRED_QT_VERSION@) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.81.0/autotests/fake_notifications_server.cpp new/knotifications-5.82.0/autotests/fake_notifications_server.cpp --- old/knotifications-5.81.0/autotests/fake_notifications_server.cpp 2021-04-04 13:45:42.000000000 +0200 +++ new/knotifications-5.82.0/autotests/fake_notifications_server.cpp 2021-05-01 14:37:41.000000000 +0200 @@ -1,7 +1,7 @@ /* SPDX-FileCopyrightText: 2016 Martin Klapetek <[email protected]> - SPDX-License-Identifier: LGPL-2.0-only + SPDX-License-Identifier: LGPL-2.0-or-later */ #include "fake_notifications_server.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.81.0/autotests/fake_notifications_server.h new/knotifications-5.82.0/autotests/fake_notifications_server.h --- old/knotifications-5.81.0/autotests/fake_notifications_server.h 2021-04-04 13:45:42.000000000 +0200 +++ new/knotifications-5.82.0/autotests/fake_notifications_server.h 2021-05-01 14:37:41.000000000 +0200 @@ -1,7 +1,7 @@ /* SPDX-FileCopyrightText: 2016 Martin Klapetek <[email protected]> - SPDX-License-Identifier: LGPL-2.0-only + SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef FAKE_NOTIFICATIONS_SERVER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.81.0/autotests/knotification_test.cpp new/knotifications-5.82.0/autotests/knotification_test.cpp --- old/knotifications-5.81.0/autotests/knotification_test.cpp 2021-04-04 13:45:42.000000000 +0200 +++ new/knotifications-5.82.0/autotests/knotification_test.cpp 2021-05-01 14:37:41.000000000 +0200 @@ -1,7 +1,7 @@ /* SPDX-FileCopyrightText: 2016 Martin Klapetek <[email protected]> - SPDX-License-Identifier: LGPL-2.0-only + SPDX-License-Identifier: LGPL-2.0-or-later */ #include <QDBusConnection> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.81.0/po/pa/knotifications5_qt.po new/knotifications-5.82.0/po/pa/knotifications5_qt.po --- old/knotifications-5.81.0/po/pa/knotifications5_qt.po 2021-04-04 13:45:42.000000000 +0200 +++ new/knotifications-5.82.0/po/pa/knotifications5_qt.po 2021-05-01 14:37:41.000000000 +0200 @@ -4,7 +4,7 @@ # # Amanpreet Singh Alam <[email protected]>, 2004. # Amanpreet Singh Alam <[email protected]>, 2004. -# A S Alam <[email protected]>, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012. +# A S Alam <[email protected]>, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2021. # ASB <[email protected]>, 2007. # Amanpreet Singh Alam <[email protected]>, 2008. # Amanpreet Singh <[email protected]>, 2008. @@ -14,24 +14,23 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2014-07-08 14:39-0500\n" -"Last-Translator: A S Alam <[email protected]>\n" -"Language-Team: Punjabi/Panjabi <[email protected]>\n" +"PO-Revision-Date: 2021-04-25 12:58-0700\n" +"Last-Translator: A S Alam <[email protected]>\n" +"Language-Team: Punjabi <[email protected]>\n" "Language: pa\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 20.08.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" #. Job name, e.g. Copying has failed #: knotificationjobuidelegate.cpp:28 -#, fuzzy, qt-format -#| msgid "%1 (Link)" +#, qt-format msgctxt "KNotificationJobUiDelegate|" msgid "%1 (Failed)" -msgstr "%1 (????????????)" +msgstr "%1 (???????????????)" #: knotificationrestrictions.cpp:179 msgctxt "KNotificationRestrictions|" @@ -39,28 +38,19 @@ msgstr "??????????????? ???????????????????????????" #: kstatusnotifieritem.cpp:515 kstatusnotifieritem.cpp:1107 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "&Minimize" msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Minimize" msgstr "????????????-?????????(&M)" #: kstatusnotifieritem.cpp:847 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "Quit" msgctxt "KStatusNotifierItem|@action:inmenu" msgid "Quit" -msgstr "????????? ?????????" +msgstr "????????????" #: kstatusnotifieritem.cpp:1105 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "&Restore" msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Restore" -msgstr "?????????-????????????(&R)" +msgstr "???????????? ?????????(&R)" #: kstatusnotifieritem.cpp:1119 #, qt-format @@ -69,9 +59,6 @@ msgstr "<qt>?????? ??????????????? <b>%1</b> ????????? ????????? ???????????? ????????????????????? ???????</qt>" #: kstatusnotifieritem.cpp:1121 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "Confirm Quit From System Tray" msgctxt "KStatusNotifierItem|@title:window" msgid "Confirm Quit From System Tray" msgstr "??????????????? ????????? ?????????????????? ????????? ????????? ?????? ??????????????????" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.81.0/po/zh_CN/knotifications5_qt.po new/knotifications-5.82.0/po/zh_CN/knotifications5_qt.po --- old/knotifications-5.81.0/po/zh_CN/knotifications5_qt.po 2021-04-04 13:45:42.000000000 +0200 +++ new/knotifications-5.82.0/po/zh_CN/knotifications5_qt.po 2021-05-01 14:37:41.000000000 +0200 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2021-03-27 17:29\n" +"PO-Revision-Date: 2021-04-24 15:42\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.81.0/src/CMakeLists.txt new/knotifications-5.82.0/src/CMakeLists.txt --- old/knotifications-5.81.0/src/CMakeLists.txt 2021-04-04 13:45:42.000000000 +0200 +++ new/knotifications-5.82.0/src/CMakeLists.txt 2021-05-01 14:37:41.000000000 +0200 @@ -17,14 +17,14 @@ knotifyconfig.cpp knotificationplugin.cpp knotificationjobuidelegate.cpp - notifybyexecute.cpp notifybylogfile.cpp - notifybytaskbar.cpp ${knotifications_QM_LOADER} ) if (NOT ANDROID) list(APPEND knotifications_SRCS + notifybyexecute.cpp + notifybytaskbar.cpp kstatusnotifieritem.cpp) endif() @@ -110,9 +110,10 @@ target_include_directories(KF5Notifications INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KNotifications>") -target_link_libraries(KF5Notifications PUBLIC - Qt5::Widgets -) +target_link_libraries(KF5Notifications PUBLIC Qt5::Gui) +if (TARGET Qt5::Widgets) + target_link_libraries(KF5Notifications PUBLIC Qt5::Widgets) +endif() if (TARGET Qt5::DBus) target_link_libraries(KF5Notifications PUBLIC Qt5::DBus) endif() @@ -235,9 +236,11 @@ RENAME kf5_org.kde.StatusNotifierWatcher.xml) endif() -install(FILES - knotificationplugin.desktop - DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR}) +if (NOT ANDROID) + install(FILES + knotificationplugin.desktop + DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR}) +endif() include(ECMGeneratePriFile) ecm_generate_pri_file(BASE_NAME KNotifications LIB_NAME KF5Notifications DEPS "widgets" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KNotifications) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.81.0/src/android_defaults.notifyrc new/knotifications-5.82.0/src/android_defaults.notifyrc --- old/knotifications-5.81.0/src/android_defaults.notifyrc 2021-04-04 13:45:42.000000000 +0200 +++ new/knotifications-5.82.0/src/android_defaults.notifyrc 2021-05-01 14:37:41.000000000 +0200 @@ -30,6 +30,7 @@ Name[nds]=Swoor Fehler Name[nl]=Fatale fout Name[nn]=Kritisk feil +Name[pa]=???????????? ???????????? Name[pl]=Powa??ny b????d Name[pt]=Erro Fatal Name[pt_BR]=Erro fatal @@ -79,6 +80,7 @@ Comment[nds]=Dat geev en swoor Fehler, dat Programm is utstegen Comment[nl]=Er deed zich een serieuze fout voor die het programma deed afsluiten Comment[nn]=Det oppstod ein alvorleg feil som gjorde av programmet avslutta +Comment[pa]=??????????????? ??????????????? ????????????????????? ????????? ???????????? ????????? ?????? ???????????? ????????? Comment[pl]=Wyst??pi?? powa??ny b????d i program zako??czy?? dzia??anie Comment[pt]=Ocorreu um erro s??rio que fez com que o programa sa??sse Comment[pt_BR]=Ocorreu um erro grave que causou o fechamento do programa diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.81.0/src/knotification.cpp new/knotifications-5.82.0/src/knotification.cpp --- old/knotifications-5.81.0/src/knotification.cpp 2021-04-04 13:45:42.000000000 +0200 +++ new/knotifications-5.82.0/src/knotification.cpp 2021-05-01 14:37:41.000000000 +0200 @@ -22,7 +22,9 @@ #include <QCoreApplication> #include <QStringList> +#ifdef QT_WIDGETS_LIB #include <QTabWidget> +#endif #include <QTimer> #include <QUrl> @@ -120,11 +122,13 @@ void KNotification::setWidget(QWidget *wid) { +#ifdef QT_WIDGETS_LIB d->widget = wid; // setParent(wid); if (wid && d->flags & CloseWhenWidgetActivated) { wid->installEventFilter(this); } +#endif } void KNotification::setTitle(const QString &title) @@ -521,6 +525,7 @@ bool KNotification::eventFilter(QObject *watched, QEvent *event) { +#ifdef QT_WIDGETS_LIB if (watched == d->widget) { if (event->type() == QEvent::WindowActivate) { if (d->flags & CloseWhenWidgetActivated) { @@ -528,6 +533,7 @@ } } } +#endif return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.81.0/src/knotification.h new/knotifications-5.82.0/src/knotification.h --- old/knotifications-5.81.0/src/knotification.h 2021-04-04 13:45:42.000000000 +0200 +++ new/knotifications-5.82.0/src/knotification.h 2021-05-01 14:37:41.000000000 +0200 @@ -3,7 +3,7 @@ SPDX-FileCopyrightText: 2005-2006 Olivier Goffart <ogoffart at kde.org> SPDX-FileCopyrightText: 2013-2015 Martin Klapetek <[email protected]> - SPDX-License-Identifier: LGPL-2.0-only + SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef KNOTIFICATION_H @@ -468,7 +468,7 @@ * @deprecated Since 5.67, use defaultActivated() instead */ KNOTIFICATIONS_DEPRECATED_VERSION_BELATED(5, 76, 5, 67, "Use defaultActivated() instead") - void activated(); + void activated(); // clazy:exclude=overloaded-signal #endif /** @@ -485,7 +485,7 @@ * * @param action will be 0 if the default action was activated, or the index of the action in the actions QStringList */ - void activated(unsigned int action); + void activated(unsigned int action); // clazy:exclude=overloaded-signal /** * Convenience signal that is emitted when the first action is activated. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.81.0/src/knotificationmanager.cpp new/knotifications-5.82.0/src/knotificationmanager.cpp --- old/knotifications-5.81.0/src/knotificationmanager.cpp 2021-04-04 13:45:42.000000000 +0200 +++ new/knotifications-5.82.0/src/knotificationmanager.cpp 2021-05-01 14:37:41.000000000 +0200 @@ -138,16 +138,20 @@ #endif addPlugin(plugin); } else if (action == QLatin1String("Taskbar")) { +#if !defined(Q_OS_ANDROID) plugin = new NotifyByTaskbar(this); addPlugin(plugin); +#endif } else if (action == QLatin1String("Sound")) { #if defined(HAVE_PHONON4QT5) || defined(HAVE_CANBERRA) plugin = new NotifyByAudio(this); addPlugin(plugin); #endif } else if (action == QLatin1String("Execute")) { +#if !defined(Q_OS_ANDROID) plugin = new NotifyByExecute(this); addPlugin(plugin); +#endif } else if (action == QLatin1String("Logfile")) { plugin = new NotifyByLogfile(this); addPlugin(plugin); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.81.0/src/knotificationmanager_p.h new/knotifications-5.82.0/src/knotificationmanager_p.h --- old/knotifications-5.81.0/src/knotificationmanager_p.h 2021-04-04 13:45:42.000000000 +0200 +++ new/knotifications-5.82.0/src/knotificationmanager_p.h 2021-05-01 14:37:41.000000000 +0200 @@ -3,7 +3,7 @@ SPDX-FileCopyrightText: 2005 Olivier Goffart <ogoffart at kde.org> SPDX-FileCopyrightText: 2006 Thiago Macieira <[email protected]> - SPDX-License-Identifier: LGPL-2.0-only + SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef KNOTIFICATIONMANAGER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.81.0/src/kpassivepopup.cpp new/knotifications-5.82.0/src/kpassivepopup.cpp --- old/knotifications-5.81.0/src/kpassivepopup.cpp 2021-04-04 13:45:42.000000000 +0200 +++ new/knotifications-5.82.0/src/kpassivepopup.cpp 2021-05-01 14:37:41.000000000 +0200 @@ -10,6 +10,7 @@ #include "debug_p.h" #include <config-knotifications.h> +#if KNOTIFICATIONS_BUILD_DEPRECATED_SINCE(5, 79) // Qt #include <QBitmap> #include <QBoxLayout> @@ -33,7 +34,6 @@ #include <KWindowInfo> #endif -#if KNOTIFICATIONS_BUILD_DEPRECATED_SINCE(5, 79) static const int DEFAULT_POPUP_TYPE = KPassivePopup::Boxed; static const int DEFAULT_POPUP_TIME = 6 * 1000; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.81.0/src/kpassivepopup.h new/knotifications-5.82.0/src/kpassivepopup.h --- old/knotifications-5.81.0/src/kpassivepopup.h 2021-04-04 13:45:42.000000000 +0200 +++ new/knotifications-5.82.0/src/kpassivepopup.h 2021-05-01 14:37:41.000000000 +0200 @@ -11,7 +11,9 @@ #include <knotifications_export.h> +#ifdef QT_WIDGETS_LIB #include <QFrame> +#endif class QSystemTrayIcon; @@ -357,12 +359,12 @@ /** * Emitted when the popup is clicked. */ - void clicked(); + void clicked(); // clazy:exclude=overloaded-signal /** * Emitted when the popup is clicked. */ - void clicked(const QPoint &pos); + void clicked(const QPoint &pos); // clazy:exclude=overloaded-signal protected: /**
