Hello community,

here is the log from the commit of package kactivitymanagerd for 
openSUSE:Factory checked in at 2020-06-20 20:11:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kactivitymanagerd (Old)
 and      /work/SRC/openSUSE:Factory/.kactivitymanagerd.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kactivitymanagerd"

Sat Jun 20 20:11:00 2020 rev:80 rq:815447 version:5.19.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/kactivitymanagerd/kactivitymanagerd.changes      
2020-06-08 23:53:19.363084023 +0200
+++ 
/work/SRC/openSUSE:Factory/.kactivitymanagerd.new.3606/kactivitymanagerd.changes
    2020-06-21 18:55:48.690840374 +0200
@@ -1,0 +2,11 @@
+Tue Jun 16 14:34:49 UTC 2020 - Fabian Vogt <[email protected]>
+
+- Update to 5.19.1
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.19.1.php
+- Changes since 5.19.0:
+  * Fix removing of icons and activity settings for new and existing setups 
(kde#385814)
+  * Remove too strict Qt/KF5 deprecation rule
+
+-------------------------------------------------------------------

Old:
----
  kactivitymanagerd-5.19.0.tar.xz
  kactivitymanagerd-5.19.0.tar.xz.sig

New:
----
  kactivitymanagerd-5.19.1.tar.xz
  kactivitymanagerd-5.19.1.tar.xz.sig

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kactivitymanagerd.spec ++++++
--- /var/tmp/diff_new_pack.0jt4n5/_old  2020-06-21 18:55:49.174842142 +0200
+++ /var/tmp/diff_new_pack.0jt4n5/_new  2020-06-21 18:55:49.178842157 +0200
@@ -20,15 +20,15 @@
 
 %bcond_without lang
 Name:           kactivitymanagerd
-Version:        5.19.0
+Version:        5.19.1
 Release:        0
 Summary:        KDE Plasma Activities support
 License:        GPL-2.0-or-later
 Group:          System/GUI/KDE
 Url:            http://projects.kde.org/kactivitymanagerd
-Source:         kactivitymanagerd-%{version}.tar.xz
+Source:         
https://download.kde.org/stable/plasma/%{version}/kactivitymanagerd-%{version}.tar.xz
 %if %{with lang}
-Source1:        kactivitymanagerd-%{version}.tar.xz.sig
+Source1:        
https://download.kde.org/stable/plasma/%{version}/kactivitymanagerd-%{version}.tar.xz.sig
 Source2:        plasma.keyring
 %endif
 %if 0%{?suse_version} > 1325

++++++ kactivitymanagerd-5.19.0.tar.xz -> kactivitymanagerd-5.19.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kactivitymanagerd-5.19.0/po/zh_CN/kactivities5.po 
new/kactivitymanagerd-5.19.1/po/zh_CN/kactivities5.po
--- old/kactivitymanagerd-5.19.0/po/zh_CN/kactivities5.po       2020-06-04 
13:07:09.000000000 +0200
+++ new/kactivitymanagerd-5.19.1/po/zh_CN/kactivities5.po       2020-06-16 
14:37:01.000000000 +0200
@@ -9,8 +9,8 @@
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n";
 "POT-Creation-Date: 2020-02-24 03:39+0100\n"
-"PO-Revision-Date: 2020-05-09 13:50\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2020-06-12 19:01\n"
+"Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -18,8 +18,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Crowdin-Project: kdeorg\n"
+"X-Crowdin-Project-ID: 269464\n"
 "X-Crowdin-Language: zh-CN\n"
-"X-Crowdin-File: /kf5-trunk/messages/kde-workspace/kactivities5.pot\n"
+"X-Crowdin-File: /kf5-stable/messages/kactivitymanagerd/kactivities5.pot\n"
+"X-Crowdin-File-ID: 2464\n"
 
 #: service/Activities.cpp:134
 #, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kactivitymanagerd-5.19.0/src/service/plugins/gtk-eventspy/kactivitymanagerd-plugin-gtk-eventspy.json
 
new/kactivitymanagerd-5.19.1/src/service/plugins/gtk-eventspy/kactivitymanagerd-plugin-gtk-eventspy.json
--- 
old/kactivitymanagerd-5.19.0/src/service/plugins/gtk-eventspy/kactivitymanagerd-plugin-gtk-eventspy.json
    2020-06-04 13:06:44.000000000 +0200
+++ 
new/kactivitymanagerd-5.19.1/src/service/plugins/gtk-eventspy/kactivitymanagerd-plugin-gtk-eventspy.json
    2020-06-16 14:36:41.000000000 +0200
@@ -50,6 +50,7 @@
         "Description[fr]": "Collecte les évènements d'applications utilisant 
GtkFileChooser et GtkRecentManager tel que spécifié par 
https://www.freedesktop.org/wiki/Specifications/desktop-bookmark-spec/";,
         "Description[gl]": "Recolle eventos de aplicacións que usan 
GtkFileChooser e GtkRecentManager como se indica en 
https://www.freedesktop.org/wiki/Specifications/desktop-bookmark-spec/";,
         "Description[hu]": "Eseményeket gyűjt olyan alkalmazásoktól, amik a 
GtkFileChooser és GtkRecentManager API-t használják, ahogy itt specifikálták: 
https://www.freedesktop.org/wiki/Specifications/desktop-bookmark-spec/";,
+        "Description[ia]": "Collige eventos ab applicationes que usa 
GtkFileChooser e GtkRecentManager como specificate per 
https://www.freedesktop.org/wiki/Specifications/desktop-bookmark-spec/";,
         "Description[id]": "Memungut peristiwa dari aplikasi yang menggunakan 
GtkFileChooser dan GtkRecentManager sebagaimana ditentukan oleh 
https://www.freedesktop.org/wiki/Specifications/desktop-bookmark-spec/";,
         "Description[it]": "Raccoglie gli eventi da applicazioni che usano 
GtkFileChooser e GtkRecentManager come indicato da 
https://www.freedesktop.org/wiki/Specifications/desktop-bookmark-spec/";,
         "Description[ko]": "GtkFileChooser와 GtkRecentManager를 사용하는 프로그램의 이벤트를 
수집합니다. 참조: 
https://www.freedesktop.org/wiki/Specifications/desktop-bookmark-spec/";,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kactivitymanagerd-5.19.0/src/service/plugins/sqlite/ResourceLinking.cpp 
new/kactivitymanagerd-5.19.1/src/service/plugins/sqlite/ResourceLinking.cpp
--- old/kactivitymanagerd-5.19.0/src/service/plugins/sqlite/ResourceLinking.cpp 
2020-06-04 13:06:44.000000000 +0200
+++ new/kactivitymanagerd-5.19.1/src/service/plugins/sqlite/ResourceLinking.cpp 
2020-06-16 14:36:41.000000000 +0200
@@ -152,7 +152,9 @@
                 "DELETE FROM ResourceLink "
                 "WHERE "
                 "initiatingAgent   = COALESCE(:initiatingAgent  , '') AND "
-                "targettedResource = COALESCE(:targettedResource, '') "
+                "(targettedResource = COALESCE(:targettedResource, '') OR "
+                "(initiatingAgent = 'org.kde.plasma.favorites.applications' "
+                "AND targettedResource = 'applications:' || 
COALESCE(:targettedResource, '')))"
             ));
         query = unlinkResourceFromAllActivitiesQuery.get();
     } else {
@@ -162,13 +164,20 @@
                 "WHERE "
                 "usedActivity      = COALESCE(:usedActivity     , '') AND "
                 "initiatingAgent   = COALESCE(:initiatingAgent  , '') AND "
-                "targettedResource = COALESCE(:targettedResource, '') "
+                "(targettedResource = COALESCE(:targettedResource, '') OR "
+                "(initiatingAgent = 'org.kde.plasma.favorites.applications'"
+                "AND targettedResource =  'applications:' || 
COALESCE(:targettedResource, '')))"
             ));
         query = unlinkResourceFromActivityQuery.get();
     }
 
     DATABASE_TRANSACTION(*resourcesDatabase());
-
+    // BUG 385814, some existings entries don't have the applications:
+    // prefix, so we remove it and check in the sql it they match
+    // TODO Remove when we can expect all users have a fresher install that 
5.18
+    if (initiatingAgent == 
QLatin1String("org.kde.plasma.favorites.applications")) {
+        targettedResource = 
targettedResource.remove(QLatin1String("applications:"));
+    }
     Utils::exec(Utils::FailOnError, *query,
         ":usedActivity"      , usedActivity,
         ":initiatingAgent"   , initiatingAgent,



Reply via email to