[gentoo-commits] gentoo-x86 commit in xfce-extra/xfce4-cpugraph-plugin/files: xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch

[gentoo-commits] gentoo-x86 commit in xfce-extra/xfce4-cpugraph-plugin/files: xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch

[Samuli Suominen (ssuominen)]

ssuominen    10/08/30 14:44:21

  Added:               
                        xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch
  Log:
  Link to libxfcegui4 wrt #334891 by Diego E. Pettenò.
  
  (Portage version: 2.2_rc69/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch?rev=1.1&content-type=text/plain

Index: xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch
===================================================================
diff -ur xfce4-cpugraph-plugin-0.4.0.orig/configure.ac xfce4-cpugraph-plugin-0.4.0/configure.ac
--- xfce4-cpugraph-plugin-0.4.0.orig/configure.ac	2007-11-22 07:42:28.000000000 +0200
+++ xfce4-cpugraph-plugin-0.4.0/configure.ac	2010-08-30 17:40:40.000000000 +0300
@@ -31,6 +31,7 @@
 
 dnl configure the panel plugin
 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.20])
 
 dnl translations
 XDT_I18N([be ca cs en_GB eu fr hu nb_NO pl pt_PT sq uk])
diff -ur xfce4-cpugraph-plugin-0.4.0.orig/panel-plugin/Makefile.am xfce4-cpugraph-plugin-0.4.0/panel-plugin/Makefile.am
--- xfce4-cpugraph-plugin-0.4.0.orig/panel-plugin/Makefile.am	2007-11-22 09:13:34.000000000 +0200
+++ xfce4-cpugraph-plugin-0.4.0/panel-plugin/Makefile.am	2010-08-30 17:41:07.000000000 +0300
@@ -3,10 +3,12 @@
 
 xfce4_cpugraph_plugin_CFLAGS =					\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"			\
-	@LIBXFCE4PANEL_CFLAGS@
+	@LIBXFCE4PANEL_CFLAGS@					\
+	@LIBXFCEGUI4_CFLAGS@
 
 xfce4_cpugraph_plugin_LDADD =					\
-	@LIBXFCE4PANEL_LIBS@
+	@LIBXFCE4PANEL_LIBS@					\
+	@LIBXFCEGUI4_LIBS@
 
 xfce4_cpugraph_plugin_SOURCES =					\
 	mode.c		\

[gentoo-commits] gentoo-x86 commit in xfce-extra/xfce4-cpugraph-plugin/files: xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch

[Samuli Suominen (ssuominen)]

ssuominen    10/09/30 16:26:24

  Modified:            
                        xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch
  Log:
  update link in patch
  
  (Portage version: 2.2_rc88/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch?r1=1.2&r2=1.3

Index: xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch	30 Aug 2010 14:49:21 -0000	1.2
+++ xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch	30 Sep 2010 16:26:24 -0000	1.3
@@ -1,8 +1,6 @@
-Fix building/linking problem as reported in: http://bugs.gentoo.org/334891
+Fixed in upstream:
 
-Not reported to upstream because the patch in upstream bug[1] should be applied instead.
-
-[1] http://bugzilla.xfce.org/show_bug.cgi?id=6575
+http://git.xfce.org/panel-plugins/xfce4-cpugraph-plugin/patch/?id=505a9fa19a7b9c3ff48a161cd1c392e07a2db94b
 
 --- configure.ac
 +++ configure.ac