packages (DEVEL): gnome-settings-daemon/gnome-settings-daemon-pa-reconnect....
megabajt
megabajt at pld-linux.org
Wed Feb 22 00:42:37 CET 2012
Author: megabajt Date: Tue Feb 21 23:42:37 2012 GMT
Module: packages Tag: DEVEL
---- Log message:
- updated to 3.3.90.1
---- Files affected:
packages/gnome-settings-daemon:
gnome-settings-daemon-pa-reconnect.patch (1.1 -> 1.1.2.1) , gnome-settings-daemon.spec (1.45 -> 1.45.2.1)
---- Diffs:
================================================================
Index: packages/gnome-settings-daemon/gnome-settings-daemon-pa-reconnect.patch
diff -u packages/gnome-settings-daemon/gnome-settings-daemon-pa-reconnect.patch:1.1 packages/gnome-settings-daemon/gnome-settings-daemon-pa-reconnect.patch:1.1.2.1
--- packages/gnome-settings-daemon/gnome-settings-daemon-pa-reconnect.patch:1.1 Sat Jun 5 01:18:35 2010
+++ packages/gnome-settings-daemon/gnome-settings-daemon-pa-reconnect.patch Wed Feb 22 00:42:31 2012
@@ -1,6 +1,6 @@
---- gnome-settings-daemon-2.30.1/plugins/media-keys/cut-n-paste/gvc-mixer-control.c.orig 2009-08-24 12:20:18.000000000 +0200
-+++ gnome-settings-daemon-2.30.1/plugins/media-keys/cut-n-paste/gvc-mixer-control.c 2010-06-05 01:11:19.573632996 +0200
-@@ -44,6 +44,7 @@
+--- gnome-settings-daemon-3.3.90.1/plugins/media-keys/cut-n-paste/gvc-mixer-control.c.orig 2012-02-21 20:08:35.468041032 +0100
++++ gnome-settings-daemon-3.3.90.1/plugins/media-keys/cut-n-paste/gvc-mixer-control.c 2012-02-21 20:53:12.920202696 +0100
+@@ -47,6 +47,7 @@
#define GVC_MIXER_CONTROL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_MIXER_CONTROL, GvcMixerControlPrivate))
#define RECONNECT_DELAY 5
@@ -8,7 +8,7 @@
enum {
PROP_0,
-@@ -57,6 +58,7 @@
+@@ -60,6 +61,7 @@ struct GvcMixerControlPrivate
pa_context *pa_context;
int n_outstanding;
guint reconnect_id;
@@ -16,10 +16,10 @@
char *name;
gboolean default_sink_is_set;
-@@ -1831,8 +1833,11 @@
-
+@@ -1941,8 +1943,11 @@ _pa_context_state_cb (pa_context *contex
case PA_CONTEXT_FAILED:
- g_warning ("Connection failed, reconnecting...");
+ control->priv->state = GVC_STATE_FAILED;
+ g_signal_emit (control, signals[STATE_CHANGED], 0, GVC_STATE_FAILED);
- if (control->priv->reconnect_id == 0)
+ if ((control->priv->reconnect_id == 0) && (control->priv->reconnect_nr < RECONNECT_TRIES))
control->priv->reconnect_id = g_timeout_add_seconds (RECONNECT_DELAY, idle_reconnect, control);
================================================================
Index: packages/gnome-settings-daemon/gnome-settings-daemon.spec
diff -u packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.45 packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.45.2.1
--- packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.45 Sun Nov 13 00:42:06 2011
+++ packages/gnome-settings-daemon/gnome-settings-daemon.spec Wed Feb 22 00:42:31 2012
@@ -4,16 +4,15 @@
Summary: GNOME Settings Daemon
Summary(pl.UTF-8): Demon ustawień GNOME
Name: gnome-settings-daemon
-Version: 3.2.2
+Version: 3.3.90.1
Release: 1
Epoch: 1
License: GPL v2+
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-settings-daemon/3.2/%{name}-%{version}.tar.xz
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-settings-daemon/3.3/%{name}-%{version}.tar.xz
# Source0-md5: eb21af36feace3529965ebe17a063d63
Patch0: %{name}-pa-reconnect.patch
-# PLD-specific patches
-Patch100: use-etc-sysconfig-timezone.patch
+Patch1: %{name}-link.patch
URL: http://www.gnome.org/
BuildRequires: GConf2-devel >= 2.24.0
BuildRequires: PackageKit-devel >= 0.6.13
@@ -22,19 +21,19 @@
BuildRequires: colord-devel >= 0.1.12
BuildRequires: cups-devel
BuildRequires: dbus-devel >= 1.2.0
-BuildRequires: dbus-glib-devel >= 0.74
BuildRequires: fontconfig-devel
BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.30.0
-BuildRequires: gnome-desktop-devel >= 3.2.0
-BuildRequires: gsettings-desktop-schemas-devel >= 3.2.0
-BuildRequires: gtk+3-devel >= 3.0.0
+BuildRequires: glib2-devel >= 1:2.31.0
+BuildRequires: gnome-desktop-devel >= 3.3.4
+BuildRequires: gsettings-desktop-schemas-devel >= 3.3.0
+BuildRequires: gtk+3-devel >= 3.3.4
BuildRequires: intltool >= 0.40.0
BuildRequires: lcms2-devel >= 2.2
BuildRequires: libcanberra-gtk3-devel
BuildRequires: libgnomekbd-devel >= 3.0.0
BuildRequires: libnotify-devel >= 0.7.3
BuildRequires: libtool
+BuildRequires: libwacom-devel >= 0.3
BuildRequires: libxklavier-devel >= 5.0
BuildRequires: nss-devel >= 3.11.2
BuildRequires: pkgconfig
@@ -44,16 +43,18 @@
BuildRequires: sed >= 4.0
BuildRequires: tar >= 1:1.22
BuildRequires: udev-glib-devel
-BuildRequires: upower-devel >= 0.9.1
+BuildRequires: upower-devel >= 0.9.11
+BuildRequires: xorg-driver-input-wacom-devel
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXi-devel
BuildRequires: xorg-lib-libXxf86misc-devel
BuildRequires: xorg-proto-kbproto-devel
BuildRequires: xz
-Requires(post,postun): glib2 >= 1:2.26.0
-Requires: gnome-desktop >= 3.2.0
-Requires: gsettings-desktop-schemas >= 3.2.0
+Requires(post,postun): glib2 >= 1:2.31.0
+Requires: gnome-desktop >= 3.3.4
+Requires: gsettings-desktop-schemas >= 3.3.0
+Requires: gtk+3 >= 3.3.4
Requires: gtk-update-icon-cache
Requires: hicolor-icon-theme
# sr at Latn vs. sr at latin
@@ -72,8 +73,7 @@
Summary(pl.UTF-8): Plik nagłówkowy do tworzenia klientów demona ustawień GNOME
Group: Development/Libraries
Requires: dbus-devel >= 1.2.0
-Requires: dbus-glib-devel >= 0.74
-Requires: glib2-devel >= 1:2.30.0
+Requires: glib2-devel >= 1:2.31.0
# doesn't require base currently
%description devel
@@ -85,7 +85,7 @@
%prep
%setup -q
%patch0 -p1
-%patch100 -p1
+%patch1 -p1
%build
%{__glib_gettextize}
@@ -96,8 +96,7 @@
%{__autoconf}
%{__automake}
%configure \
- --disable-silent-rules \
- --with-pnpids=%{_datadir}/libgnome-desktop-3.0/pnp.ids
+ --disable-silent-rules
%{__make}
%install
@@ -131,7 +130,6 @@
%attr(755,root,root) %{_libexecdir}/gnome-settings-daemon
%attr(755,root,root) %{_libexecdir}/gsd-backlight-helper
%attr(755,root,root) %{_libexecdir}/gsd-locate-pointer
-%attr(755,root,root) %{_libexecdir}/gsd-datetime-mechanism
%attr(755,root,root) %{_libexecdir}/gsd-printer
%dir %{_libdir}/gnome-settings-daemon-3.0
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/liba11y-keyboard.so
@@ -140,8 +138,8 @@
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libclipboard.so
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libcolor.so
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libcursor.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libgsdwacom.so
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libhousekeeping.so
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libkeybindings.so
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libkeyboard.so
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libmedia-keys.so
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libmouse.so
@@ -151,7 +149,6 @@
%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/libupdates.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
@@ -161,7 +158,6 @@
%{_libdir}/gnome-settings-daemon-3.0/color.gnome-settings-plugin
%{_libdir}/gnome-settings-daemon-3.0/cursor.gnome-settings-plugin
%{_libdir}/gnome-settings-daemon-3.0/housekeeping.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-3.0/keybindings.gnome-settings-plugin
%{_libdir}/gnome-settings-daemon-3.0/keyboard.gnome-settings-plugin
%{_libdir}/gnome-settings-daemon-3.0/media-keys.gnome-settings-plugin
%{_libdir}/gnome-settings-daemon-3.0/mouse.gnome-settings-plugin
@@ -177,16 +173,13 @@
%dir %{_libdir}/gnome-settings-daemon-3.0/gtk-modules
%{_datadir}/GConf/gsettings/gnome-settings-daemon.convert
%{_datadir}/dbus-1/services/org.gnome.SettingsDaemon.service
-%{_datadir}/dbus-1/system-services/org.gnome.SettingsDaemon.DateTimeMechanism.service
%{_datadir}/glib-2.0/schemas/*.xml
%{_datadir}/gnome-settings-daemon
%{_datadir}/gnome-settings-daemon-3.0
-%{_datadir}/polkit-1/actions/org.gnome.settingsdaemon.datetimemechanism.policy
%{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy
%{_iconsdir}/hicolor/*/*/*.png
%{_iconsdir}/hicolor/*/*/*.svg
%{_mandir}/man1/gnome-settings-daemon.1*
-/etc/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf
%{_sysconfdir}/xdg/autostart/gnome-fallback-mount-helper.desktop
%{_sysconfdir}/xdg/autostart/gnome-settings-daemon.desktop
@@ -202,6 +195,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.45.2.1 2012/02/21 23:42:31 megabajt
+- updated to 3.3.90.1
+
Revision 1.45 2011/11/12 23:42:06 megabajt
- updated to 3.2.2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-settings-daemon/gnome-settings-daemon-pa-reconnect.patch?r1=1.1&r2=1.1.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-settings-daemon/gnome-settings-daemon.spec?r1=1.45&r2=1.45.2.1&f=u
More information about the pld-cvs-commit
mailing list