Mailinglist Archive: opensuse-commit (1400 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package gnome-menus for openSUSE:Factory 
checked in at 2011-11-02 11:53:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-menus (Old)
 and      /work/SRC/openSUSE:Factory/.gnome-menus.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gnome-menus", Maintainer is "gnome-maintainers@xxxxxxx"

Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-menus/gnome-menus.changes  2011-10-13 
12:29:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gnome-menus.new/gnome-menus.changes     
2011-11-02 11:53:31.000000000 +0100
@@ -1,0 +2,8 @@
+Mon Oct 31 07:39:28 UTC 2011 - vuntz@xxxxxxxxxxxx
+
+- Add gnome-menus-ignore-invalid-files.patch: ignore invalid
+  .desktop files (with no Exec line, for instance). This is
+  especially important as those can make gnome-shell crash.
+  Fix bnc#727253.
+
+-------------------------------------------------------------------

New:
----
  gnome-menus-ignore-invalid-files.patch

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

Other differences:
------------------
++++++ gnome-menus.spec ++++++
--- /var/tmp/diff_new_pack.C2YTkq/_old  2011-11-02 11:53:32.000000000 +0100
+++ /var/tmp/diff_new_pack.C2YTkq/_new  2011-11-02 11:53:32.000000000 +0100
@@ -28,6 +28,8 @@
 Source99:       baselibs.conf
 # PATCH-FIX-UPSTREAM gnome-menus-other-end.patch vuntz@xxxxxxxxxxxx -- Taken 
from git, put Other at the end
 Patch0:         gnome-menus-other-end.patch
+# PATCH-FIX-UPSTREAM gnome-menus-ignore-invalid-files.patch bnc#727253 
bgo#662409 -- Taken from git, ignore invalid desktop files to avoid crash in 
gnome-shell
+Patch1:         gnome-menus-ignore-invalid-files.patch
 BuildRequires:  fdupes
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  intltool
@@ -121,6 +123,7 @@
 %setup -q
 translation-update-upstream
 %patch0 -p1
+%patch1 -p1
 
 %if 0%{?BUILD_FROM_VCS}
 [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh

++++++ gnome-menus-ignore-invalid-files.patch ++++++
commit fbabc41cb6f2c6520f9f117137fa296a7f8340f3
Author: Florian Müllner <fmuellner@xxxxxxxxx>
Date:   Fri Oct 21 19:57:55 2011 +0200

    libmenu: Ignore invalid desktop entries
    
    Both "Name" and "Exec" are mandatory keys according to the desktop
    entry spec; some .desktop files missing one or the other have been
    spotted in the while, so ignore them explicitly.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=662409

diff --git a/libmenu/desktop-entries.c b/libmenu/desktop-entries.c
index bb6076d..a8c13d9 100644
--- a/libmenu/desktop-entries.c
+++ b/libmenu/desktop-entries.c
@@ -256,7 +256,9 @@ desktop_entry_load (DesktopEntry *entry)
       const char *categories_str;
 
       entry_desktop->appinfo = g_desktop_app_info_new_from_filename 
(entry->path);
-      if (!entry_desktop->appinfo)
+      if (!entry_desktop->appinfo ||
+          !g_app_info_get_name (G_APP_INFO (entry_desktop->appinfo)) ||
+          !g_app_info_get_executable (G_APP_INFO (entry_desktop->appinfo)))
         {
           menu_verbose ("Failed to load \"%s\"\n", entry->path);
           return FALSE;
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx