From c059c40dedf67ca367f482c1a5e614f434663680 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 9 Nov 2015 11:59:56 +0100 Subject: [PATCH] Update to 2.46.2 --- ...ppInfo-Do-not-set-the-DISPLAY-in-gio.patch | 73 ------------------- glib2.spec | 10 +-- sources | 2 +- 3 files changed, 6 insertions(+), 79 deletions(-) delete mode 100644 0001-GDesktopAppInfo-Do-not-set-the-DISPLAY-in-gio.patch diff --git a/0001-GDesktopAppInfo-Do-not-set-the-DISPLAY-in-gio.patch b/0001-GDesktopAppInfo-Do-not-set-the-DISPLAY-in-gio.patch deleted file mode 100644 index 00b7388..0000000 --- a/0001-GDesktopAppInfo-Do-not-set-the-DISPLAY-in-gio.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 24a4b33ffe7f4ef3487316e85060dd37b907941d Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan -Date: Tue, 15 Sep 2015 09:22:12 +0200 -Subject: [PATCH] GDesktopAppInfo: Do not set the DISPLAY in gio - -The environment variable DISPLAY makes sense only for X11, it should -not be set in gio. - -Beside, if the backend is not X11 but Wayland, forcing the value of -DISPLAY to the Wayland display will confuse the backend selection and -possibly crash the applications. - -https://bugzilla.gnome.org/show_bug.cgi?id=754983 ---- - gio/gdesktopappinfo.c | 13 ++----------- - 1 file changed, 2 insertions(+), 11 deletions(-) - -diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c -index b229788..cbfe556 100644 ---- a/gio/gdesktopappinfo.c -+++ b/gio/gdesktopappinfo.c -@@ -2669,7 +2669,7 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, - GPid pid; - GList *launched_uris; - GList *iter; -- char *display, *sn_id = NULL; -+ char *sn_id = NULL; - - old_uris = uris; - if (!expand_application_parameters (info, exec_line, &uris, &argc, &argv, error)) -@@ -2708,18 +2708,11 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, - data.pid_envvar = NULL; - } - -- display = NULL; - sn_id = NULL; - if (launch_context) - { - GList *launched_files = create_files_for_uris (launched_uris); - -- display = g_app_launch_context_get_display (launch_context, -- G_APP_INFO (info), -- launched_files); -- if (display) -- envp = g_environ_setenv (envp, "DISPLAY", display, TRUE); -- - if (info->startup_notify) - { - sn_id = g_app_launch_context_get_startup_notify_id (launch_context, -@@ -2744,7 +2737,6 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, - if (sn_id) - g_app_launch_context_launch_failed (launch_context, sn_id); - -- g_free (display); - g_free (sn_id); - g_list_free (launched_uris); - -@@ -2771,11 +2763,10 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, - notify_desktop_launch (session_bus, - info, - pid, -- display, -+ NULL, - sn_id, - launched_uris); - -- g_free (display); - g_free (sn_id); - g_list_free (launched_uris); - --- -2.5.0 - diff --git a/glib2.spec b/glib2.spec index e88cc26..93c0310 100644 --- a/glib2.spec +++ b/glib2.spec @@ -2,15 +2,13 @@ Summary: A library of handy utility functions Name: glib2 -Version: 2.46.1 -Release: 2%{?dist} +Version: 2.46.2 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org #VCS: git:git://git.gnome.org/glib Source: http://download.gnome.org/sources/glib/2.46/glib-%{version}.tar.xz -# Backported from upstream -Patch0: 0001-GDesktopAppInfo-Do-not-set-the-DISPLAY-in-gio.patch BuildRequires: pkgconfig BuildRequires: gettext @@ -83,7 +81,6 @@ the functionality of the installed glib2 package. %prep %setup -q -n glib-%{version} -%patch0 -p1 %build # Support builds of both git snapshots and tarballs packed with autogoo @@ -221,6 +218,9 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules %{_datadir}/installed-tests %changelog +* Mon Nov 09 2015 Kalev Lember - 2.46.2-1 +- Update to 2.46.2 + * Mon Oct 19 2015 Kalev Lember - 2.46.1-2 - Backport an upstream fix for app launching under wayland (#1273146) diff --git a/sources b/sources index b3ba3ce..c1c4332 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c90e93ceb45100ffc1d40ec5d2ca3248 glib-2.46.1.tar.xz +7f815d6e46df68e070cb421ed7f1139e glib-2.46.2.tar.xz