Made examples 64bit clean and limited to -j1, bugs 235737 and 235967 by Marcin Olender

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc6 x86_64

4 files changed, 49 insertions, 5 deletions

diff --git a/x11-libs/xfc/ChangeLog b/x11-libs/xfc/ChangeLog
index 5ddeed8d86e4..c9242ca6b920 100644
--- a/x11-libs/xfc/ChangeLog
+++ b/x11-libs/xfc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/xfc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xfc/ChangeLog,v 1.7 2008/05/11 16:09:07 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xfc/ChangeLog,v 1.8 2008/09/21 22:40:01 angelos Exp $
+
+  21 Sep 2008; Christoph Mende <angelos@gentoo.org>
+  +files/xfc-4.3.2-64bit-examples.patch, xfc-4.3.2.ebuild:
+  Made examples 64bit clean and limited to -j1, bugs 235737 and 235967 by
+  Marcin Olender
 
   11 May 2008; Samuli Suominen <drac@gentoo.org> xfc-4.3.2.ebuild:
   Move doxygen to DEPEND wrt #221699, thanks to Diego Pettenò.
diff --git a/x11-libs/xfc/Manifest b/x11-libs/xfc/Manifest
index d8dae8721024..ac5610ea5f41 100644
--- a/x11-libs/xfc/Manifest
+++ b/x11-libs/xfc/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xfc-4.3.2-64bit-examples.patch 883 RMD160 969d9cde666def255c206fc04ad99345e423a7b8 SHA1 c3b0e9b2737e12b3d78bb2e2cad2ebcbbb022a0e SHA256 133262aa9a4feb0df41569c0402e43b3519eab98e8efd82fcfc3ff302dfb2be3
 DIST xfc-4.3.2.tar.bz2 5416430 RMD160 af2a14ecb502e52ed65e8cfe1df3d2b3f38eef6d SHA1 42bcd1091c8dda1603ad09df3dfd4e1e6f5e1654 SHA256 0f5446d52bdedc2fb3de6720b0cfae328283c647dd9d9712c17c70fba926597d
-EBUILD xfc-4.3.2.ebuild 1013 RMD160 8eef7e2594c7b7eb0bd1a438860488671d04e550 SHA1 510122326cca1699aafbab1a156a93a13710a92b SHA256 e59d3ef9a13b5f3dd4835ff9757d5a3eed8eefd5573fea6f722ca3cecd755b95
-MISC ChangeLog 996 RMD160 217da3b7b2bf0f1728ae2298a5dfc96cec3454e1 SHA1 471e253296488b158982606714491e4569fcd218 SHA256 b41df568b841ff41b10b89d4baf75f396ff6c9a551a41104f97154cd5996cc64
+EBUILD xfc-4.3.2.ebuild 1127 RMD160 aa270a325c96c1a5e89a4ff426d80e3170daf109 SHA1 d37b736aa741eec54b17a4597e7eebd9f6803ff3 SHA256 6fa97bc7abb641563e3bc0cc7fc3b78962e113dae95d0ee772829675adbee4b1
+MISC ChangeLog 1202 RMD160 b12402cb05167ff3f02e00f63ef1c1e09f95688b SHA1 8720b1d597f4183c8ab223a5b1a809cca60385b3 SHA256 e53d384cab0d6f92692d4343edc50ebdc1dfe6b7fbe744b0c4e7da442da33a43
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjWzUsACgkQKhnDs22gwa+GygCeNi5Wa7FsOGsICBa7ThBo/Akd
+hekAoLlJiunwhMHr4Hk6Qkz52NO33WET
+=0ZDr
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/xfc/files/xfc-4.3.2-64bit-examples.patch b/x11-libs/xfc/files/xfc-4.3.2-64bit-examples.patch
new file mode 100644
index 000000000000..4ef2f8766d88
--- /dev/null
+++ b/x11-libs/xfc/files/xfc-4.3.2-64bit-examples.patch
@@ -0,0 +1,19 @@
+--- xfc-4.3.2/examples/howto/selection/selection.cc.orig	2008-09-22 00:26:26.000000000 +0200
++++ xfc-4.3.2/examples/howto/selection/selection.cc	2008-09-22 00:26:50.000000000 +0200
+@@ -3,6 +3,7 @@
+ #include <xfc/gtk/buttonbox.hh>
+ #include <xfc/gtk/label.hh>
+ #include <iostream>
++#include <stdint.h>
+ 
+ std::vector<Gtk::TargetEntry> SupplySelectionButton::target_entries;
+ 
+@@ -47,7 +48,7 @@
+ 	cout << " * type() = " << selection_data.get_type() << endl;
+ 	cout << " * format() = " << selection_data.format() << endl;
+ 	cout.setf(ios_base::hex, ios_base::basefield);
+-	cout << " * data() = 0x" << reinterpret_cast<unsigned int>(selection_data.data()) << endl;
++	cout << " * data() = 0x" << reinterpret_cast<unsigned uintptr_t>(selection_data.data()) << endl;
+ 	cout.setf(ios_base::dec, ios_base::basefield);
+ 	cout << " * length() = " << selection_data.length() << endl << endl;
+ 	
diff --git a/x11-libs/xfc/xfc-4.3.2.ebuild b/x11-libs/xfc/xfc-4.3.2.ebuild
index 516091159226..0498bcb60945 100644
--- a/x11-libs/xfc/xfc-4.3.2.ebuild
+++ b/x11-libs/xfc/xfc-4.3.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xfc/xfc-4.3.2.ebuild,v 1.3 2008/05/11 16:09:07 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xfc/xfc-4.3.2.ebuild,v 1.4 2008/09/21 22:40:01 angelos Exp $
+
+inherit eutils
 
 DESCRIPTION="C++ bindings to Xfce desktop environment"
 HOMEPAGE="http://xfc.xfce.org"
@@ -23,12 +25,19 @@ DEPEND="${RDEPEND}
 	doc? ( >=app-doc/doxygen-1.3.2 )
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-64bit-examples.patch
+}
+
 src_compile() {
 	econf $(use_enable doc docs) \
 		$(use_enable debug) \
 		$(use_enable examples) \
 		$(use_enable examples demos)
-	emake || die "emake failed."
+	emake -j1 || die "emake failed."
 }
 
 src_install() {