Author: wiget Date: Thu Dec 9 19:28:56 2010 GMT Module: packages Tag: DEVEL ---- Log message: - 2.91.5.1 - added gtk3.patch to fix compilation with gtk+ 2.91.6
---- Files affected: packages/gnome-settings-daemon: gnome-settings-daemon.spec (1.32.2.1 -> 1.32.2.2) , gtk3.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/gnome-settings-daemon/gnome-settings-daemon.spec diff -u packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.32.2.1 packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.32.2.2 --- packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.32.2.1 Sun Nov 21 15:11:52 2010 +++ packages/gnome-settings-daemon/gnome-settings-daemon.spec Thu Dec 9 20:28:51 2010 @@ -2,14 +2,15 @@ Summary: GNOME Settings Daemon Summary(pl.UTF-8): Demon ustawień GNOME Name: gnome-settings-daemon -Version: 2.91.3 +Version: 2.91.5.1 Release: 1 Epoch: 1 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-settings-daemon/2.91/%{name}-%{version}.tar.bz2 -# Source0-md5: d09334b216e0ad2623026ad8fc52d35c +# Source0-md5: 9937225916faf7d4eedca7785afeaae6 Patch0: %{name}-pa-reconnect.patch +Patch1: gtk3.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.24.0 BuildRequires: autoconf >= 2.60 @@ -19,7 +20,7 @@ BuildRequires: gettext-devel BuildRequires: glib2-devel >= 1:2.20.0 BuildRequires: gnome-desktop3-devel >= 2.91.2 -BuildRequires: gsettings-desktop-schemas-devel >= 0.1.1 +BuildRequires: gsettings-desktop-schemas-devel >= 0.1.2 BuildRequires: gtk+3-devel >= 2.91.0 BuildRequires: intltool >= 0.40.0 BuildRequires: libcanberra-gtk3-devel @@ -66,6 +67,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{__glib_gettextize} @@ -115,6 +117,7 @@ %attr(755,root,root) %{_libexecdir}/gsd-datetime-mechanism %dir %{_libdir}/gnome-settings-daemon-3.0 %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/liba11y-keyboard.so +%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libautomount.so %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libbackground.so %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libclipboard.so %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libhousekeeping.so @@ -124,9 +127,11 @@ %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libmouse.so %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libsmartcard.so %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libsound.so +%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libwacom.so %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libxrandr.so %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libxsettings.so %{_libdir}/gnome-settings-daemon-3.0/a11y-keyboard.gnome-settings-plugin +%{_libdir}/gnome-settings-daemon-3.0/automount.gnome-settings-plugin %{_libdir}/gnome-settings-daemon-3.0/background.gnome-settings-plugin %{_libdir}/gnome-settings-daemon-3.0/clipboard.gnome-settings-plugin %{_libdir}/gnome-settings-daemon-3.0/housekeeping.gnome-settings-plugin @@ -136,6 +141,7 @@ %{_libdir}/gnome-settings-daemon-3.0/mouse.gnome-settings-plugin %{_libdir}/gnome-settings-daemon-3.0/smartcard.gnome-settings-plugin %{_libdir}/gnome-settings-daemon-3.0/sound.gnome-settings-plugin +%{_libdir}/gnome-settings-daemon-3.0/wacom.gnome-settings-plugin %{_libdir}/gnome-settings-daemon-3.0/xrandr.gnome-settings-plugin %{_libdir}/gnome-settings-daemon-3.0/xsettings.gnome-settings-plugin %{_datadir}/GConf/gsettings/gnome-settings-daemon.convert @@ -157,6 +163,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.32.2.2 2010/12/09 19:28:51 wiget +- 2.91.5.1 +- added gtk3.patch to fix compilation with gtk+ 2.91.6 + Revision 1.32.2.1 2010/11/21 14:11:52 megabajt - updated to 2.91.3 ================================================================ Index: packages/gnome-settings-daemon/gtk3.patch diff -u /dev/null packages/gnome-settings-daemon/gtk3.patch:1.1 --- /dev/null Thu Dec 9 20:28:56 2010 +++ packages/gnome-settings-daemon/gtk3.patch Thu Dec 9 20:28:51 2010 @@ -0,0 +1,23 @@ +commit d3541003ae3edb30b17278f12ee976e497806d82 +Author: Jason D. Clinton <[email protected]> +Date: Thu Dec 2 15:44:35 2010 -0600 + + mouse: gtk3: gdk_x11_drawable_get_xid renamed to gdk_x11_window_get_xid + + Just a one-line search-replace. + + https://bugzilla.gnome.org/show_bug.cgi?id=636328 + +diff --git a/plugins/mouse/gsd-locate-pointer.c b/plugins/mouse/gsd-locate-pointer.c +index 11b0da5..afbc622 100644 +--- a/plugins/mouse/gsd-locate-pointer.c ++++ b/plugins/mouse/gsd-locate-pointer.c +@@ -421,7 +421,7 @@ set_locate_pointer (void) + Window xroot; + + screen = gdk_display_get_screen (display, j); +- xroot = gdk_x11_drawable_get_xid (gdk_screen_get_root_window (screen)); ++ xroot = gdk_x11_window_get_xid (gdk_screen_get_root_window (screen)); + + XGrabKey (GDK_DISPLAY_XDISPLAY (display), + keys[i].keycode, ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-settings-daemon/gnome-settings-daemon.spec?r1=1.32.2.1&r2=1.32.2.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
