packages (GNOME_2): gnome-settings-daemon/gnome-settings-daemon.spec, gnome...
lisu
lisu at pld-linux.org
Wed Nov 23 18:21:23 CET 2011
Author: lisu Date: Wed Nov 23 17:21:23 2011 GMT
Module: packages Tag: GNOME_2
---- Log message:
- add libnotify 0.7 support
---- Files affected:
packages/gnome-settings-daemon:
gnome-settings-daemon.spec (1.34 -> 1.34.2.1) , gnome-settings-daemon-libnotify.patch (NONE -> 1.1.2.1) (NEW)
---- Diffs:
================================================================
Index: packages/gnome-settings-daemon/gnome-settings-daemon.spec
diff -u packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.34 packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.34.2.1
--- packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.34 Sat Apr 2 08:46:55 2011
+++ packages/gnome-settings-daemon/gnome-settings-daemon.spec Wed Nov 23 18:21:18 2011
@@ -10,6 +10,7 @@
Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-settings-daemon/2.32/%{name}-%{version}.tar.bz2
# Source0-md5: 6420706542e8fb959acba7e2a69ee35f
Patch0: %{name}-pa-reconnect.patch
+Patch1: %{name}-libnotify.patch
URL: http://www.gnome.org/
BuildRequires: GConf2-devel >= 2.24.0
BuildRequires: autoconf >= 2.60
@@ -61,6 +62,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p0
%build
%{__glib_gettextize}
@@ -176,6 +178,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.34.2.1 2011/11/23 17:21:18 lisu
+- add libnotify 0.7 support
+
Revision 1.34 2011/04/02 06:46:55 qboosh
- en at shaw locale is now supported (via LANGUAGE)
- use __rm macro
================================================================
Index: packages/gnome-settings-daemon/gnome-settings-daemon-libnotify.patch
diff -u /dev/null packages/gnome-settings-daemon/gnome-settings-daemon-libnotify.patch:1.1.2.1
--- /dev/null Wed Nov 23 18:21:23 2011
+++ packages/gnome-settings-daemon/gnome-settings-daemon-libnotify.patch Wed Nov 23 18:21:18 2011
@@ -0,0 +1,76 @@
+--- plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
++++ plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
+@@ -48,6 +48,9 @@
+
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif /* HAVE_LIBNOTIFY */
+
+ #include "gnome-settings-profile.h"
+@@ -608,9 +611,13 @@
+ gsd_a11y_keyboard_manager_ensure_status_icon (manager);
+ manager->priv->notification = notify_notification_new (title,
+ message,
+- "preferences-desktop-accessibility",
+- NULL);
++ "preferences-desktop-accessibility"
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++ );
++#else
++ , NULL);
+ notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
++#endif
+ notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
+
+ notify_notification_add_action (manager->priv->notification,
+@@ -747,9 +754,13 @@
+ gsd_a11y_keyboard_manager_ensure_status_icon (manager);
+ manager->priv->notification = notify_notification_new (title,
+ message,
+- "preferences-desktop-accessibility",
+- NULL);
++ "preferences-desktop-accessibility"
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++ );
++#else
++ , NULL);
+ notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
++#endif
+ notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
+
+ notify_notification_add_action (manager->priv->notification,
+--- plugins/xrandr/gsd-xrandr-manager.c
++++ plugins/xrandr/gsd-xrandr-manager.c
+@@ -48,6 +48,9 @@
+
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+
+ #include "gnome-settings-profile.h"
+@@ -1086,6 +1089,11 @@
+
+ g_assert (error_to_display == NULL || secondary_text == NULL);
+
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++ notification = notify_notification_new (primary_text,
++ error_to_display ? error_to_display->message : secondary_text,
++ GSD_XRANDR_ICON_NAME);
++#else
+ if (priv->status_icon)
+ notification = notify_notification_new_with_status_icon (primary_text,
+ error_to_display ? error_to_display->message : secondary_text,
+@@ -1096,6 +1104,7 @@
+ error_to_display ? error_to_display->message : secondary_text,
+ GSD_XRANDR_ICON_NAME,
+ NULL);
++#endif
+
+ notify_notification_show (notification, NULL); /* NULL-GError */
+ #else
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-settings-daemon/gnome-settings-daemon.spec?r1=1.34&r2=1.34.2.1&f=u
More information about the pld-cvs-commit
mailing list