summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2010-03-29 22:28:28 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2010-03-29 22:28:28 +0000
commit90a18ee28d2ccb8c2bf4b4d1ec563333cc8c5f45 (patch)
tree932d9c8475824b2dc63e63e5f42d89102a4e40fe /net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild
parentUpdate my first name. (diff)
downloadgentoo-2-90a18ee28d2ccb8c2bf4b4d1ec563333cc8c5f45.tar.gz
gentoo-2-90a18ee28d2ccb8c2bf4b4d1ec563333cc8c5f45.tar.bz2
gentoo-2-90a18ee28d2ccb8c2bf4b4d1ec563333cc8c5f45.zip
Fix build with icu-4.4, bug #308699.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild')
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild8
1 files changed, 6 insertions, 2 deletions
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild
index d2ab8fd58e7c..7e792f5e911c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild,v 1.12 2010/03/24 18:25:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild,v 1.13 2010/03/29 22:28:28 eva Exp $
EAPI="2"
@@ -49,18 +49,22 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_P}"
src_prepare() {
-
# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
use sparc && epatch "${FILESDIR}"/webkit-gtk-1.1.15.2-unaligned.patch
# Darwin/Aqua build is broken, needs autoreconf
epatch "${FILESDIR}"/${P}-darwin-quartz.patch
+ # Fix build with icu-4.4
+ epatch "${FILESDIR}/${PN}-1.1.15.4-icu44.patch"
+
# Make it libtool-1 compatible
rm -v autotools/lt* autotools/libtool.m4 \
|| die "removing libtool macros failed"
+
# Don't force -O2
sed -i 's/-O2//g' "${S}"/configure.ac || die "sed failed"
+
# Prevent maintainer mode from being triggered during make
AT_M4DIR=autotools eautoreconf
}