[arch-commits] Commit in xfce4-wavelan-plugin/trunk (PKGBUILD tooltip.diff)

[andyrtr at archlinux.org]

    Date: Monday, January 10, 2011 @ 13:02:21
  Author: andyrtr
Revision: 105584

upgpkg: xfce4-wavelan-plugin 0.5.6-1
upstream release 0.5.6

Modified:
  xfce4-wavelan-plugin/trunk/PKGBUILD
Deleted:
  xfce4-wavelan-plugin/trunk/tooltip.diff

--------------+
 PKGBUILD     |   35 ++++++++++++++++++++---------------
 tooltip.diff |   19 -------------------
 2 files changed, 20 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-10 14:37:20 UTC (rev 105583)
+++ PKGBUILD	2011-01-10 18:02:21 UTC (rev 105584)
@@ -1,29 +1,34 @@
 # $Id$
-# Maintainer: aurelien <aurelien at archlinux.org>
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-wavelan-plugin
-pkgver=0.5.5
+pkgver=0.5.6
 pkgrel=1
 pkgdesc="plugin to monitor wifi connectivity for the Xfce4 panel"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('custom')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin/"
 groups=('xfce4-goodies')
-depends=('xfce4-panel')
-makedepends=('pkgconfig')
+depends=('xfce4-panel' 'libxfcegui4')
+makedepends=('intltool')
 options=('!libtool')
-source=(http://goodies.xfce.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2 tooltip.diff)
-md5sums=('1fa00ad9f24cc29536cb7622016c6a5e'
-         '923b1f2bf2d26cf01f784b6194f64d93')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('b23a4c9c2a206242ee4db8186dd01801')
 
 build() {
+  cd ${srcdir}/${pkgname}-${pkgver}  
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-debug	
+  make
+}
+
+package() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  # fix tooltip, see http://bugzilla.xfce.org/show_bug.cgi?id=5866
-  patch -Np1 -i ${srcdir}/tooltip.diff || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --disable-static
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  install -Dm644 COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING
+  make DESTDIR=${pkgdir} install
+  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
 }

Deleted: tooltip.diff
===================================================================
--- tooltip.diff	2011-01-10 14:37:20 UTC (rev 105583)
+++ tooltip.diff	2011-01-10 18:02:21 UTC (rev 105584)
@@ -1,19 +0,0 @@
-diff -Naur xfce4-wavelan-plugin-0.5.5.old/panel-plugin/wavelan.c xfce4-wavelan-plugin-0.5.5/panel-plugin/wavelan.c
---- xfce4-wavelan-plugin-0.5.5.old/panel-plugin/wavelan.c	2009-10-09 14:42:54.427988584 +0200
-+++ xfce4-wavelan-plugin-0.5.5/panel-plugin/wavelan.c	2009-10-09 14:45:24.351280223 +0200
-@@ -199,6 +199,14 @@
-     if ((wavelan->device = wi_open(wavelan->interface)) != NULL) {
-       /* register the update timer */
-       TRACE ("Opened device");
-+	  /* reduce the default tooltip timeout to be smaller than the update interval otherwise
-+	   * we won't see tooltips on GTK 2.16 or newer */
-+	  GtkSettings *settings;
-+	  settings = gtk_settings_get_default();
-+	  if (g_object_class_find_property(G_OBJECT_GET_CLASS(settings), "gtk-tooltip-timeout"))
-+		  g_object_set(settings, "gtk-tooltip-timeout",
-+					   250 - 10, NULL);
-+
-       wavelan->timer_id = g_timeout_add(250, wavelan_timer, wavelan);
-     }
-   }
-