pool/glib2
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 202421 from home:dimstar:branches:GNOME:Factory

Browse Source 
- Add glib2-no_DBusActivatable_from_keyfile.patch: Don't try
  DBusActivatable with load_from_keyfile. Fixes a crash when
  starting synapse with any .desktop files installed that specify
  DBusActivatable=true (e.g. gnome-weather, bnc#842645).

Local tests succeeded with synapse

WANTED for 13.1

OBS-URL: https://build.opensuse.org/request/show/202421
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=243
This commit is contained in:
Dominique Leuenberger 2013-10-06 15:08:46 +00:00 committed by Git OBS Bridge
parent f1e956e393
commit 6d204d4918
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
glib2-no_DBusActivatable_from_keyfile.patch Normal file
View File

@ -0,0 +1,29 @@
From e0ffd5c184bd1c0e6d602c406f53ed5f6b765f88 Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Thu, 03 Oct 2013 14:02:08 +0000
Subject: appinfo: Don't try DBusActivatable with load_from_keyfile
We can't get the name of the filename, so we can't determine the application
ID. We'll have to fallback on Exec= for this case.
https://bugzilla.gnome.org/show_bug.cgi?id=709326
---
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index f6f5bc0..141a89a 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -461,7 +461,10 @@ g_desktop_app_info_load_from_keyfile (GDesktopAppInfo *info,
info->path = NULL;
}
- if (bus_activatable)
+ /* Can only be DBusActivatable if we know the filename, which means
+ * that this won't work for the load-from-keyfile case.
+ */
+ if (bus_activatable && info->filename)
{
gchar *basename;
gchar *last_dot;
--
cgit v0.9.2

8
glib2.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Oct 6 14:40:29 UTC 2013 - dimstar@opensuse.org
- Add glib2-no_DBusActivatable_from_keyfile.patch: Don't try
DBusActivatable with load_from_keyfile. Fixes a crash when
starting synapse with any .desktop files installed that specify
DBusActivatable=true (e.g. gnome-weather, bnc#842645).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 24 07:46:11 UTC 2013 - dimstar@opensuse.org Tue Sep 24 07:46:11 UTC 2013 - dimstar@opensuse.org

3
glib2.spec
View File

@ -45,6 +45,8 @@ Patch10: glib2-bgo569829-gettext-gkeyfile.patch
Patch11: glib2-fate300461-gettext-gkeyfile-suse.patch Patch11: glib2-fate300461-gettext-gkeyfile-suse.patch
# PATCH-FIX-OPENSUSE glib2-suppress-schema-deprecated-path-warning.patch rh#814053 badshah400@gmail.com -- Suppress the deprecated path warning since it fills up screen unnecessarily during package installations/upgrade. # PATCH-FIX-OPENSUSE glib2-suppress-schema-deprecated-path-warning.patch rh#814053 badshah400@gmail.com -- Suppress the deprecated path warning since it fills up screen unnecessarily during package installations/upgrade.
Patch13: glib2-suppress-schema-deprecated-path-warning.patch Patch13: glib2-suppress-schema-deprecated-path-warning.patch
# PATCH-FIX-UPSTREAM glib2-no_DBusActivatable_from_keyfile.patch bgo#709326 bnc#842645 dimstar@opensuse.org -- ppinfo: Don't try DBusActivatable with load_from_keyfile
Patch14: glib2-no_DBusActivatable_from_keyfile.patch
BuildRequires: automake BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: fam-devel BuildRequires: fam-devel
@ -251,6 +253,7 @@ translation-update-upstream
%patch10 -p1 %patch10 -p1
%patch11 -p1 %patch11 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1
cp -a %{S:1} %{S:2} %{S:5} . cp -a %{S:1} %{S:2} %{S:5} .
cp -a %{S:4} gnome_defaults.conf cp -a %{S:4} gnome_defaults.conf
if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then