From 0ad4cb31e8fcd77544fe9ecbc833c7b621136375 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Thu, 8 Jan 2015 23:15:31 +0100 Subject: [PATCH] fix rhbz (1102581) --- mate-settings-daemon.spec | 15 ++++++++++++--- ...daemon_safer-access-to-list-element-data.patch | 14 ++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 mate-settings-daemon_safer-access-to-list-element-data.patch diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec index 0ad4461..4e331e0 100644 --- a/mate-settings-daemon.spec +++ b/mate-settings-daemon.spec @@ -1,12 +1,16 @@ Name: mate-settings-daemon Version: 1.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MATE Desktop settings daemon License: GPLv2+ URL: http://mate-desktop.org Source0: http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz +# rhbz (1102581) +# https://github.com/mate-desktop/mate-settings-daemon/pull/91 +Patch0: mate-settings-daemon_safer-access-to-list-element-data .patch + # To generate tarball # wget http://git.mate-desktop.org/%%{name}/snapshot/%%{name}-{_internal_version}.tar.xz -O %%{name}-%%{version}.git%%{_internal_version}.tar.xz #Source0: http://raveit65.fedorapeople.org/Mate/git-upstream/%{name}-%{version}.git%{_internal_version}.tar.xz @@ -45,7 +49,9 @@ various parameters of a MATE session and the applications that run under it. %prep -%setup -q +%setup -q + +%patch0 -p1 -b .safer-access %build %configure \ @@ -111,7 +117,10 @@ fi %{_libdir}/pkgconfig/mate-settings-daemon.pc %changelog -* Thu Oct 02 2014 Wolfgang Ulbrich - 1.8.2-1 +* Thu Oct 02 2014 Wolfgang Ulbrich - 1.8.2-3 +- fix rhbz (1102581) + +* Thu Oct 02 2014 Wolfgang Ulbrich - 1.8.2-2 - update to 1.8.2 release * Sun Aug 17 2014 Fedora Release Engineering - 1.8.1-3 diff --git a/mate-settings-daemon_safer-access-to-list-element-data.patch b/mate-settings-daemon_safer-access-to-list-element-data.patch new file mode 100644 index 0000000..e98d2a7 --- /dev/null +++ b/mate-settings-daemon_safer-access-to-list-element-data.patch @@ -0,0 +1,14 @@ +diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c +index 215be80..5b6a04b 100644 +--- a/plugins/background/msd-background-manager.c ++++ b/plugins/background/msd-background-manager.c +@@ -269,7 +269,7 @@ on_screen_size_changed (GdkScreen *screen, + return; + + gint scr_num = gdk_screen_get_number (screen); +- gchar *old_size = g_list_nth (manager->priv->scr_sizes, scr_num)->data; ++ gchar *old_size = g_list_nth_data (manager->priv->scr_sizes, scr_num); + gchar *new_size = g_strdup_printf ("%dx%d", gdk_screen_get_width (screen), + gdk_screen_get_height (screen)); + if (g_strcmp0 (old_size, new_size) != 0) +