[Pkg-xfce-commits] r4499 - in goodies/branches/experimental: . xfce4-verve-plugin/debian xfce4-verve-plugin/debian/patches

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-06 10:17:48 +0000 (Sat, 06 Nov 2010)
New Revision: 4499

Added:
   goodies/branches/experimental/xfce4-systemload-plugin/
   goodies/branches/experimental/xfce4-verve-plugin/debian/patches/
   goodies/branches/experimental/xfce4-verve-plugin/debian/patches/01_add-47-panel-support.patch
Modified:
   goodies/branches/experimental/xfce4-verve-plugin/debian/changelog
Log:
branch systemload plugin for 4.7


Modified: goodies/branches/experimental/xfce4-verve-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-verve-plugin/debian/changelog	2010-11-06 10:11:23 UTC (rev 4498)
+++ goodies/branches/experimental/xfce4-verve-plugin/debian/changelog	2010-11-06 10:17:48 UTC (rev 4499)
@@ -8,8 +8,10 @@
   * debian/control:
     - switch to xfce section.
     - add build-dep on libxfcegui4-dev. 
+  * debian/patches:
+    - 01_add-47-panel-support added, add support for Xfce 4.7.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 06 Nov 2010 11:05:22 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 06 Nov 2010 11:16:01 +0100
 
 xfce4-verve-plugin (0.3.6-1) unstable; urgency=low
 

Added: goodies/branches/experimental/xfce4-verve-plugin/debian/patches/01_add-47-panel-support.patch
===================================================================
--- goodies/branches/experimental/xfce4-verve-plugin/debian/patches/01_add-47-panel-support.patch	                        (rev 0)
+++ goodies/branches/experimental/xfce4-verve-plugin/debian/patches/01_add-47-panel-support.patch	2010-11-06 10:17:48 UTC (rev 4499)
@@ -0,0 +1,57 @@
+commit 58fd735f17d03193d3f17d8e02f46bf8e908a3bc
+Author: Florian Rivoal <frivoal at xfce.org>
+Date:   Fri Oct 29 09:33:05 2010 +0900
+
+    Fix compatibility with Xfce 4.7+
+    
+    Add exo-0.5 detection and explicitly require libxfcegui4. Fixes bug
+    6616.
+
+diff --git a/configure.in.in b/configure.in.in
+index 95234fc..0b1efab 100644
+--- a/configure.in.in
++++ b/configure.in.in
+@@ -52,9 +52,11 @@ XDT_I18N([@LINGUAS@])
+ dnl ***********************************
+ dnl *** Check for required packages ***
+ dnl ***********************************
+-XDT_CHECK_PACKAGE([LIBEXO], [exo-0.3], [0.3.1.3])
++XDT_CHECK_PACKAGE([LIBEXO], [exo-0.3], [0.3.1.3], [],
++  [XDT_CHECK_PACKAGE([LIBEXO], [exo-1], [0.5.0])])
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
+ XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.4])
+ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.4])
+ XDT_CHECK_PACKAGE([LIBPCRE], [libpcre], [5.0])
+diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
+index 08694d5..ba6464e 100644
+--- a/panel-plugin/Makefile.am
++++ b/panel-plugin/Makefile.am
+@@ -21,14 +21,16 @@ xfce4_verve_plugin_CFLAGS = 						\
+ 	@LIBEXO_CFLAGS@							\
+ 	@LIBXFCE4PANEL_CFLAGS@						\
+ 	@LIBXFCE4UTIL_CFLAGS@						\
++	@LIBXFCEGUI4_CFLAGS@						\
+ 	@LIBPCRE_CFLAGS@						\
+ 	@GLIB_CFLAGS@							\
+ 	@GTHREAD_CFLAGS@						
+ 
+-xfce4_verve_plugin_LDFLAGS = 						\
++xfce4_verve_plugin_LDADD = 						\
+ 	@LIBEXO_LIBS@							\
+ 	@LIBXFCE4PANEL_LIBS@						\
+ 	@LIBXFCE4UTIL_LIBS@						\
++	@LIBXFCEGUI4_LIBS@						\
+ 	@LIBPCRE_LIBS@							\
+ 	@GLIB_LIBS@							\
+ 	@GTHREAD_LIBS@
+@@ -43,7 +45,7 @@ xfce4_verve_plugin_CFLAGS +=						\
+ 	-DDBUS_API_SUBJECT_TO_CHANGE					\
+ 	$(DBUS_CFLAGS)
+ 
+-xfce4_verve_plugin_LDFLAGS += 						\
++xfce4_verve_plugin_LDADD += 						\
+ 	$(DBUS_LIBS)
+ 
+ verve-dbus-service-infos.h: Makefile $(srcdir)/verve-dbus-service-infos.xml