summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2009-07-08 11:34:48 +0000
committerBen de Groot <yngwin@gentoo.org>2009-07-08 11:34:48 +0000
commitfce95167de51c686e4bcc3471dece7bba61954d6 (patch)
tree85d8ca57d44b6319dca8bb3c14cb7f4c36b2cc23 /x11-libs/fltk/fltk-1.1.9.ebuild
parentAdd same mask to hardened/linux to work around this design fail of not having... (diff)
downloadhistorical-fce95167de51c686e4bcc3471dece7bba61954d6.tar.gz
historical-fce95167de51c686e4bcc3471dece7bba61954d6.tar.bz2
historical-fce95167de51c686e4bcc3471dece7bba61954d6.zip
Remove glibc-2.10 patches from 1.1.9 and 2.0_pre6786, so they can be stabled. Reapplied those patches to the -r1 ebuilds, so it works for ~arch users.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/fltk/fltk-1.1.9.ebuild')
-rw-r--r--x11-libs/fltk/fltk-1.1.9.ebuild9
1 files changed, 3 insertions, 6 deletions
diff --git a/x11-libs/fltk/fltk-1.1.9.ebuild b/x11-libs/fltk/fltk-1.1.9.ebuild
index b062d68f08b1..e3f3eb23f7e4 100644
--- a/x11-libs/fltk/fltk-1.1.9.ebuild
+++ b/x11-libs/fltk/fltk-1.1.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.9.ebuild,v 1.6 2009/07/05 08:37:00 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.9.ebuild,v 1.7 2009/07/08 11:34:48 yngwin Exp $
EAPI=2
inherit eutils autotools versionator fdo-mime
@@ -25,8 +25,8 @@ RDEPEND="x11-libs/libXext
sys-libs/zlib
opengl? ( virtual/opengl virtual/glu )
xinerama? ( x11-libs/libXinerama )
- xft? ( x11-libs/libXft )"
-
+ xft? ( x11-libs/libXft )
+ <sys-libs/glibc-2.10" # glibc-2.10 patch breaks with 2.9, bug 276695
DEPEND="${RDEPEND}
x11-proto/xextproto
doc? ( app-text/htmldoc )
@@ -42,9 +42,6 @@ src_prepare() {
# prevent to run twice configure (needs eautoconf), to compile tests,
# remove forced -Os compile
epatch "${FILESDIR}"/${P}-conf-tests.patch
- # fix stricter c++ handling in glibc-2.10/gcc-4.4 (bug 270487)
- epatch "${FILESDIR}"/${P}-glibc2.10-scandir.patch
- epatch "${FILESDIR}"/${P}-consts.patch
# remove forced flags from fltk-config
sed -i \
-e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \