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

[andyrtr at archlinux.org]

    Date: Saturday, January 29, 2011 @ 04:39:44
  Author: andyrtr
Revision: 108049

upgpkg: xfce4-genmon-plugin 3.2-2
fix for panel 4.8; FS#22516

Added:
  xfce4-genmon-plugin/trunk/xfce4-genmon-plugin-3.2-link_to_libxfcegui4.patch
Modified:
  xfce4-genmon-plugin/trunk/PKGBUILD

---------------------------------------------------+
 PKGBUILD                                          |   15 ++++++----
 xfce4-genmon-plugin-3.2-link_to_libxfcegui4.patch |   29 ++++++++++++++++++++
 2 files changed, 39 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-29 09:01:53 UTC (rev 108048)
+++ PKGBUILD	2011-01-29 09:39:44 UTC (rev 108049)
@@ -7,17 +7,22 @@
 pkgrel=2
 pkgdesc="plugin that monitors customizable programs stdout for the Xfce4 panel"
 arch=(i686 x86_64)
-license=('LGPL2')
-url="http://xfce-goodies.berlios.de/"
+license=('LGPL2.1')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libxfcegui4')
-makedepends=('intltool')
+makedepends=('intltool' 'xfce4-dev-tools')
 options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/3.2/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('5f292aa102a87d45207b6a373939a35d')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/3.2/${pkgname}-${pkgver}.tar.bz2
+	xfce4-genmon-plugin-3.2-link_to_libxfcegui4.patch)
+md5sums=('5f292aa102a87d45207b6a373939a35d'
+         '7938f59509aca83ea8d3adc62d8f5892')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  # panel 4.8 patch from http://bugzilla.xfce.org/show_bug.cgi?id=6754
+  patch -Np1 -i ${srcdir}/xfce4-genmon-plugin-3.2-link_to_libxfcegui4.patch
+  xdt-autogen
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \

Added: xfce4-genmon-plugin-3.2-link_to_libxfcegui4.patch
===================================================================
--- xfce4-genmon-plugin-3.2-link_to_libxfcegui4.patch	                        (rev 0)
+++ xfce4-genmon-plugin-3.2-link_to_libxfcegui4.patch	2011-01-29 09:39:44 UTC (rev 108049)
@@ -0,0 +1,29 @@
+diff -ur xfce4-genmon-plugin-3.2.orig/configure.ac xfce4-genmon-plugin-3.2/configure.ac
+--- xfce4-genmon-plugin-3.2.orig/configure.ac	2008-03-15 23:38:12.000000000 +0200
++++ xfce4-genmon-plugin-3.2/configure.ac	2010-08-08 15:49:35.000000000 +0300
+@@ -32,6 +32,7 @@
+ 
+ dnl configure the panel plugin
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.22])
++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.22])
+ 
+ dnl Translations
+ XDT_I18N([ca cs en_GB eu fr pl pt_PT sq])
+diff -ur xfce4-genmon-plugin-3.2.orig/panel-plugin/Makefile.am xfce4-genmon-plugin-3.2/panel-plugin/Makefile.am
+--- xfce4-genmon-plugin-3.2.orig/panel-plugin/Makefile.am	2007-11-23 17:32:40.000000000 +0200
++++ xfce4-genmon-plugin-3.2/panel-plugin/Makefile.am	2010-08-08 15:50:27.000000000 +0300
+@@ -3,10 +3,12 @@
+ 
+ xfce4_genmon_plugin_CFLAGS =					\
+ 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"			\
+-	@LIBXFCE4PANEL_CFLAGS@
++	@LIBXFCE4PANEL_CFLAGS@					\
++	@LIBXFCEGUI4_CFLAGS@
+ 
+ xfce4_genmon_plugin_LDADD =					\
+-	@LIBXFCE4PANEL_LIBS@
++	@LIBXFCE4PANEL_LIBS@					\
++	@LIBXFCEGUI4_LIBS@
+ 
+ xfce4_genmon_plugin_SOURCES =	\
+ 	main.c			\