Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=a6fab261a6d34b2e4a452cfdd42b9b57b1df7326
commit a6fab261a6d34b2e4a452cfdd42b9b57b1df7326 Author: Baste <[email protected]> Date: Wed Apr 15 15:14:03 2015 +0200 gdm-3.16.1-2-x86_64 - Fix gdm diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild index 34a3ad9..54f927c 100644 --- a/source/gnome/gdm/FrugalBuild +++ b/source/gnome/gdm/FrugalBuild @@ -5,7 +5,7 @@ options+=('asneeded') pkgname=gdm -pkgver=3.16.0.1 +pkgver=3.16.1 pkgrel=2 pkgdesc="GNOME Display Manager" url="http://www.gnome.org/" @@ -22,7 +22,9 @@ options+=('nofakeroot' 'scriptlet' 'force') _F_gnome_devel="n" _F_gnome_ext=".tar.xz" Finclude gnome -sha1sums=('4ddae08accb1f5fcece1118473b70e48aadcee1d') +source=($source fw.patch) +sha1sums=('813ad5eb45c0c0c650ebad2c3b1cd847a2d665d7' \ + 'aa8695f40eae5eecd2c1c9211f9586c9b8eb3ef2') if [ "$_F_gnome_git" != "n" ]; then unset sha1sums fi diff --git a/source/gnome/gdm/fw.patch b/source/gnome/gdm/fw.patch new file mode 100644 index 0000000..bf238ae --- /dev/null +++ b/source/gnome/gdm/fw.patch @@ -0,0 +1,39 @@ +From b9ff7c4a6689be03b305fc83ab65338511262d41 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <[email protected]> +Date: Wed, 15 Apr 2015 13:39:18 +0200 +Subject: [PATCH] manager: Don't double-free x11_display_name + +x11_display_name got freed twice here; once by g_variant_iter_loop +and once by g_clear_pointer. + +Also break out of the loop early and use a non-copying format to +avoid having to free anything. + +https://bugzilla.gnome.org/show_bug.cgi?id=747310 +--- + daemon/gdm-manager.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c +index fc357d3..64f11dd 100644 +--- a/daemon/gdm-manager.c ++++ b/daemon/gdm-manager.c +@@ -1178,9 +1178,11 @@ gdm_manager_handle_register_display (GdmDBusManager *manager, + } + + g_variant_iter_init (&iter, details); +- while (g_variant_iter_loop (&iter, "{ss}", &key, &value)) { +- if (g_strcmp0 (key, "x11-display-name") == 0) +- x11_display_name = value; ++ while (g_variant_iter_loop (&iter, "{&s&s}", &key, &value)) { ++ if (g_strcmp0 (key, "x11-display-name") == 0) { ++ x11_display_name = g_strdup (value); ++ break; ++ } + } + + session = get_user_session_for_display (self, display); +-- +2.3.5 + + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
