summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2008-09-21 22:40:02 +0000
committerChristoph Mende <angelos@gentoo.org>2008-09-21 22:40:02 +0000
commit21f491e780f02bc86ccacbadf991b6b0de6fe5e8 (patch)
tree37f05c43c1353d04ef24a183f7a9d4dafca19eda /x11-libs
parentStable for HPPA (bug #238216). (diff)
downloadgentoo-2-21f491e780f02bc86ccacbadf991b6b0de6fe5e8.tar.gz
gentoo-2-21f491e780f02bc86ccacbadf991b6b0de6fe5e8.tar.bz2
gentoo-2-21f491e780f02bc86ccacbadf991b6b0de6fe5e8.zip
Made examples 64bit clean and limited to -j1, bugs 235737 and 235967 by Marcin Olender
(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc6 x86_64)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/xfc/ChangeLog7
-rw-r--r--x11-libs/xfc/files/xfc-4.3.2-64bit-examples.patch19
-rw-r--r--x11-libs/xfc/xfc-4.3.2.ebuild13
3 files changed, 36 insertions, 3 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/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() {