[arch-commits] Commit in xfce4-sensors-plugin/trunk (2 files)

[andyrtr at archlinux.org]

    Date: Monday, March 7, 2011 @ 13:49:40
  Author: andyrtr
Revision: 112922

upgpkg: xfce4-sensors-plugin 1.0.0-4
libnotify rebuild

Added:
  xfce4-sensors-plugin/trunk/xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch
Modified:
  xfce4-sensors-plugin/trunk/PKGBUILD

------------------------------------------------+
 PKGBUILD                                       |   15 +++++++++----
 xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch |   25 +++++++++++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-07 18:40:53 UTC (rev 112921)
+++ PKGBUILD	2011-03-07 18:49:40 UTC (rev 112922)
@@ -4,26 +4,31 @@
 
 pkgname=xfce4-sensors-plugin
 pkgver=1.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A lm_sensors plugin for the Xfce panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4' 'lm_sensors' 'libnotify' 'hicolor-icon-theme')
+depends=('xfce4-panel' 'libxfcegui4' 'lm_sensors' 'libnotify>=0.7.1' 'hicolor-icon-theme')
 makedepends=('pkgconfig' 'intltool' 'hddtemp>=0.3.beta15.45-2' 'gnu-netcat' 'xfce4-dev-tools')
 optdepends=('gnu-netcat: for hddtemp access')
 options=(!libtool)
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2
-	xfce4-sensors-plugin-1.0.0-underlink.patch)
+	xfce4-sensors-plugin-1.0.0-underlink.patch
+	xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch)
 md5sums=('74d83628246536d575f954c76724982b'
-         'f0295e3a7c6beb267355f64fc0ed44d5')
+         'f0295e3a7c6beb267355f64fc0ed44d5'
+         'b5e9013de01cd8f2b4a72c8f052d2c37')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-    # panel 4.8 patch from http://bugzilla.xfce.org/show_bug.cgi?id=7095
+  # panel 4.8 patch from http://bugzilla.xfce.org/show_bug.cgi?id=7095
   patch -Np1 -i ${srcdir}/xfce4-sensors-plugin-1.0.0-underlink.patch
+
+  patch -Np1 -i ${srcdir}/xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch
+
   xdt-autogen
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \

Added: xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch
===================================================================
--- xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch	                        (rev 0)
+++ xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch	2011-03-07 18:49:40 UTC (rev 112922)
@@ -0,0 +1,25 @@
+diff -dur xfce4-sensors-plugin-1.0.0.orig/lib/hddtemp.c xfce4-sensors-plugin-1.0.0/lib/hddtemp.c
+--- xfce4-sensors-plugin-1.0.0.orig/lib/hddtemp.c	2010-03-27 16:11:48.000000000 +0100
++++ xfce4-sensors-plugin-1.0.0/lib/hddtemp.c	2010-11-06 20:50:11.717022222 +0100
+@@ -102,7 +102,7 @@
+     if (!notify_is_initted())
+         notify_init(PACKAGE); /* NOTIFY_APPNAME */
+ 
+-    nn = notify_notification_new (summary, body, icon, NULL);
++    nn = notify_notification_new (summary, body, icon);
+     /* FIXME: Use channels or propagate private object or use static global variable */
+     //notify_notification_add_action (nn,
+                             //"confirmed",
+diff -dur xfce4-sensors-plugin-1.0.0.orig/lib/sensors-interface.c xfce4-sensors-plugin-1.0.0/lib/sensors-interface.c
+--- xfce4-sensors-plugin-1.0.0.orig/lib/sensors-interface.c	2010-03-27 16:11:48.000000000 +0100
++++ xfce4-sensors-plugin-1.0.0/lib/sensors-interface.c	2010-11-06 20:50:24.360007993 +0100
+@@ -105,7 +105,7 @@
+                 if (!notify_is_initted())
+                     notify_init(PACKAGE); /* NOTIFY_APPNAME */
+ 
+-                nn = notify_notification_new(summary, body, icon, NULL);
++                nn = notify_notification_new(summary, body, icon);
+                 notify_notification_show(nn, &error);
+                 #else
+                 DBG("%s\n%s", summary, body);
+