Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package knotifications for openSUSE:Factory checked in at 2022-03-14 19:34:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knotifications (Old) and /work/SRC/openSUSE:Factory/.knotifications.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "knotifications" Mon Mar 14 19:34:38 2022 rev:102 rq:961263 version:5.92.0 Changes: -------- --- /work/SRC/openSUSE:Factory/knotifications/knotifications.changes 2022-02-24 18:22:00.982681336 +0100 +++ /work/SRC/openSUSE:Factory/.knotifications.new.25692/knotifications.changes 2022-03-14 19:36:08.958060410 +0100 @@ -1,0 +2,12 @@ +Mon Mar 7 09:27:08 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 5.92.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.92.0 +- Changes since 5.91.0: + * Add Qt6 Android CI + * Allow to build the Java parts with Gradle from both Qt5 and Qt6 + * Fix compilation on Android with Qt6 + +------------------------------------------------------------------- Old: ---- knotifications-5.91.0.tar.xz knotifications-5.91.0.tar.xz.sig New: ---- knotifications-5.92.0.tar.xz knotifications-5.92.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knotifications.spec ++++++ --- /var/tmp/diff_new_pack.a7nNiY/_old 2022-03-14 19:36:09.434060980 +0100 +++ /var/tmp/diff_new_pack.a7nNiY/_new 2022-03-14 19:36:09.438060984 +0100 @@ -17,14 +17,14 @@ %define lname libKF5Notifications5 -%define _tar_path 5.91 +%define _tar_path 5.92 # 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 released Name: knotifications -Version: 5.91.0 +Version: 5.92.0 Release: 0 Summary: KDE Desktop notifications License: LGPL-2.1-or-later ++++++ knotifications-5.91.0.tar.xz -> knotifications-5.92.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.91.0/.gitlab-ci.yml new/knotifications-5.92.0/.gitlab-ci.yml --- old/knotifications-5.91.0/.gitlab-ci.yml 2022-02-05 22:27:07.000000000 +0100 +++ new/knotifications-5.92.0/.gitlab-ci.yml 2022-03-05 14:04:19.000000000 +0100 @@ -6,3 +6,4 @@ - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.91.0/CMakeLists.txt new/knotifications-5.92.0/CMakeLists.txt --- old/knotifications-5.91.0/CMakeLists.txt 2022-02-05 22:27:07.000000000 +0100 +++ new/knotifications-5.92.0/CMakeLists.txt 2022-03-05 14:04:19.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.91.0") # handled by release scripts -set(KF_DEP_VERSION "5.91.0") # handled by release scripts +set(KF_VERSION "5.92.0") # handled by release scripts +set(KF_DEP_VERSION "5.92.0") # handled by release scripts project(KNotifications VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.91.0 NO_MODULE) +find_package(ECM 5.92.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) @@ -38,7 +38,10 @@ set(CMAKE_AUTORCC TRUE) if (ANDROID) - find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui AndroidExtras) + find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) + if (QT_MAJOR_VERSION EQUAL "5") + find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED AndroidExtras) + endif() find_package(Gradle REQUIRED) find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} QUIET OPTIONAL_COMPONENTS Widgets) if (NOT TARGET Qt${QT_MAJOR_VERSION}::Widgets AND EXCLUDE_DEPRECATED_BEFORE_AND_AT EQUAL 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.91.0/po/de/knotifications5_qt.po new/knotifications-5.92.0/po/de/knotifications5_qt.po --- old/knotifications-5.91.0/po/de/knotifications5_qt.po 2022-02-05 22:27:07.000000000 +0100 +++ new/knotifications-5.92.0/po/de/knotifications5_qt.po 2022-03-05 14:04:19.000000000 +0100 @@ -5,7 +5,7 @@ # Georg Schuster <[email protected]>, 2005. # Thomas Reitelbach <[email protected]>, 2005, 2006, 2007, 2008, 2009. # Burkhard L??ck <[email protected]>, 2006, 2007, 2009, 2010, 2011, 2012, 2013, 2014, 2020. -# Frederik Schwarzer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013. +# Frederik Schwarzer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2022. # Johannes Obermayr <[email protected]>, 2010. # Panagiotis Papadopoulos <[email protected]>, 2010. # Rolf Eike Beer <[email protected]>, 2012. @@ -14,14 +14,15 @@ "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: 2020-09-14 07:59+0200\n" -"Last-Translator: Burkhard L??ck <[email protected]>\n" -"Language-Team: German <[email protected]>\n" +"PO-Revision-Date: 2022-02-26 02:50+0100\n" +"Last-Translator: Frederik Schwarzer <[email protected]>\n" +"Language-Team: German <[email protected]>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 21.08.0\n" "X-Qt-Contexts: true\n" #. Job name, e.g. Copying has failed @@ -63,9 +64,6 @@ msgstr "<qt>M??chten Sie <b>%1</b> wirklich beenden?</qt>" #: kstatusnotifieritem.cpp:1141 -#, fuzzy -#| msgctxt "KStatusNotifierItem|@action:inmenu" -#| msgid "Quit" msgctxt "KStatusNotifierItem|@action:button" msgid "Quit" msgstr "Beenden" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.91.0/po/en_GB/knotifications5_qt.po new/knotifications-5.92.0/po/en_GB/knotifications5_qt.po --- old/knotifications-5.91.0/po/en_GB/knotifications5_qt.po 2022-02-05 22:27:07.000000000 +0100 +++ new/knotifications-5.92.0/po/en_GB/knotifications5_qt.po 2022-03-05 14:04:19.000000000 +0100 @@ -2,13 +2,13 @@ # Malcolm Hunter <[email protected]>, 2002,2003,2004, 2005, 2006, 2007, 2008, 2009. # Jonathan Riddell <[email protected]>, 2003. # Andrew Coles <[email protected]>, 2004, 2005, 2009, 2010. -# Steve Allewell <[email protected]>, 2014, 2020. +# Steve Allewell <[email protected]>, 2014, 2020, 2022. msgid "" msgstr "" "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: 2020-06-06 14:06+0100\n" +"PO-Revision-Date: 2022-02-19 11:52+0000\n" "Last-Translator: Steve Allewell <[email protected]>\n" "Language-Team: British English <[email protected]>\n" "Language: en_GB\n" @@ -17,7 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -"X-Generator: Lokalize 20.04.1\n" +"X-Generator: Lokalize 21.12.1\n" #. Job name, e.g. Copying has failed #: knotificationjobuidelegate.cpp:28 @@ -58,9 +58,6 @@ msgstr "<qt>Are you sure you want to quit <b>%1</b>?</qt>" #: kstatusnotifieritem.cpp:1141 -#, fuzzy -#| msgctxt "KStatusNotifierItem|@action:inmenu" -#| msgid "Quit" msgctxt "KStatusNotifierItem|@action:button" msgid "Quit" msgstr "Quit" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.91.0/po/hi/knotifications5_qt.po new/knotifications-5.92.0/po/hi/knotifications5_qt.po --- old/knotifications-5.91.0/po/hi/knotifications5_qt.po 2022-02-05 22:27:07.000000000 +0100 +++ new/knotifications-5.92.0/po/hi/knotifications5_qt.po 2022-03-05 14:04:19.000000000 +0100 @@ -5,21 +5,21 @@ # Ravishankar Shrivastava <[email protected]>, 2007. # Ravishankar Shrivastava <[email protected]>, 2008. # G Karunakar <[email protected]>, 2009, 2010, 2012, 2020. -# Raghavendra Kamath <[email protected]>, 2021. +# Raghavendra Kamath <[email protected]>, 2021, 2022. msgid "" msgstr "" "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: 2021-06-29 20:35+0530\n" +"PO-Revision-Date: 2022-02-10 11:29+0530\n" "Last-Translator: Raghavendra Kamath <[email protected]>\n" -"Language-Team: kde-hindi\n" +"Language-Team: Hindi <[email protected]>\n" "Language: hi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: Lokalize 21.04.2\n" +"X-Generator: Lokalize 21.04.3\n" "X-Qt-Contexts: true\n" #. Job name, e.g. Copying has failed @@ -61,9 +61,6 @@ msgstr "<qt>???????????? ?????? ??????????????????????????? ????????? ?????? ?????? <b>%1</b> ?????? ???????????? ???????????? ??????????????? ??????????</qt>" #: kstatusnotifieritem.cpp:1141 -#, fuzzy -#| msgctxt "KStatusNotifierItem|@action:inmenu" -#| msgid "Quit" msgctxt "KStatusNotifierItem|@action:button" msgid "Quit" msgstr "???????????? ????????????" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.91.0/po/ka/knotifications5_qt.po new/knotifications-5.92.0/po/ka/knotifications5_qt.po --- old/knotifications-5.91.0/po/ka/knotifications5_qt.po 2022-02-05 22:27:07.000000000 +0100 +++ new/knotifications-5.92.0/po/ka/knotifications5_qt.po 2022-03-05 14:04:19.000000000 +0100 @@ -14,7 +14,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Qt-Contexts: true\n" #. Job name, e.g. Copying has failed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.91.0/po/ko/knotifications5_qt.po new/knotifications-5.92.0/po/ko/knotifications5_qt.po --- old/knotifications-5.91.0/po/ko/knotifications5_qt.po 2022-02-05 22:27:07.000000000 +0100 +++ new/knotifications-5.92.0/po/ko/knotifications5_qt.po 2022-03-05 14:04:19.000000000 +0100 @@ -1,14 +1,14 @@ # Korean messages for kdelibs. # Copyright (C) Free Software Foundation, Inc. # Cho Sung Jae <[email protected]>, 2007. -# Shinjo Park <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2020. +# Shinjo Park <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2020, 2022. # msgid "" msgstr "" "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: 2020-07-01 01:14+0200\n" +"PO-Revision-Date: 2022-02-20 22:23+0100\n" "Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" "Language: ko\n" @@ -16,7 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 19.12.3\n" +"X-Generator: Lokalize 21.08.1\n" "X-Qt-Contexts: true\n" #. Job name, e.g. Copying has failed @@ -58,9 +58,6 @@ msgstr "<qt><b>%1</b>???(???) ?????????????????????????</qt>" #: kstatusnotifieritem.cpp:1141 -#, fuzzy -#| msgctxt "KStatusNotifierItem|@action:inmenu" -#| msgid "Quit" msgctxt "KStatusNotifierItem|@action:button" msgid "Quit" msgstr "?????????" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.91.0/po/ro/knotifications5_qt.po new/knotifications-5.92.0/po/ro/knotifications5_qt.po --- old/knotifications-5.91.0/po/ro/knotifications5_qt.po 2022-02-05 22:27:07.000000000 +0100 +++ new/knotifications-5.92.0/po/ro/knotifications5_qt.po 2022-03-05 14:04:19.000000000 +0100 @@ -1,13 +1,13 @@ # Traducerea kdelibs4.po ??n Rom??n?? # Lauren??iu Buzdugan <[email protected]>, 2008, 2009. -# Sergiu Bivol <[email protected]>, 2008, 2009, 2010, 2012, 2013, 2014, 2020. +# Sergiu Bivol <[email protected]>, 2008, 2009, 2010, 2012, 2013, 2014, 2020, 2022. # Cristian One?? <[email protected]>, 2010, 2011, 2012, 2013. msgid "" msgstr "" "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: 2020-10-03 22:32+0100\n" +"PO-Revision-Date: 2022-02-06 17:09+0000\n" "Last-Translator: Sergiu Bivol <[email protected]>\n" "Language-Team: Romanian\n" "Language: ro\n" @@ -16,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" -"X-Generator: Lokalize 19.12.3\n" +"X-Generator: Lokalize 21.12.2\n" "X-Qt-Contexts: true\n" #. Job name, e.g. Copying has failed @@ -58,9 +58,6 @@ msgstr "<qt>Sigur dori??i s?? ??nchide??i <b>%1</b>?</qt>" #: kstatusnotifieritem.cpp:1141 -#, fuzzy -#| msgctxt "KStatusNotifierItem|@action:inmenu" -#| msgid "Quit" msgctxt "KStatusNotifierItem|@action:button" msgid "Quit" msgstr "Termin??" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.91.0/po/ru/knotifications5_qt.po new/knotifications-5.92.0/po/ru/knotifications5_qt.po --- old/knotifications-5.91.0/po/ru/knotifications5_qt.po 2022-02-05 22:27:07.000000000 +0100 +++ new/knotifications-5.92.0/po/ru/knotifications5_qt.po 2022-03-05 14:04:19.000000000 +0100 @@ -15,19 +15,20 @@ # Julia Dronova <[email protected]>, 2012. # Alexander Lakhin <[email protected]>, 2013. # Alexander Yavorsky <[email protected]>, 2020. +# ?????????? ???????????????? <[email protected]>, 2022. msgid "" msgstr "" "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: 2020-10-28 20:50+0300\n" -"Last-Translator: Alexander Yavorsky <[email protected]>\n" +"PO-Revision-Date: 2022-02-16 15:36+0300\n" +"Last-Translator: ?????????? ???????????????? <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 20.08.2\n" +"X-Generator: Lokalize 21.08.3\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Environment: kde\n" @@ -74,9 +75,6 @@ msgstr "<qt>?????????? ???? ?????????????????? <b>%1</b>?</qt>" #: kstatusnotifieritem.cpp:1141 -#, fuzzy -#| msgctxt "KStatusNotifierItem|@action:inmenu" -#| msgid "Quit" msgctxt "KStatusNotifierItem|@action:button" msgid "Quit" msgstr "??????????" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.91.0/po/sk/knotifications5_qt.po new/knotifications-5.92.0/po/sk/knotifications5_qt.po --- old/knotifications-5.91.0/po/sk/knotifications5_qt.po 2022-02-05 22:27:07.000000000 +0100 +++ new/knotifications-5.92.0/po/sk/knotifications5_qt.po 2022-03-05 14:04:19.000000000 +0100 @@ -7,20 +7,20 @@ # Michal Sulek <[email protected]>, 2009, 2010, 2011. # Richard Fri?? <[email protected]>, 2011. # Roman Pahol??k <[email protected]>, 2012, 2013, 2014. -# Matej Mrenica <[email protected]>, 2021. +# Matej Mrenica <[email protected]>, 2021, 2022. msgid "" msgstr "" "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: 2021-01-26 11:31+0100\n" +"PO-Revision-Date: 2022-02-14 19:54+0100\n" "Last-Translator: Matej Mrenica <[email protected]>\n" "Language-Team: Slovak <[email protected]>\n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 20.12.1\n" +"X-Generator: Lokalize 21.12.2\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Qt-Contexts: true\n" @@ -63,9 +63,6 @@ msgstr "<qt>Naozaj chcete ukon??i?? <b>%1</b>?</qt>" #: kstatusnotifieritem.cpp:1141 -#, fuzzy -#| msgctxt "KStatusNotifierItem|@action:inmenu" -#| msgid "Quit" msgctxt "KStatusNotifierItem|@action:button" msgid "Quit" msgstr "Ukon??i??" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.91.0/po/zh_CN/knotifications5_qt.po new/knotifications-5.92.0/po/zh_CN/knotifications5_qt.po --- old/knotifications-5.91.0/po/zh_CN/knotifications5_qt.po 2022-02-05 22:27:07.000000000 +0100 +++ new/knotifications-5.92.0/po/zh_CN/knotifications5_qt.po 2022-03-05 14:04:19.000000000 +0100 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2022-01-08 15:23\n" +"PO-Revision-Date: 2022-02-26 05:16\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -68,4 +68,4 @@ #: kstatusnotifieritem.cpp:1141 msgctxt "KStatusNotifierItem|@action:button" msgid "Quit" -msgstr "" +msgstr "??????" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.91.0/src/CMakeLists.txt new/knotifications-5.92.0/src/CMakeLists.txt --- old/knotifications-5.91.0/src/CMakeLists.txt 2022-02-05 22:27:07.000000000 +0100 +++ new/knotifications-5.92.0/src/CMakeLists.txt 2022-03-05 14:04:19.000000000 +0100 @@ -164,7 +164,7 @@ target_link_libraries(KF5Notifications PRIVATE dbusmenu-qt5) endif() -if (ANDROID) +if (TARGET Qt5::AndroidExtras) target_link_libraries(KF5Notifications PRIVATE Qt5::AndroidExtras) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.91.0/src/android/build.gradle new/knotifications-5.92.0/src/android/build.gradle --- old/knotifications-5.91.0/src/android/build.gradle 2022-02-05 22:27:07.000000000 +0100 +++ new/knotifications-5.92.0/src/android/build.gradle 2022-03-05 14:04:19.000000000 +0100 @@ -5,7 +5,7 @@ } dependencies { - classpath 'com.android.tools.build:gradle:3.6.4' + classpath 'com.android.tools.build:gradle:@Gradle_ANDROID_GRADLE_PLUGIN_VERSION@' } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.91.0/src/notifybyandroid.cpp new/knotifications-5.92.0/src/notifybyandroid.cpp --- old/knotifications-5.91.0/src/notifybyandroid.cpp 2022-02-05 22:27:07.000000000 +0100 +++ new/knotifications-5.92.0/src/notifybyandroid.cpp 2022-03-05 14:04:19.000000000 +0100 @@ -10,8 +10,15 @@ #include "knotificationreplyaction.h" #include "knotifyconfig.h" +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <QAndroidJniEnvironment> #include <QtAndroid> +#else +#include <QCoreApplication> +#include <QJniEnvironment> +// TODO KF6 remove this porting aid +using QAndroidJniEnvironment = QJniEnvironment; +#endif #include <QBuffer> #include <QIcon> @@ -78,7 +85,12 @@ : KNotificationPlugin(parent) { s_instance = this; - m_backend = QAndroidJniObject("org/kde/knotifications/NotifyByAndroid", "(Landroid/content/Context;)V", QtAndroid::androidContext().object<jobject>()); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + QAndroidJniObject context = QtAndroid::androidContext(); +#else + QJniObject context = QNativeInterface::QAndroidApplication::context(); +#endif + m_backend = QAndroidJniObject("org/kde/knotifications/NotifyByAndroid", "(Landroid/content/Context;)V", context.object<jobject>()); } NotifyByAndroid::~NotifyByAndroid() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.91.0/src/notifybyandroid.h new/knotifications-5.92.0/src/notifybyandroid.h --- old/knotifications-5.91.0/src/notifybyandroid.h 2022-02-05 22:27:07.000000000 +0100 +++ new/knotifications-5.92.0/src/notifybyandroid.h 2022-03-05 14:04:19.000000000 +0100 @@ -9,7 +9,13 @@ #include "knotificationplugin.h" +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <QAndroidJniObject> +#else +#include <QJniObject> +// TODO KF6 remove this porting aid +using QAndroidJniObject = QJniObject; +#endif #include <QPointer> /** Android notification backend. */
