[arch-commits] Commit in network-manager-applet/repos (6 files)
Ionut Biru
ibiru at archlinux.org
Mon Mar 7 11:16:19 UTC 2011
Date: Monday, March 7, 2011 @ 06:16:19
Author: ibiru
Revision: 112864
libnotify 0.7 rebuild
Added:
network-manager-applet/repos/staging-i686/
network-manager-applet/repos/staging-i686/nm-applet-0.8.2-libnotify-0.7.patch
network-manager-applet/repos/staging-x86_64/
network-manager-applet/repos/staging-x86_64/nm-applet-0.8.2-libnotify-0.7.patch
Modified:
network-manager-applet/repos/staging-i686/PKGBUILD
network-manager-applet/repos/staging-x86_64/PKGBUILD
----------------------------------------------------+
PKGBUILD | 18 ++++++---
staging-i686/nm-applet-0.8.2-libnotify-0.7.patch | 36 +++++++++++++++++++
staging-x86_64/nm-applet-0.8.2-libnotify-0.7.patch | 36 +++++++++++++++++++
3 files changed, 84 insertions(+), 6 deletions(-)
Modified: staging-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-03-07 10:29:50 UTC (rev 112863)
+++ staging-i686/PKGBUILD 2011-03-07 11:16:19 UTC (rev 112864)
@@ -7,7 +7,7 @@
pkgname=network-manager-applet
pkgver=0.8.2
-pkgrel=3
+pkgrel=4
pkgdesc="GNOME frontends to NetWorkmanager"
arch=('i686' 'x86_64')
license=('GPL')
@@ -17,11 +17,14 @@
optdepends=('gnome-bluetooth: for PAN/DUN support')
options=('!libtool')
install=network-manager-applet.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.8/network-manager-applet-${pkgver}.tar.bz2)
-sha256sums=('c6f8723031092bd1c7db452df5578ec9ca8e9f98c2ea493dba7d40dbe0e02391')
+source=(http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.8/network-manager-applet-${pkgver}.tar.bz2
+ nm-applet-0.8.2-libnotify-0.7.patch)
+sha256sums=('c6f8723031092bd1c7db452df5578ec9ca8e9f98c2ea493dba7d40dbe0e02391'
+ '542e0c3a5f851f72e5672f982c7e86c45b79868f3d16500b930d58cf8f039b5d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np0 -i "${srcdir}/nm-applet-0.8.2-libnotify-0.7.patch"
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var \
--libexecdir=/usr/lib/networkmanager \
Added: staging-i686/nm-applet-0.8.2-libnotify-0.7.patch
===================================================================
--- staging-i686/nm-applet-0.8.2-libnotify-0.7.patch (rev 0)
+++ staging-i686/nm-applet-0.8.2-libnotify-0.7.patch 2011-03-07 11:16:19 UTC (rev 112864)
@@ -0,0 +1,36 @@
+--- src/applet.c
++++ src/applet.c
+@@ -58,6 +58,10 @@
+ #include <gnome-keyring.h>
+ #include <libnotify/notify.h>
+
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #include "applet.h"
+ #include "applet-device-wired.h"
+ #include "applet-device-wifi.h"
+@@ -626,12 +630,20 @@
+ escaped = utils_escape_notify_message (message);
+ notify = notify_notification_new (summary,
+ escaped,
+- icon ? icon : GTK_STOCK_NETWORK,
+- NULL);
++ icon ? icon : GTK_STOCK_NETWORK
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++ );
++#else
++ , NULL);
++#endif
+ g_free (escaped);
+ applet->notification = notify;
+
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++ /* notify_notification_attach_to_status_icon was removed */
++#else
+ 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);
+
Modified: staging-x86_64/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-03-07 10:29:50 UTC (rev 112863)
+++ staging-x86_64/PKGBUILD 2011-03-07 11:16:19 UTC (rev 112864)
@@ -7,7 +7,7 @@
pkgname=network-manager-applet
pkgver=0.8.2
-pkgrel=3
+pkgrel=4
pkgdesc="GNOME frontends to NetWorkmanager"
arch=('i686' 'x86_64')
license=('GPL')
@@ -17,11 +17,14 @@
optdepends=('gnome-bluetooth: for PAN/DUN support')
options=('!libtool')
install=network-manager-applet.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.8/network-manager-applet-${pkgver}.tar.bz2)
-sha256sums=('c6f8723031092bd1c7db452df5578ec9ca8e9f98c2ea493dba7d40dbe0e02391')
+source=(http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.8/network-manager-applet-${pkgver}.tar.bz2
+ nm-applet-0.8.2-libnotify-0.7.patch)
+sha256sums=('c6f8723031092bd1c7db452df5578ec9ca8e9f98c2ea493dba7d40dbe0e02391'
+ '542e0c3a5f851f72e5672f982c7e86c45b79868f3d16500b930d58cf8f039b5d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np0 -i "${srcdir}/nm-applet-0.8.2-libnotify-0.7.patch"
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var \
--libexecdir=/usr/lib/networkmanager \
Added: staging-x86_64/nm-applet-0.8.2-libnotify-0.7.patch
===================================================================
--- staging-x86_64/nm-applet-0.8.2-libnotify-0.7.patch (rev 0)
+++ staging-x86_64/nm-applet-0.8.2-libnotify-0.7.patch 2011-03-07 11:16:19 UTC (rev 112864)
@@ -0,0 +1,36 @@
+--- src/applet.c
++++ src/applet.c
+@@ -58,6 +58,10 @@
+ #include <gnome-keyring.h>
+ #include <libnotify/notify.h>
+
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #include "applet.h"
+ #include "applet-device-wired.h"
+ #include "applet-device-wifi.h"
+@@ -626,12 +630,20 @@
+ escaped = utils_escape_notify_message (message);
+ notify = notify_notification_new (summary,
+ escaped,
+- icon ? icon : GTK_STOCK_NETWORK,
+- NULL);
++ icon ? icon : GTK_STOCK_NETWORK
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++ );
++#else
++ , NULL);
++#endif
+ g_free (escaped);
+ applet->notification = notify;
+
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++ /* notify_notification_attach_to_status_icon was removed */
++#else
+ 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);
+
More information about the arch-commits
mailing list