Package: libgtk2-notify-perl
Version: 0.05-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch
*** /tmp/tmpfblsh7
In Ubuntu, the attached patch was applied to achieve the following:
We current have libnotify 0.7 in oneiric, so this was more pressing, but it's
available in experimental right now and I believe the transition is planned
soon. I found a patch for libnotify 0.6 here:
https://rt.cpan.org/Public/Bug/Display.html?id=67467, but it was 2 lines and I
had already made the same changes, so I figured I would leave it to the
maintainers to decide to forward my whole patch for libnotify 0.7 or everything
but what was included in the other bug. I'm happy to forward it myself once I
have an ACK from the Debian Perl team.
When libnotify 0.7 hits unstable, the severity of this bug will need to be
raised.
* Add patch to fix FTBFS with libnotify 0.7 (LP: #805774)
- add debian/patches/port_to_libnotify_0_7.patch
- update debian/patches/series
Thanks for considering the patch.
-- System Information:
Debian Release: squeeze/sid
APT prefers natty-updates
APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500,
'natty-proposed'), (500, 'natty'), (100, 'natty-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.38-10-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to en_US.UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u libgtk2-notify-perl-0.05/debian/patches/series libgtk2-notify-perl-0.05/debian/patches/series
--- libgtk2-notify-perl-0.05/debian/patches/series
+++ libgtk2-notify-perl-0.05/debian/patches/series
@@ -1,0 +2 @@
+port_to_libnotify_0_7.patch
only in patch2:
unchanged:
--- libgtk2-notify-perl-0.05.orig/debian/patches/port_to_libnotify_0_7.patch
+++ libgtk2-notify-perl-0.05/debian/patches/port_to_libnotify_0_7.patch
@@ -0,0 +1,113 @@
+Description: Port to libnotify 0.7 API
+Author: Micah Gersten <mic...@ubuntu.com>
+
+---
+ t/notification.t | 15 ++-------------
+ xs/Notify.xs | 39 ++-------------------------------------
+ 2 files changed, 4 insertions(+), 50 deletions(-)
+
+Index: libgtk2-notify-perl-0.05/xs/Notify.xs
+===================================================================
+--- libgtk2-notify-perl-0.05.orig/xs/Notify.xs
++++ libgtk2-notify-perl-0.05/xs/Notify.xs
+@@ -86,26 +86,12 @@
+ MODULE = Gtk2::Notify PACKAGE = Gtk2::Notify PREFIX = notify_notification_
+
+ NotifyNotification *
+-notify_notification_new (class, summary, body=NULL, icon=NULL, attach=NULL)
++notify_notification_new (class, summary, body=NULL, icon=NULL)
+ const gchar *summary
+ const gchar *body
+ const gchar *icon
+- GtkWidget_ornull *attach
+ C_ARGS:
+- summary, body, icon, attach
+-
+-#if GTK_CHECK_VERSION (2, 9, 2)
+-
+-NotifyNotification *
+-notify_notification_new_with_status_icon (class, summary, body=NULL, icon=NULL, status_icon=NULL)
+- const gchar *summary
+- const gchar *body
+- const gchar *icon
+- GtkStatusIcon *status_icon
+- C_ARGS:
+- summary, body, icon, status_icon
+-
+-#endif
++ summary, body, icon
+
+ gboolean
+ notify_notification_update (notification, summary, message=NULL, icon=NULL)
+@@ -114,27 +100,6 @@
+ const gchar *message
+ const gchar *icon
+
+-void
+-notify_notification_attach_to_widget (notification, attach)
+- NotifyNotification *notification
+- GtkWidget *attach
+-
+-#if GTK_CHECK_VERSION (2, 9, 2)
+-
+-void
+-notify_notification_attach_to_status_icon (notification, status_icon)
+- NotifyNotification *notification
+- GtkStatusIcon *status_icon
+-
+-#endif
+-
+-void
+-notify_notification_set_geometry_hints (notification, screen, x, y)
+- NotifyNotification *notification
+- GdkScreen *screen
+- gint x
+- gint y
+-
+ NO_OUTPUT gboolean
+ notify_notification_show (notification)
+ NotifyNotification *notification
+Index: libgtk2-notify-perl-0.05/t/notification.t
+===================================================================
+--- libgtk2-notify-perl-0.05.orig/t/notification.t
++++ libgtk2-notify-perl-0.05/t/notification.t
+@@ -2,20 +2,19 @@
+
+ use strict;
+ use warnings;
+-use Gtk2::TestHelper tests => 34;
++use Gtk2::TestHelper tests => 31;
+ use Test::Exception;
+ use Gtk2::Notify -init, $0;
+
+ ginterfaces_ok('Gtk2::Notify');
+
+ my $w = Gtk2::Window->new;
+-my $n = Gtk2::Notify->new('foo', 'bar', '', $w);
++my $n = Gtk2::Notify->new('foo', 'bar', '');
+
+ isa_ok($n, 'Gtk2::Notify');
+
+ my @methods = qw(
+ add_action
+- attach_to_widget
+ clear_actions
+ clear_hints
+ close
+@@ -46,16 +45,6 @@
+ }, 42);
+ }, 'add_action');
+
+-{
+- my $nw = Gtk2::Window->new;
+- lives_ok(sub {
+- $n->attach_to_widget($nw);
+- }, 'attach_to_widget');
+- lives_ok(sub {
+- $n->attach_to_widget($w);
+- }, 'attach_to_widget');
+-}
+-
+ lives_ok(sub {
+ $n->clear_actions;
+ }, 'clear_actions with existing actions');
