[Pkg-xfce-commits] r4585 - in goodies/branches/experimental/xfce4-notifyd/debian: . patches

Yves-Alexis Perez corsac at alioth.debian.org
Sat Nov 27 02:27:32 UTC 2010


Author: corsac
Date: 2010-11-27 14:27:31 +0000 (Sat, 27 Nov 2010)
New Revision: 4585

Removed:
   goodies/branches/experimental/xfce4-notifyd/debian/patches/01_send-second-arg-notification-closed.patch
   goodies/branches/experimental/xfce4-notifyd/debian/patches/02_add-spec-version-to-GetServerInformation.patch
   goodies/branches/experimental/xfce4-notifyd/debian/patches/series
Modified:
   goodies/branches/experimental/xfce4-notifyd/debian/changelog
Log:
* debian/patches:
  - 01_send-second-arg-notification-closed dropped, xfce4-notifyd has been
    ported to libnotify 0.4.5.
  - 02_add-spec-version-to-GetServerInformation dropped as well, included
    upstream.

Modified: goodies/branches/experimental/xfce4-notifyd/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-notifyd/debian/changelog	2010-11-27 14:19:14 UTC (rev 4584)
+++ goodies/branches/experimental/xfce4-notifyd/debian/changelog	2010-11-27 14:27:31 UTC (rev 4585)
@@ -9,8 +9,13 @@
     - pick {C,LD}FLAGS from dpkg-buildflags.
     - add -z,defs, --as-needed and -O1 to LDFLAGS.
     - add hardening flags to {C,LD}FLAGS
+  * debian/patches:
+    - 01_send-second-arg-notification-closed dropped, xfce4-notifyd has been
+      ported to libnotify 0.4.5.
+    - 02_add-spec-version-to-GetServerInformation dropped as well, included
+      upstream.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 27 Nov 2010 15:18:28 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 27 Nov 2010 15:23:14 +0100
 
 xfce4-notifyd (0.1.0-5) unstable; urgency=low
 

Deleted: goodies/branches/experimental/xfce4-notifyd/debian/patches/01_send-second-arg-notification-closed.patch
===================================================================
--- goodies/branches/experimental/xfce4-notifyd/debian/patches/01_send-second-arg-notification-closed.patch	2010-11-27 14:19:14 UTC (rev 4584)
+++ goodies/branches/experimental/xfce4-notifyd/debian/patches/01_send-second-arg-notification-closed.patch	2010-11-27 14:27:31 UTC (rev 4585)
@@ -1,41 +0,0 @@
-Revert e5e86376c5824b74073ab1ab2a332ee9c3bb64fc
-We want to send the reason as libnotify 0.4.5 does support the reason arg.
-
-diff --git a/po/POTFILES.skip b/po/POTFILES.skip
-new file mode 100644
-index 0000000..4afffb8
---- /dev/null
-+++ b/po/POTFILES.skip
-@@ -0,0 +1 @@
-+.pc/01_send-second-arg-notification-closed.patch/xfce4-notifyd/xfce-notify-daemon.c
-diff --git a/xfce4-notifyd/xfce-notify-daemon.c b/xfce4-notifyd/xfce-notify-daemon.c
-index 9a14e30..cd71cbb 100644
---- a/xfce4-notifyd/xfce-notify-daemon.c
-+++ b/xfce4-notifyd/xfce-notify-daemon.c
-@@ -125,15 +125,10 @@
-                                                     G_SIGNAL_RUN_LAST,
-                                                     0,
-                                                     NULL, NULL,
--                                                    g_cclosure_marshal_VOID__UINT,
--                                                    G_TYPE_NONE, 1,
--                                                    G_TYPE_UINT);
--#if 0  /* it seems libnotify doesn't support the close-reason arg */
-                                                     xfce_notify_marshal_VOID__UINT_UINT,
-                                                     G_TYPE_NONE, 2,
-                                                     G_TYPE_UINT,
-                                                     G_TYPE_UINT);
--#endif
-     signals[SIG_ACTION_INVOKED] = g_signal_new("action-invoked",
-                                                XFCE_TYPE_NOTIFY_DAEMON,
-                                                G_SIGNAL_RUN_LAST,
-@@ -215,9 +210,7 @@
- 
-     g_tree_remove(daemon->active_notifications, id_p);
-     g_signal_emit(G_OBJECT(daemon), signals[SIG_NOTIFICATION_CLOSED], 0,
--                  GPOINTER_TO_UINT(id_p));
--    /* NOTE: libnotify doesn't support the close-reason argument to
--     * the signal.  not sure why. */
-+                  GPOINTER_TO_UINT(id_p), reason);
- }
- 
- static void

