Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=330b4dcd6d28a910547b716403ce08511c13a3e8
commit 330b4dcd6d28a910547b716403ce08511c13a3e8
Author: bouleetbil <bouleet...@frogdev.info>
Date: Sat Jan 22 11:49:39 2011 +0100
nm-applet-0.8.2-2-i686
*rebuild with libnotify 0.7
diff --git a/source/gnome-extra/nm-applet/FrugalBuild
b/source/gnome-extra/nm-applet/FrugalBuild
index 50e9c4f..f92c949 100644
--- a/source/gnome-extra/nm-applet/FrugalBuild
+++ b/source/gnome-extra/nm-applet/FrugalBuild
@@ -4,10 +4,11 @@
pkgname=nm-applet
_F_gnome_name=network-manager-applet
pkgver=0.8.2
-pkgrel=1
+pkgrel=2
pkgdesc="Network Management applet"
depends=('gconf' 'gtk+2>=2.22.0' 'libglade' 'gnome-keyring>=2.32.0'
'libgnomeui' 'gnome-panel' \
- 'networkmanager>=0.8.2' 'polkit-gnome' 'gnome-bluetooth'
'mobile-broadband-provider-info')
+ 'networkmanager>=0.8.2' 'polkit-gnome' 'gnome-bluetooth'
'mobile-broadband-provider-info' \
+ 'libnotify>0.7')
makedepends=('perl-xml-parser' 'intltool')
groups=('gnome-extra')
archs=('i686' 'x86_64' 'ppc')
@@ -15,9 +16,10 @@ archs=('i686' 'x86_64' 'ppc')
_F_gnome_desktop="y"
_F_gnome_iconcache="y"
Finclude gnome gnome-scriptlet
-source=($source dbus-access.diff)
+source=($source dbus-access.diff libnotify07.diff)
sha1sums=('1be46b1df52786cd22e1d3d888f828c27d46dd3a' \
- '85e225293d475c1c030496b29e116321824c45f0')
+ '85e225293d475c1c030496b29e116321824c45f0' \
+ 'ca4b84feb82ac0b03cbb2c068ca91adeefe560e9')
_F_cd_path=$_F_gnome_name-$pkgver
build()
diff --git a/source/gnome-extra/nm-applet/libnotify07.diff
b/source/gnome-extra/nm-applet/libnotify07.diff
new file mode 100644
index 0000000..4b064b0
--- /dev/null
+++ b/source/gnome-extra/nm-applet/libnotify07.diff
@@ -0,0 +1,50 @@
+From 68459b6b864ad45a842bfd1bdc80f126829ef596 Mon Sep 17 00:00:00 2001
+From: Dan Williams <d...@redhat.com>
+Date: Fri, 05 Nov 2010 18:26:49 +0000
+Subject: core: fixes for libnotify >= 0.7 (bgo #632327)
+
+---
+diff --git a/configure.ac b/configure.ac
+index acb39a2..f8d6819 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,6 +117,12 @@ esac
+
+ AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
+
++# Check for libnotify >= 0.7
++PKG_CHECK_MODULES(LIBNOTIFY_07, [libnotify >= 0.7],
[have_libnotify_07=yes],[have_libnotify_07=no])
++if test x"$have_libnotify_07" = "xyes"; then
++ AC_DEFINE(HAVE_LIBNOTIFY_07, 1, [Define if you have libnotify 0.7 or
later])
++fi
++
+ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+
+ dnl GConf stuff
+diff --git a/src/applet.c b/src/applet.c
+index e451f75..2d7835e 100644
+--- a/src/applet.c
++++ b/src/applet.c
+@@ -622,12 +622,18 @@ applet_do_notify (NMApplet *applet,
+ escaped = utils_escape_notify_message (message);
+ notify = notify_notification_new (summary,
+ escaped,
+- icon ? icon : GTK_STOCK_NETWORK,
+- NULL);
++ icon ? icon : GTK_STOCK_NETWORK
++#if HAVE_LIBNOTIFY_07
++ );
++#else
++ , NULL);
++#endif
+ g_free (escaped);
+ applet->notification = notify;
+
++#if !HAVE_LIBNOTIFY_07
+ notify_notification_attach_to_status_icon (notify, applet->status_icon);
++#endif
+ notify_notification_set_urgency (notify, urgency);
+ notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
+
+--
+cgit v0.8.3.1
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
