summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-08-30 14:49:21 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-08-30 14:49:21 +0000
commit855bb6e1448fbb5891edae237d595a33e745101d (patch)
tree018fcc0b88edfeb350600d477f8a04030b361566 /xfce-extra
parentLink to libxfcegui4 wrt #334891 by Diego E. Pettenò. (diff)
downloadgentoo-2-855bb6e1448fbb5891edae237d595a33e745101d.tar.gz
gentoo-2-855bb6e1448fbb5891edae237d595a33e745101d.tar.bz2
gentoo-2-855bb6e1448fbb5891edae237d595a33e745101d.zip
clean up patches, add some bug references etc.
(Portage version: 2.2_rc69/cvs/Linux x86_64)
Diffstat (limited to 'xfce-extra')
-rw-r--r--xfce-extra/xfce4-cpugraph-plugin/Manifest4
-rw-r--r--xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch5
-rw-r--r--xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch16
3 files changed, 14 insertions, 11 deletions
diff --git a/xfce-extra/xfce4-cpugraph-plugin/Manifest b/xfce-extra/xfce4-cpugraph-plugin/Manifest
index efbd55caaf6c..66491b4ee4a5 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/Manifest
+++ b/xfce-extra/xfce4-cpugraph-plugin/Manifest
@@ -1,5 +1,5 @@
-AUX xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch 414 RMD160 9513912020d53108755e3211bc2ab701d1f8d5fe SHA1 97bf81fd7a18b50cc87d645ad9b570b040b1b77f SHA256 84c2e4607f9f7077befbf1bb9d78e7d05ad624bf140aed94c41bddc6b7b44a3a
-AUX xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch 1180 RMD160 d29be255be7d0cc1a1cf6e1a3e9cce34b4ca4d35 SHA1 b1eb78593ece63ab6e6bd3e977596a09f6ce3839 SHA256 6dc0475fbdd0761f03a326aefa51dad95e3372ab7a628b285952c29ec23161e2
+AUX xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch 173 RMD160 e4d13ab3e4f726bfe6c5292e432934bb2e66a073 SHA1 21197c70086822ff1ac3da9948f957fcd68c188b SHA256 6988c5c63ec95b61ad342588900ae40f87c764e00406a2aa42ca21c9bbb9667c
+AUX xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch 915 RMD160 bd6f7154270ec4ab5a3fecb7b8913b7e39515d69 SHA1 66f378b387a068f48bb7aa2d3822d682d079e544 SHA256 e775bdaf95246920ad2471bc845a7d8373531b187ea09e70f972c4f311865dbb
DIST xfce4-cpugraph-plugin-0.4.0.tar.gz 150149 RMD160 a8576727fbd2751bca26b838dfb09371d5e74730 SHA1 a4edf76119b053a5d7aa3c04a272d0dda31e2f71 SHA256 095888f7a3cd2067f7a9b8540a78c7a348275d2c1b127440c418f759f7e6d9c0
EBUILD xfce4-cpugraph-plugin-0.4.0.ebuild 957 RMD160 dc0f9fc1eba766cebd030b794410f8a581c349e3 SHA1 1c014fbdbeab6525cf9dd35051e1378170db3183 SHA256 01f141f134f07958c98e105de6be7ba1f7d7f4357ddad74e9019765b8b1574df
MISC ChangeLog 842 RMD160 d7199b518a7ad553e07b9f97c03dcf4fb25d2704 SHA1 daac01c4fcb952e5d7baa30e78448e7c70405188 SHA256 ede2075d2af357ae4ed94d8e6e534b108433a5450eccaffc22ae7325b5ea6402
diff --git a/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch b/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch
index e33309b091d3..ed7bbb002c10 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch
+++ b/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch
@@ -1,6 +1,5 @@
-diff -ur xfce4-cpugraph-plugin-0.4.0.orig/panel-plugin/cpu.c xfce4-cpugraph-plugin-0.4.0/panel-plugin/cpu.c
---- xfce4-cpugraph-plugin-0.4.0.orig/panel-plugin/cpu.c 2007-11-22 07:18:32.000000000 +0200
-+++ xfce4-cpugraph-plugin-0.4.0/panel-plugin/cpu.c 2009-08-25 15:12:14.000000000 +0300
+--- panel-plugin/cpu.c
++++ panel-plugin/cpu.c
@@ -27,6 +27,7 @@
#include "settings.h"
#include "cpu_os.h"
diff --git a/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch b/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch
index b8bd1f9257ab..ab9cb6cad47f 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch
+++ b/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch
@@ -1,6 +1,11 @@
-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
+Fix building/linking problem as reported in: http://bugs.gentoo.org/334891
+
+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
+
+--- configure.ac
++++ configure.ac
@@ -31,6 +31,7 @@
dnl configure the panel plugin
@@ -9,9 +14,8 @@ diff -ur xfce4-cpugraph-plugin-0.4.0.orig/configure.ac xfce4-cpugraph-plugin-0.4
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
+--- panel-plugin/Makefile.am
++++ panel-plugin/Makefile.am
@@ -3,10 +3,12 @@
xfce4_cpugraph_plugin_CFLAGS = \