Deleted: goodies/branches/experimental/xfce4-notifyd/debian/patches/02_add-spec-version-to-GetServerInformation.patch
===================================================================
--- goodies/branches/experimental/xfce4-notifyd/debian/patches/02_add-spec-version-to-GetServerInformation.patch	2010-11-27 14:19:14 UTC (rev 4584)
+++ goodies/branches/experimental/xfce4-notifyd/debian/patches/02_add-spec-version-to-GetServerInformation.patch	2010-11-27 14:27:31 UTC (rev 4585)
@@ -1,50 +0,0 @@
-diff --git a/xfce4-notifyd/notify-dbus.xml b/xfce4-notifyd/notify-dbus.xml
-index 832d7b9..98a82ef 100644
---- a/xfce4-notifyd/notify-dbus.xml
-+++ b/xfce4-notifyd/notify-dbus.xml
-@@ -27,6 +27,7 @@
-             <arg direction="out" name="name" type="s"/>
-             <arg direction="out" name="vendor" type="s"/>
-             <arg direction="out" name="version" type="s"/>
-+            <arg direction="out" name="spec_version" type="s"/>
-         </method>
- 
-         <signal name="NotificationClosed">
-diff --git a/xfce4-notifyd/xfce-notify-daemon.c b/xfce4-notifyd/xfce-notify-daemon.c
-index 9a14e30..946aa10 100644
---- a/xfce4-notifyd/xfce-notify-daemon.c
-+++ b/xfce4-notifyd/xfce-notify-daemon.c
-@@ -98,6 +98,7 @@ static gboolean notify_get_server_information(XfceNotifyDaemon *daemon,
-                                               gchar **OUT_name,
-                                               gchar **OUT_vendor,
-                                               gchar **OUT_version,
-+                                              gchar **OUT_spec_version,
-                                               GError **error);
- 
- static gboolean notify_quit(XfceNotifyDaemon *daemon,
-@@ -419,11 +420,13 @@ notify_get_server_information(XfceNotifyDaemon *daemon,
-                               gchar **OUT_name,
-                               gchar **OUT_vendor,
-                               gchar **OUT_version,
-+                              gchar **OUT_spec_version,
-                               GError **error)
- {
-     *OUT_name = g_strdup("Xfce Notify Daemon");
-     *OUT_vendor = g_strdup("Xfce");
-     *OUT_version = g_strdup(VERSION);
-+    *OUT_spec_version = g_strdup(NOTIFICATIONS_SPEC_VERSION);
- 
-     return TRUE;
- }
-diff --git a/xfce4-notifyd/xfce-notify-daemon.h b/xfce4-notifyd/xfce-notify-daemon.h
-index 9b9efe6..5a94c38 100644
---- a/xfce4-notifyd/xfce-notify-daemon.h
-+++ b/xfce4-notifyd/xfce-notify-daemon.h
-@@ -25,6 +25,7 @@
- #define XFCE_TYPE_NOTIFY_DAEMON     (xfce_notify_daemon_get_type())
- #define XFCE_NOTIFY_DAEMON(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), XFCE_TYPE_NOTIFY_DAEMON, XfceNotifyDaemon))
- #define XFCE_IS_NOTIFY_DAEMON(obj)  (G_TYPE_CHECK_INSTANCE_TYPE((obj), XFCE_TYPE_NOTIFY_DAEMON))
-+#define NOTIFICATIONS_SPEC_VERSION "1.0"
- 
- G_BEGIN_DECLS
- 

Deleted: goodies/branches/experimental/xfce4-notifyd/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-notifyd/debian/patches/series	2010-11-27 14:19:14 UTC (rev 4584)
+++ goodies/branches/experimental/xfce4-notifyd/debian/patches/series	2010-11-27 14:27:31 UTC (rev 4585)
@@ -1,2 +0,0 @@
-01_send-second-arg-notification-closed.patch
-02_add-spec-version-to-GetServerInformation.patch




More information about the Pkg-xfce-commits mailing list