rpms
/
mate-settings-daemon
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix rhbz (1102581)

This commit is contained in:
raveit65 2015-01-08 23:46:50 +01:00
parent d988c0fea0 ad2d00ae79
commit 6c86803937
3 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -8,6 +8,13 @@
/mate-settings-daemon-1.6.0.tar.xz
/mate-settings-daemon-1.6.1.tar.xz
/mate-settings-daemon-1.6.2.gitd2d3aa7.tar.xz
<<<<<<< HEAD
/mate-settings-daemon-1.6.2.tar.xz
=======
/mate-settings-daemon-1.7.0.tar.xz
/mate-settings-daemon-1.7.1.tar.xz
/mate-settings-daemon-1.7.90.tar.xz
/mate-settings-daemon-1.8.0.tar.xz
>>>>>>> f21
/mate-settings-daemon-1.8.1.tar.xz
/mate-settings-daemon-1.8.2.tar.xz

30
mate-settings-daemon.spec
View File

@ -1,32 +1,38 @@
%global _internal_version d2d3aa7
Name: mate-settings-daemon
Version: 1.8.2
#Release: 0.4.git%{_internal_version}%{?dist}
Release: 1%{?dist}
Release: 2%{?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
#Source0: http://raveit65.fedorapeople.org/Mate/git-upstream/%{name}-%{version}.git%{_internal_version}.tar.xz
BuildRequires: dconf-devel
BuildRequires: dbus-glib-devel
BuildRequires: dconf-devel
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: libcanberra-devel
BuildRequires: libXxf86misc-devel
BuildRequires: libSM-devel
BuildRequires: libmatekbd-devel
BuildRequires: libnotify-devel
BuildRequires: libSM-devel
BuildRequires: libXxf86misc-devel
BuildRequires: mate-common
BuildRequires: mate-desktop-devel
BuildRequires: mate-polkit-devel
BuildRequires: nss-devel
BuildRequires: desktop-file-utils
BuildRequires: pulseaudio-libs-devel
Requires: libmatekbd%{?_isa} >= 0:1.6.1-1
# needed for xrandr capplet
Requires: mate-control-center-filesystem
Requires: libmatekbd%{?_isa} >= 0:1.6.1-1
# needed for xrandr capplet
@ -48,10 +54,11 @@ under it.
%prep
%setup -q
#%%setup -q -n %%{name}-%%{_internal_version}
#NOCONFIGURE=1 ./autogen.sh
%patch0 -p1 -b .safer-access
%build
%configure \
--enable-pulse \
@ -117,6 +124,9 @@ fi
%changelog
* Thu Oct 02 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.2-2
- fix rhbz (1102581)
* Thu Oct 02 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.2-1
- update to 1.8.2 release

14
mate-settings-daemon_safer-access-to-list-element-data.patch Normal file
View File

@ -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)