Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cinnamon-menus for openSUSE:Factory checked in at 2021-01-22 21:52:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-menus (Old) and /work/SRC/openSUSE:Factory/.cinnamon-menus.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-menus" Fri Jan 22 21:52:09 2021 rev:16 rq:865519 version:4.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-menus/cinnamon-menus.changes 2020-12-13 17:30:24.692390425 +0100 +++ /work/SRC/openSUSE:Factory/.cinnamon-menus.new.28504/cinnamon-menus.changes 2021-01-22 21:52:36.365873084 +0100 @@ -1,0 +2,6 @@ +Thu Jan 14 21:38:02 UTC 2021 - andy great <[email protected]> + +- Update to version 4.8.2. + * Fix loading of desktop files in subdirectories + +------------------------------------------------------------------- Old: ---- cinnamon-menus-4.8.1.tar.gz New: ---- cinnamon-menus-4.8.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-menus.spec ++++++ --- /var/tmp/diff_new_pack.v3Raqb/_old 2021-01-22 21:52:36.929873884 +0100 +++ /var/tmp/diff_new_pack.v3Raqb/_new 2021-01-22 21:52:36.933873889 +0100 @@ -1,7 +1,7 @@ # # spec file for package cinnamon-menus # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,13 +20,13 @@ %define soname libcinnamon-menu-3 %define sover 0 Name: cinnamon-menus -Version: 4.8.1 +Version: 4.8.2 Release: 0 Summary: A menu system for the Cinnamon Desktop License: LGPL-2.1-or-later Group: System/Libraries URL: https://github.com/linuxmint/cinnamon-menus -Source: https://github.com/linuxmint/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +Source: https://github.com/linuxmint/cinnamon-menus/archive/%{version}/%{name}-%{version}.tar.gz Source1: baselibs.conf BuildRequires: autoconf BuildRequires: autoconf-archive ++++++ cinnamon-menus-4.8.1.tar.gz -> cinnamon-menus-4.8.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-4.8.1/debian/changelog new/cinnamon-menus-4.8.2/debian/changelog --- old/cinnamon-menus-4.8.1/debian/changelog 2020-11-26 14:47:23.000000000 +0100 +++ new/cinnamon-menus-4.8.2/debian/changelog 2020-12-08 11:20:08.000000000 +0100 @@ -1,3 +1,10 @@ +cinnamon-menus (4.8.2) ulyssa; urgency=medium + + [ Lars Mueller ] + * Fix loading of desktop files in subdirectories + + -- Clement Lefebvre <[email protected]> Tue, 08 Dec 2020 10:19:48 +0000 + cinnamon-menus (4.8.1) ulyssa; urgency=medium [ Cobinja ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-4.8.1/libmenu/desktop-entries.c new/cinnamon-menus-4.8.2/libmenu/desktop-entries.c --- old/cinnamon-menus-4.8.1/libmenu/desktop-entries.c 2020-11-26 14:47:23.000000000 +0100 +++ new/cinnamon-menus-4.8.2/libmenu/desktop-entries.c 2020-12-08 11:20:08.000000000 +0100 @@ -767,7 +767,6 @@ DesktopEntry *entry, const char *file_id) { - const char *file_id_to_use; menu_verbose (" Adding to set %p entry %s\n", set, file_id); if (set->hash == NULL) @@ -778,14 +777,8 @@ (GDestroyNotify) desktop_entry_unref); } - if (desktop_entry_get_type (entry) == DESKTOP_ENTRY_DESKTOP) { - file_id_to_use = desktop_entry_get_id (entry); - } - else { - file_id_to_use = file_id; - } g_hash_table_replace (set->hash, - g_strdup (file_id_to_use), + g_strdup (file_id), desktop_entry_ref (entry)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-4.8.1/libmenu/entry-directories.c new/cinnamon-menus-4.8.2/libmenu/entry-directories.c --- old/cinnamon-menus-4.8.1/libmenu/entry-directories.c 2020-11-26 14:47:23.000000000 +0100 +++ new/cinnamon-menus-4.8.2/libmenu/entry-directories.c 2020-12-08 11:20:08.000000000 +0100 @@ -923,7 +923,8 @@ static char * get_desktop_file_id_from_path (EntryDirectory *ed, DesktopEntryType entry_type, - const char *relative_path) + const char *relative_path, + DesktopEntry *entry) { char *retval; @@ -931,7 +932,16 @@ if (entry_type == DESKTOP_ENTRY_DESKTOP) { + GMenuDesktopAppInfo *appinfo; + appinfo = desktop_entry_get_app_info (entry); retval = g_strdelimit (g_strdup (relative_path), "/", '-'); + if (gmenu_desktopappinfo_get_is_flatpak (appinfo)) + { + char* tmp; + tmp = retval; + retval = g_strconcat (retval, GMENU_DESKTOPAPPINFO_FLATPAK_SUFFIX, NULL); + g_free (tmp); + } } else { @@ -978,7 +988,8 @@ file_id = get_desktop_file_id_from_path (ed, ed->entry_type, - relative_path->str); + relative_path->str, + entry); ret = func (ed, entry, file_id, set, user_data); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-4.8.1/meson.build new/cinnamon-menus-4.8.2/meson.build --- old/cinnamon-menus-4.8.1/meson.build 2020-11-26 14:47:23.000000000 +0100 +++ new/cinnamon-menus-4.8.2/meson.build 2020-12-08 11:20:08.000000000 +0100 @@ -1,4 +1,4 @@ -project('cinnamon-menus', 'c', version : '4.8.1', meson_version: '>=0.40.0') +project('cinnamon-menus', 'c', version : '4.8.2', meson_version: '>=0.40.0') gnome = import('gnome')
