Apply a sizeof patch from bug 187712 by Ondrej Barda, fixing a possible 64bit issue with cpu graph drawing in normal mode.

Package-Manager: portage-2.1.3.3

5 files changed, 60 insertions, 5 deletions

diff --git a/xfce-extra/xfce4-cpugraph/ChangeLog b/xfce-extra/xfce4-cpugraph/ChangeLog
index 455f9dc4eb33..8215c392c21b 100644
--- a/xfce-extra/xfce4-cpugraph/ChangeLog
+++ b/xfce-extra/xfce4-cpugraph/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-extra/xfce4-cpugraph
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpugraph/ChangeLog,v 1.21 2007/03/15 13:45:58 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpugraph/ChangeLog,v 1.22 2007/08/04 13:41:13 drac Exp $
+
+*xfce4-cpugraph-0.3.0-r1 (04 Aug 2007)
+
+  04 Aug 2007; Samuli Suominen <drac@gentoo.org>
+  +files/xfce4-cpugraph-0.3.0-sizeof.patch, +xfce4-cpugraph-0.3.0-r1.ebuild:
+  Apply a sizeof patch from bug 187712 by Ondrej Barda, fixing a possible
+  64bit issue with cpu graph drawing in normal mode.
 
   15 Mar 2007; Markus Rothe <corsair@gentoo.org>
   xfce4-cpugraph-0.3.0.ebuild:
diff --git a/xfce-extra/xfce4-cpugraph/Manifest b/xfce-extra/xfce4-cpugraph/Manifest
index f11ebc09e2ed..d76346f7f30d 100644
--- a/xfce-extra/xfce4-cpugraph/Manifest
+++ b/xfce-extra/xfce4-cpugraph/Manifest
@@ -2,15 +2,23 @@ AUX xfce4-cpugraph-0.3.0-asneeded.patch 538 RMD160 eb0d2984789c3c3b13837ba1b6ebf
 MD5 69c8924af5d872ff2310673f87f0066b files/xfce4-cpugraph-0.3.0-asneeded.patch 538
 RMD160 eb0d2984789c3c3b13837ba1b6ebfb76f8d8d2c9 files/xfce4-cpugraph-0.3.0-asneeded.patch 538
 SHA256 442a91e48ec5921fe05e55e6745c63b91f71e3fa357c8baf86901f2a18a5f9e0 files/xfce4-cpugraph-0.3.0-asneeded.patch 538
+AUX xfce4-cpugraph-0.3.0-sizeof.patch 607 RMD160 713a9576df542a66ec53fe36358c9802072fb7fe SHA1 f7df96d365a09c8052d789e2cc497d2735304ac8 SHA256 adea15409246004698823458f5e14cc3fba3115ec8e5eccb34caa934fc5e6e85
+MD5 1a9b0dcf1aa1c8e68bbe0ef1e65637ea files/xfce4-cpugraph-0.3.0-sizeof.patch 607
+RMD160 713a9576df542a66ec53fe36358c9802072fb7fe files/xfce4-cpugraph-0.3.0-sizeof.patch 607
+SHA256 adea15409246004698823458f5e14cc3fba3115ec8e5eccb34caa934fc5e6e85 files/xfce4-cpugraph-0.3.0-sizeof.patch 607
 DIST xfce4-cpugraph-plugin-0.3.0.tar.bz2 102638 RMD160 99c309b3bf0ab622a9b95df9b568808a6c034055 SHA1 d869625350d6c0ae4bef3203f03bbc409773494f SHA256 eb6c2eee5f3d56a3202a9affb33242c3434bfbaeb0d7fe02cf267e64e85f3825
+EBUILD xfce4-cpugraph-0.3.0-r1.ebuild 669 RMD160 2153756992850f586cf870d0a735271d26367368 SHA1 17958bffdc7aa196c4a399776c533e1c2195efc7 SHA256 596676742b1e3cc3f5cbe05106ccc5f949933e3f32b8854026b2626bbdc72c92
+MD5 0cce5d24fce4925d42b0660dca6b1ec5 xfce4-cpugraph-0.3.0-r1.ebuild 669
+RMD160 2153756992850f586cf870d0a735271d26367368 xfce4-cpugraph-0.3.0-r1.ebuild 669
+SHA256 596676742b1e3cc3f5cbe05106ccc5f949933e3f32b8854026b2626bbdc72c92 xfce4-cpugraph-0.3.0-r1.ebuild 669
 EBUILD xfce4-cpugraph-0.3.0.ebuild 663 RMD160 223c463a1b542e133b5994b1c58dbba859d4c2f6 SHA1 1bb2416e870b9fd297e444a49c5fe81529588877 SHA256 854693447f6cf930f83e7a4553642a52c20eb80b01a2e89bbf2e0cacf914ee96
 MD5 0d51c83853e348b880bfec83fe8b9f7e xfce4-cpugraph-0.3.0.ebuild 663
 RMD160 223c463a1b542e133b5994b1c58dbba859d4c2f6 xfce4-cpugraph-0.3.0.ebuild 663
 SHA256 854693447f6cf930f83e7a4553642a52c20eb80b01a2e89bbf2e0cacf914ee96 xfce4-cpugraph-0.3.0.ebuild 663
