[Frugalware-git] gnometesting: osmo-0.2.10-2-x86_64 *rebuild with libnotify 0.7

[bouleetbil]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=08964d87e05c082bddcae436fa01da4e5fa03b9c

commit 08964d87e05c082bddcae436fa01da4e5fa03b9c
Author: bouleetbil <bouleetbil at frogdev.info>
Date:   Wed Jan 26 22:36:22 2011 +0100

osmo-0.2.10-2-x86_64
*rebuild with libnotify 0.7

diff --git a/source/xapps-extra/osmo/FrugalBuild b/source/xapps-extra/osmo/FrugalBuild
index 5589f34..d5c6828 100644
--- a/source/xapps-extra/osmo/FrugalBuild
+++ b/source/xapps-extra/osmo/FrugalBuild
@@ -3,17 +3,19 @@

pkgname=osmo
pkgver=0.2.10
-pkgrel=1
+pkgrel=2
pkgdesc="A handy personal organizer which includes calendar, tasks manager and address book modules."
_F_sourceforge_dirname="osmo-pim"
_F_sourceforge_realname="$_F_sourceforge_dirname"
Finclude sourceforge
url="http://clayo.org/osmo/"
-depends=('libgringotts' 'libnotify>=0.4.5-3' 'libical')
+depends=('libgringotts' 'libnotify>=0.7' 'libical')
options=('scriptlet')
groups=('xapps-extra')
archs=('i686' 'x86_64')
-sha1sums=('aa4b3dda78aa6982e5bc580caa58d8c540495406')
+source=($source libnotify07.diff)
+sha1sums=('aa4b3dda78aa6982e5bc580caa58d8c540495406' \
+          '573bacaec93f05dd988653d3f2e134dd9bb286d9')
CFLAGS="$CFLAGS -I/usr/include/libical"

# optimization OK
diff --git a/source/xapps-extra/osmo/libnotify07.diff b/source/xapps-extra/osmo/libnotify07.diff
new file mode 100644
index 0000000..a7250f1
--- /dev/null
+++ b/source/xapps-extra/osmo/libnotify07.diff
@@ -0,0 +1,46 @@
+--- osmo-0.2.10.orig/src/check_events.c	2010-03-31 23:47:34.000000000 +0200
++++ osmo-0.2.10/src/check_events.c	2010-11-06 14:03:30.775795323 +0100
+@@ -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) {