commit 77bac30c73cb8fa33d7d70aadf5ec9b559113d61
Author: Iain Arnell <iarnell@xxxxxxxxx>
Date: Fri Apr 15 17:00:26 2011 +0200
update libnotify patch for current version
libnotify.patch | 105 ++++++++++++++++++++++++++++++++++++++++++++++---
perl-Gtk2-Notify.spec | 12 ++++-
2 files changed, 108 insertions(+), 9 deletions(-)
---
diff --git a/libnotify.patch b/libnotify.patch
index 7c4b940..00e8771 100644
--- a/libnotify.patch
+++ b/libnotify.patch
@@ -1,19 +1,112 @@
-diff -up Gtk2-Notify-0.05/xs/Notify.xs.not Gtk2-Notify-0.05/xs/Notify.xs
---- Gtk2-Notify-0.05/xs/Notify.xs.not 2007-10-04 14:11:13.000000000 +0200
-+++ Gtk2-Notify-0.05/xs/Notify.xs 2010-11-05 13:29:48.663238502 +0100
-@@ -86,13 +86,12 @@ notify_get_server_info (class, OUTLIST c
+diff -up Gtk2-Notify-0.05/t/notification.t.orig Gtk2-Notify-0.05/t/notification.t
+--- Gtk2-Notify-0.05/t/notification.t.orig 2006-08-27 21:11:57.000000000 +0200
++++ Gtk2-Notify-0.05/t/notification.t 2011-04-15 16:14:16.000000000 +0200
+@@ -2,20 +2,18 @@
+
+ use strict;
+ use warnings;
+-use Gtk2::TestHelper tests => 35;
++use Gtk2::TestHelper tests => 32;
+ 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 +44,6 @@ lives_ok(sub {
+ }, 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');
+@@ -99,8 +87,6 @@ lives_ok(sub {
+ $n->close;
+ }, 'close before show');
+
+-$w->show_all;
+-
+ lives_ok(sub {
+ $n->show;
+ }, 'show');
+diff -up Gtk2-Notify-0.05/xs/Notify.xs.orig Gtk2-Notify-0.05/xs/Notify.xs
+--- Gtk2-Notify-0.05/xs/Notify.xs.orig 2007-10-04 14:11:13.000000000 +0200
++++ Gtk2-Notify-0.05/xs/Notify.xs 2011-04-15 16:12:52.000000000 +0200
+@@ -86,26 +86,12 @@ notify_get_server_info (class, OUTLIST c
MODULE = Gtk2::Notify PACKAGE = Gtk2::Notify PREFIX = notify_notification_
NotifyNotification *
-notify_notification_new (class, summary, body=NULL, icon=NULL, attach=NULL)
-+notify_notification_new (summary, body=NULL, icon=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
- #if GTK_CHECK_VERSION (2, 9, 2)
+ gboolean
+ notify_notification_update (notification, summary, message=NULL, icon=NULL)
+@@ -114,27 +100,6 @@ notify_notification_update (notification
+ 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
diff --git a/perl-Gtk2-Notify.spec b/perl-Gtk2-Notify.spec
index 995213a..6c87e3f 100644
--- a/perl-Gtk2-Notify.spec
+++ b/perl-Gtk2-Notify.spec
@@ -1,6 +1,6 @@
Name: perl-Gtk2-Notify
Version: 0.05
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Perl interface to libnotify
License: LGPLv2+
Group: Development/Libraries
@@ -20,6 +20,7 @@ BuildRequires: perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
# for tests...
%{?_with_display_tests:BuildRequires: perl(Test::Pod::Coverage) >= 1.04, perl(Test::Pod) >= 1.14}
+%{?_with_display_tests:BuildRequires: perl(Test::Exception)}
# libnotify-devel seems to be missing this. see BZ#216946
BuildRequires: gtk2-devel
@@ -57,8 +58,8 @@ find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
%{_fixperms} %{buildroot}/*
%check
-# tests all bomb under mock, unfortunately
-%{?_with_display_tests: make test}
+# tests mostly bomb under mock, unfortunately
+%{?_with_display_tests: DISPLAY=:0 make test}
%clean
rm -rf %{buildroot}
@@ -71,6 +72,11 @@ rm -rf %{buildroot}
%{_mandir}/man3/*
%changelog
+* Fri Apr 15 2011 Iain Arnell <iarnell@xxxxxxxxx> 0.05-11
+- fix libnotify patch for notify_notification_new and update to remove obsolete
+ methods
+- explicitly set DISPLAY for conditional tests
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 0.05-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
