[ircp-tray] Add libnotify patch

Lubomir Rintel lkundrak at fedoraproject.org
Thu Dec 9 07:43:33 UTC 2010


commit 2edb87c8ed3b6181a54b92ab05ac96d69742e975
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Thu Dec 9 07:45:14 2010 -0500

    Add libnotify patch

 ircp-tray-0.7.4-libnotify.patch |   63 +++++++++++++++++++++++++++++++++++++++
 ircp-tray.spec                  |    3 ++
 2 files changed, 66 insertions(+), 0 deletions(-)
---
diff --git a/ircp-tray-0.7.4-libnotify.patch b/ircp-tray-0.7.4-libnotify.patch
new file mode 100644
index 0000000..017453e
--- /dev/null
+++ b/ircp-tray-0.7.4-libnotify.patch
@@ -0,0 +1,63 @@
+From 97a84d560d234c50bf100a893590e40abc629335 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak at v3.sk>
+Date: Thu, 9 Dec 2010 07:43:45 -0500
+Subject: [PATCH] Fix build with more recent libnotify
+
+---
+ src/app.c      |   14 ++++++++++----
+ src/recvfile.c |    7 +++++--
+ 2 files changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/src/app.c b/src/app.c
+index 1581bdd..a619c50 100644
+--- a/src/app.c
++++ b/src/app.c
+@@ -454,8 +454,11 @@ static gboolean discoverer_do(void*p)
+ 			
+ 			n = notify_notification_new (title,
+                                        tooltips,
+-                                       "phone",
+-                                       GTK_WIDGET(TrayIcon));
++                                       "phone"
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
++                                       , GTK_WIDGET(TrayIcon)
++#endif
++                        );
+ 
+ 			// debug
+ 			printf("%s\n", tooltips);
+@@ -507,8 +510,11 @@ static gboolean discoverer_do(void*p)
+ 					 
+ 			n = notify_notification_new (title,
+                                        byemsg,
+-                                       "phone",
+-                                       GTK_WIDGET(TrayIcon));
++                                       "phone"
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
++                                       , GTK_WIDGET(TrayIcon)
++#endif
++                        );
+                         
+                         // debug
+ 			printf("%s\n", byemsg);
+diff --git a/src/recvfile.c b/src/recvfile.c
+index 1118d7b..9784cf1 100644
+--- a/src/recvfile.c
++++ b/src/recvfile.c
+@@ -252,8 +252,11 @@ static gboolean recvfile_onrecv(GIOChannel *source,
+ 
+ 				n = notify_notification_new (title,
+                                        msg,
+-                                       MAIN_ICON,
+-                                       GTK_WIDGET(TrayIcon));
++                                       MAIN_ICON
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
++                                       , GTK_WIDGET(TrayIcon)
++#endif
++				);
+ 
+ 				if (n != NULL) {
+ 					notify_notification_set_urgency(n, NOTIFY_URGENCY_NORMAL);
+-- 
+1.7.3.1
+
diff --git a/ircp-tray.spec b/ircp-tray.spec
index b8c079a..34b01b2 100644
--- a/ircp-tray.spec
+++ b/ircp-tray.spec
@@ -9,6 +9,7 @@ URL:            https://launchpad.net/ircp-tray
 Source0:        http://launchpad.net/ircp-tray/trunk/0.7.3/+download/%{name}-%{version}.tar.gz
 Patch0:         ircp-tray-0.7.4-lX11.patch
 Patch1:         ircp-tray-0.7.4-gtk.patch
+Patch2:         ircp-tray-0.7.4-libnotify.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  intltool gettext
@@ -28,6 +29,7 @@ file out to remote devices via IrDA.
 %setup -q
 %patch0 -p1 -b .lX11
 %patch1 -p1 -b .gtk
+%patch2 -p1 -b .libnotify
 
 
 %build
@@ -68,6 +70,7 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %changelog
 * Tue Dec 07 2010 Lubomir Rintel <lkundrak at v3.sk> - 0.7.4-2
 - Fix build with newer gtk
+- Fix build with newer libnotify
 
 * Wed Feb 17 2010 Lubomir Rintel <lkundrak at v3.sk> - 0.7.4-1
 - Fix build


More information about the scm-commits mailing list