Accepting request 207365 from home:dimstar:bnc849913
Update to GNOME 3.10.2 OBS-URL: https://build.opensuse.org/request/show/207365 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=247
This commit is contained in:
Git OBS Bridge
parent
1672f5676c
commit
7c906726f0
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:01906c62ac666d2ab3183cc07261b2536fab7b211c6129ab66b119c2af56d159
|
||||
size 6679488
|
||||
3
glib-2.38.2.tar.xz
Normal file
3
glib-2.38.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:056a9854c0966a0945e16146b3345b7a82562a5ba4d5516fd10398732aea5734
|
||||
size 6718296
|
||||
13
glib2-dbus-socket-path.patch
Normal file
13
glib2-dbus-socket-path.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff -Naur glib-2.38.0/gio/gdbusaddress.c glib-2.38.0.new/gio/gdbusaddress.c
|
||||
--- glib-2.38.0/gio/gdbusaddress.c 2013-09-17 20:47:14.000000000 +0200
|
||||
+++ glib-2.38.0.new/gio/gdbusaddress.c 2013-11-15 21:56:29.143203355 +0100
|
||||
@@ -1515,7 +1515,7 @@
|
||||
ret = g_strdup (g_getenv ("DBUS_SYSTEM_BUS_ADDRESS"));
|
||||
if (ret == NULL)
|
||||
{
|
||||
- ret = g_strdup ("unix:path=/var/run/dbus/system_bus_socket");
|
||||
+ ret = g_strdup ("unix:path=/run/dbus/system_bus_socket");
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
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
|
||||
|
||||
@ -41,6 +41,6 @@ evince.desktop
|
||||
gedit.desktop
|
||||
file-roller.desktop
|
||||
epiphany.desktop
|
||||
nautilus-folder-handler.desktop
|
||||
nautilus.desktop
|
||||
# evince supports multi-page tiff, but most people will prefer eog:
|
||||
image/tiff=eog.desktop
|
||||
|
||||
@ -1,3 +1,30 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Nov 17 20:02:45 UTC 2013 - dimstar@opensuse.org
|
||||
|
||||
- Add glib2-dbus-socket-path.patch: Have gio look for the system
|
||||
dbus socket in /run instead of /var/run (bnc#845287).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 12 16:47:42 UTC 2013 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 2.38.2 (bnc#849913):
|
||||
+ GCancellableSource will now dispatch for each time a
|
||||
cancellable is cancelled (ie: in the case that it was reset)
|
||||
but this is still considered undefined behaviour.
|
||||
+ Fix g_source_add_child_source() thread safety issues.
|
||||
+ Add workaround for buggy D-Bus daemons when path-matching on
|
||||
'/'.
|
||||
+ Fallback to pathname queryinfo to help g_file_copy() work on
|
||||
gvfs filesystems that don't implement query_info_on_read().
|
||||
+ Don't crash if loading a DBusActivatable application from
|
||||
keyfile.
|
||||
+ Fix crash when replacing a symlink with another using GIO.
|
||||
+ Add a fallback for '-symbolic' icons to the non-symbolic form.
|
||||
- Replace nautilus-folder-handler.desktop in
|
||||
glib2-upstream-gnome_defaults.conf with nautilus.desktop: the
|
||||
separate .desktop file has been dropped with about version 3.0.
|
||||
- Drop glib2-no_DBusActivatable_from_keyfile.patch: fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 16 06:42:18 UTC 2013 - dimstar@opensuse.org
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
Name: glib2
|
||||
%define _name glib
|
||||
Version: 2.38.1
|
||||
Version: 2.38.2
|
||||
Release: 0
|
||||
# FIXME: find out if tapsets should really be in devel package or in main package
|
||||
Summary: General-Purpose Utility Library
|
||||
@ -45,8 +45,8 @@ Patch10: glib2-bgo569829-gettext-gkeyfile.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.
|
||||
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
|
||||
# PATCH-FIX-OPENSUSE glib2-dbus-socket-path.patch bnc#845287 dimstar@opensuse.org -- Have gio look for the system dbus socket in /run instead of /var/run.
|
||||
Patch14: glib2-dbus-socket-path.patch
|
||||
BuildRequires: automake
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
BuildRequires: fam-devel
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user