-MISC ChangeLog 2758 RMD160 41afec286aedee3fa79410dbbf4353e711c738fa SHA1 b2b0c1cd4e1dfe38b0ab9bdf6e54d8ad9af8e740 SHA256 a57f320bc6f6632ad27c79a564b5c71bbb3cb025a5f937ec6018b98c5efe35a6
-MD5 b1fab11abc7de548eed1bf98e6c0237d ChangeLog 2758
-RMD160 41afec286aedee3fa79410dbbf4353e711c738fa ChangeLog 2758
-SHA256 a57f320bc6f6632ad27c79a564b5c71bbb3cb025a5f937ec6018b98c5efe35a6 ChangeLog 2758
+MISC ChangeLog 3049 RMD160 69a62ab89ac6621471196595b3fc8bafd3e8fa1c SHA1 fd7b70ff3305e04668f0ae3336820ce334fc9bb4 SHA256 c6c77605bf9745b992da4362385c766b273ace9b6724d430dd1fca7396919fd0
+MD5 bc2ad72a673fd0592c7f764d8fe13659 ChangeLog 3049
+RMD160 69a62ab89ac6621471196595b3fc8bafd3e8fa1c ChangeLog 3049
+SHA256 c6c77605bf9745b992da4362385c766b273ace9b6724d430dd1fca7396919fd0 ChangeLog 3049
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -18,3 +26,6 @@ SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 metadata
 MD5 227f8d00e91dc4722d7697e3d5be5694 files/digest-xfce4-cpugraph-0.3.0 286
 RMD160 a685dacfb90f778a73ed3909a3a50ca95219fe29 files/digest-xfce4-cpugraph-0.3.0 286
 SHA256 818354f2225005c8f4b12730746c184cd4833cb1de8debadfaec675181480d36 files/digest-xfce4-cpugraph-0.3.0 286
+MD5 227f8d00e91dc4722d7697e3d5be5694 files/digest-xfce4-cpugraph-0.3.0-r1 286
+RMD160 a685dacfb90f778a73ed3909a3a50ca95219fe29 files/digest-xfce4-cpugraph-0.3.0-r1 286
+SHA256 818354f2225005c8f4b12730746c184cd4833cb1de8debadfaec675181480d36 files/digest-xfce4-cpugraph-0.3.0-r1 286
diff --git a/xfce-extra/xfce4-cpugraph/files/digest-xfce4-cpugraph-0.3.0-r1 b/xfce-extra/xfce4-cpugraph/files/digest-xfce4-cpugraph-0.3.0-r1
new file mode 100644
index 000000000000..1ef6d7cab54c
--- /dev/null
+++ b/xfce-extra/xfce4-cpugraph/files/digest-xfce4-cpugraph-0.3.0-r1
@@ -0,0 +1,3 @@
+MD5 b2ff93a62845289c4a8ed7d45faa7a1f xfce4-cpugraph-plugin-0.3.0.tar.bz2 102638
+RMD160 99c309b3bf0ab622a9b95df9b568808a6c034055 xfce4-cpugraph-plugin-0.3.0.tar.bz2 102638
+SHA256 eb6c2eee5f3d56a3202a9affb33242c3434bfbaeb0d7fe02cf267e64e85f3825 xfce4-cpugraph-plugin-0.3.0.tar.bz2 102638
diff --git a/xfce-extra/xfce4-cpugraph/files/xfce4-cpugraph-0.3.0-sizeof.patch b/xfce-extra/xfce4-cpugraph/files/xfce4-cpugraph-0.3.0-sizeof.patch
new file mode 100644
index 000000000000..5c59a96f49bd
--- /dev/null
+++ b/xfce-extra/xfce4-cpugraph/files/xfce4-cpugraph-0.3.0-sizeof.patch
@@ -0,0 +1,12 @@
+diff -ur xfce4-cpugraph-plugin-0.3.0.orig/panel-plugin/cpu.c xfce4-cpugraph-plugin-0.3.0/panel-plugin/cpu.c
+--- xfce4-cpugraph-plugin-0.3.0.orig/panel-plugin/cpu.c	2005-10-09 12:06:46.000000000 +0300
++++ xfce4-cpugraph-plugin-0.3.0/panel-plugin/cpu.c	2007-08-04 16:31:31.000000000 +0300
+@@ -626,7 +626,7 @@
+     base->m_CPUUsage = GetCPUUsage (&base->m_OldUsage, &base->m_OldTotal);
+ 
+     memmove (base->m_History + 1, base->m_History,
+-             (base->m_Values - 1) * sizeof (int));
++             (base->m_Values - 1) * sizeof (long));
+     base->m_History[0] = base->m_CPUUsage;
+ 
+     /* Tooltip */
diff --git a/xfce-extra/xfce4-cpugraph/xfce4-cpugraph-0.3.0-r1.ebuild b/xfce-extra/xfce4-cpugraph/xfce4-cpugraph-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..953c4735753d
--- /dev/null
+++ b/xfce-extra/xfce4-cpugraph/xfce4-cpugraph-0.3.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpugraph/xfce4-cpugraph-0.3.0-r1.ebuild,v 1.1 2007/08/04 13:41:13 drac Exp $
+
+inherit autotools eutils xfce44
+
+xfce44
+
+DESCRIPTION="CPU load panel plugin"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+DEPEND=">=xfce-extra/xfce4-dev-tools-${XFCE_MASTER_VERSION}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-sizeof.patch
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	AT_M4DIR=/usr/share/xfce4/dev-tools/m4macros eautoreconf
+}
+
+xfce44_goodies_panel_plugin