Import Fedora patch to fix building with x11-libs/libnotify >= 0.7.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 67 insertions, 9 deletions

diff --git a/app-office/osmo/ChangeLog b/app-office/osmo/ChangeLog
index ffeb77441d75..5626e86e4b66 100644
--- a/app-office/osmo/ChangeLog
+++ b/app-office/osmo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/osmo
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/osmo/ChangeLog,v 1.12 2010/11/02 15:46:13 tomka Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/osmo/ChangeLog,v 1.13 2011/01/30 08:36:58 ssuominen Exp $
+
+  30 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> osmo-0.2.10.ebuild,
+  +files/osmo-0.2.10-libnotify-0.7.patch:
+  Import Fedora patch to fix building with x11-libs/libnotify >= 0.7.
 
   02 Nov 2010; Thomas Kahle <tomka@gentoo.org> osmo-0.2.10.ebuild:
   x86 stable per bug #331173
diff --git a/app-office/osmo/Manifest b/app-office/osmo/Manifest
index 8466c0acb2b2..47991c9f57f0 100644
--- a/app-office/osmo/Manifest
+++ b/app-office/osmo/Manifest
@@ -1,4 +1,5 @@
+AUX osmo-0.2.10-libnotify-0.7.patch 2088 RMD160 8491e217da05f842575eaea3c0535b7e40537288 SHA1 8fbeb5cbd47b2cb4c77340f0e91c253754910bd2 SHA256 3adafa5b78bac0452038b50003ef73cddd63f726d4cf9535d326dec937d3769e
 DIST osmo-0.2.10.tar.gz 851833 RMD160 fa8e7f71c268c5246c48d6cea92cee390607b786 SHA1 aa4b3dda78aa6982e5bc580caa58d8c540495406 SHA256 4e911c52ac64a088f8a812b354084e7adedd1b54cb0435995a2cdc1d194d0845
-EBUILD osmo-0.2.10.ebuild 900 RMD160 3edc17275dcdecd3d331d6dd52ee3ee686f67208 SHA1 228e45588db91caba415d0d44061d9a4a2cdf73d SHA256 1da9e220b1d16987ffd6141464e91e94518221e9c9419c93283085c599e49c72
-MISC ChangeLog 1828 RMD160 f8e67136206b34c3be55a37c5650e5070aa6caab SHA1 f6b28840b744619a25c58d85d3717d8239d3e492 SHA256 3f197bf0d17ecf6e8d4ed17ef82e5b1193e3fd5afc3013d6d23ed14863c524e5
+EBUILD osmo-0.2.10.ebuild 1016 RMD160 7a9144c0ba7854de76c0365f715ff8beb577d5f7 SHA1 ba9dc8d07c8b0440b40c2192c63055fbf14b7133 SHA256 5f0ff2f83da906419116d583455de2535d3e343f712a4114b0f2aae6160afa86
+MISC ChangeLog 2019 RMD160 dfa022a4145481542356579acdb4271dd74ec108 SHA1 2c81aa06b88dd0dc8dc7ffef188c0ceedf4ba91c SHA256 094fbb7788208833da7f1956fea8c121af1f4985863ddb10533c660eba66b7e2
 MISC metadata.xml 167 RMD160 6f174fdd5033945a3da1b7bbea9796fe17ba2bf8 SHA1 26b8b030985c93a71d6d34f25249320a30b22f36 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241
diff --git a/app-office/osmo/files/osmo-0.2.10-libnotify-0.7.patch b/app-office/osmo/files/osmo-0.2.10-libnotify-0.7.patch
new file mode 100644
index 000000000000..d626ba2f178d
--- /dev/null
+++ b/app-office/osmo/files/osmo-0.2.10-libnotify-0.7.patch
@@ -0,0 +1,48 @@
+http://pkgs.fedoraproject.org/gitweb/?p=osmo.git;a=blob_plain;f=osmo-0.2.10-libnotify-0.7.0.patch;hb=HEAD
+
+--- src/check_events.c
++++ src/check_events.c
+@@ -454,9 +454,9 @@
+ 					a->date = 0;
+ 
+ 					if (textdesc != NULL)
+-						a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING, NULL);
++						a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING);
+ 					else
+-						a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING, NULL);
++						a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING);
+ 
+ 					g_free (textdesc);
+ 					g_free (text);
+@@ -483,9 +483,6 @@
+ #endif /* HAVE_LIBNOTIFY */
+ 
+ 					if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) {
+-#ifdef HAVE_LIBNOTIFY
+-						notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon);
+-#endif /* HAVE_LIBNOTIFY */
+ 				        gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK);
+ 
+ 						if (config.blink_on_events) {
+@@ -532,9 +529,9 @@
+ 					a->time = -1;
+ 					a->date = 0;
+ 					if (textdesc != NULL)
+-						a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO, NULL);
++						a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO);
+ 					else
+-						a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO, NULL);
++						a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO);
+ 
+ 					notify_notification_set_timeout (a->notify, NOTIFY_EXPIRES_NEVER);
+ 					notify_notification_set_urgency (a->notify, NOTIFY_URGENCY_NORMAL);
+@@ -545,9 +542,6 @@
+ #endif /* HAVE_LIBNOTIFY */
+ 
+ 					if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) {
+-#ifdef HAVE_LIBNOTIFY
+-						notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon);
+-#endif /* HAVE_LIBNOTIFY */
+ 				        gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK);
+ 
+ 						if (config.blink_on_events) {
diff --git a/app-office/osmo/osmo-0.2.10.ebuild b/app-office/osmo/osmo-0.2.10.ebuild
index 71819fd4f1e6..de852491e643 100644
--- a/app-office/osmo/osmo-0.2.10.ebuild
+++ b/app-office/osmo/osmo-0.2.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/osmo/osmo-0.2.10.ebuild,v 1.4 2010/11/02 15:46:13 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/osmo/osmo-0.2.10.ebuild,v 1.5 2011/01/30 08:36:58 ssuominen Exp $
 
-EAPI=2
-inherit flag-o-matic
+EAPI=3
+inherit eutils flag-o-matic
 
 DESCRIPTION="A handy personal organizer"
 HOMEPAGE="http://clayo.org/osmo/"
@@ -25,6 +25,11 @@ RDEPEND=">=x11-libs/gtk+-2.12:2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	has_version ">=x11-libs/libnotify-0.7" && epatch \
+		"${FILESDIR}"/${P}-libnotify-0.7.patch
+}
+
 src_configure() {
 	append-flags -I/usr/include/libical
 
@@ -35,5 +40,5 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README TRANSLATORS || die
+	dodoc AUTHORS ChangeLog README TRANSLATORS
 }