Accepting request 58125 from home:vuntz:branches:GNOME:Factory
OBS-URL: https://build.opensuse.org/request/show/58125 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=128
This commit is contained in:
Git OBS Bridge
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cdfdc137925f92b7249149a934e51a11cea93b675c80ce04ca0f3f871ce8109f
|
||||
size 6929710
|
||||
3
glib-2.27.91.tar.bz2
Normal file
3
glib-2.27.91.tar.bz2
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9786cedb66b4913caac2297550277b6585da7f9f30ade5717725b5262fb5cbeb
|
||||
size 6934447
|
||||
@@ -1,70 +0,0 @@
|
||||
commit e738a8dd8ca3d3dd327bc5a3bbfd151858738609
|
||||
Author: Colin Walters <walters@verbum.org>
|
||||
Date: Thu Jan 6 11:47:58 2011 -0500
|
||||
|
||||
gdesktopappinfo: Don't crash if we don't have a desktop filename
|
||||
|
||||
If code creates a GDesktopAppInfo via g_desktop_app_info_new_from_keyfile(),
|
||||
we'd try to send a NULL pointer down into GVariant.
|
||||
|
||||
Since in this case we don't have a filename, just send the empty
|
||||
string. In the future we should either:
|
||||
|
||||
1) Change panel to use g_desktop_app_info_new_from_filename(), and
|
||||
take the hit of parsing the file twice.
|
||||
2) Add a g_key_file_get_origin_filename()
|
||||
3) Add g_desktop_app_info_new_from_keyfile_and_name()
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=638838
|
||||
|
||||
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
|
||||
index c808796..f557538 100644
|
||||
--- a/gio/gdesktopappinfo.c
|
||||
+++ b/gio/gdesktopappinfo.c
|
||||
@@ -932,7 +932,7 @@ child_setup (gpointer user_data)
|
||||
|
||||
static void
|
||||
notify_desktop_launch (GDBusConnection *session_bus,
|
||||
- const char *desktop_file, /* filename */
|
||||
+ GDesktopAppInfo *info,
|
||||
long pid,
|
||||
const char *display,
|
||||
const char *sn_id,
|
||||
@@ -942,6 +942,7 @@ notify_desktop_launch (GDBusConnection *session_bus,
|
||||
GVariantBuilder uri_variant;
|
||||
GVariantBuilder extras_variant;
|
||||
GList *iter;
|
||||
+ const char *desktop_file_id;
|
||||
|
||||
if (session_bus == NULL)
|
||||
return;
|
||||
@@ -956,12 +957,19 @@ notify_desktop_launch (GDBusConnection *session_bus,
|
||||
"startup-id",
|
||||
g_variant_new ("s",
|
||||
sn_id));
|
||||
+
|
||||
+ if (info->filename)
|
||||
+ desktop_file_id = info->filename;
|
||||
+ else if (info->desktop_id)
|
||||
+ desktop_file_id = info->desktop_id;
|
||||
+ else
|
||||
+ desktop_file_id = "";
|
||||
|
||||
msg = g_dbus_message_new_signal ("/org/gtk/gio/DesktopAppInfo",
|
||||
"org.gtk.gio.DesktopAppInfo",
|
||||
"Launched");
|
||||
g_dbus_message_set_body (msg, g_variant_new ("(@aysxasa{sv})",
|
||||
- g_variant_new_bytestring (desktop_file),
|
||||
+ g_variant_new_bytestring (desktop_file_id),
|
||||
display ? display : "",
|
||||
(gint64)pid,
|
||||
&uri_variant,
|
||||
@@ -1069,7 +1077,7 @@ _g_desktop_app_info_launch_uris_internal (GAppInfo *appinfo,
|
||||
pid_callback (info, pid, pid_callback_data);
|
||||
|
||||
notify_desktop_launch (session_bus,
|
||||
- info->filename,
|
||||
+ info,
|
||||
pid,
|
||||
data.display,
|
||||
data.sn_id,
|
||||
@@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 14 10:36:01 CET 2011 - vuntz@opensuse.org
|
||||
|
||||
- Update to version 2.27.91:
|
||||
+ Bugs fixed: bgo#638838, bgo#638894, bgo#639064, bgo#639084,
|
||||
bgo#639177.
|
||||
+ Updated translations.
|
||||
- Drop glib2-fix-panel-crash.patch: fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 8 09:53:23 CET 2011 - vuntz@opensuse.org
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package glib2 (Version 2.27.90)
|
||||
# spec file for package glib2 (Version 2.27.91)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
Name: glib2
|
||||
%define _name glib
|
||||
Version: 2.27.90
|
||||
Version: 2.27.91
|
||||
Release: 1
|
||||
# FIXME: change zlib-devel to pkgconfig(zlib) once we have a recent enough version of zlib
|
||||
# FIXME: find out if tapsets should really be in devel package or in main package
|
||||
@@ -40,8 +40,6 @@ Source5: macros.glib2
|
||||
# Please update this file from the latest gtk-doc package:
|
||||
Source6: gtk-doc.m4
|
||||
Source99: baselibs.conf
|
||||
# PATCH-FIX-UPSTREAM glib2-fix-panel-crash.patch vuntz@opensuse.org -- Taken from git, to fix a panel crash
|
||||
Patch0: glib2-fix-panel-crash.patch
|
||||
# PATCH-FIX-OPENSUSE glib2-bnc379332-desktop-su.patch bnc379332 vuntz@novell.com -- Use X-KDE-SubstituteUID
|
||||
Patch8: glib2-bnc379332-desktop-su.patch
|
||||
# PATCH-FEATURE-UPSTREAM glib2-bgo569829-gettext-gkeyfile.patch fate300461 bgo569829 vuntz@novell.com -- Look for translation of desktop entry strings via gettext, part that we share with Ubuntu and try to push upstream
|
||||
@@ -247,7 +245,6 @@ The GObject library provides an object-oriented framework for C.
|
||||
%prep
|
||||
%setup -q -n %{_name}-%{version}
|
||||
translation-update-upstream
|
||||
%patch0 -p1
|
||||
%patch8
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
|
||||
Reference in New Issue
Block a user