summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2006-11-20 01:02:33 +0000
committerVlastimil Babka <caster@gentoo.org>2006-11-20 01:02:33 +0000
commit79b3d6dcf383e6aacce1e3b4bdeb5b00444b2756 (patch)
tree6ef40a98e79ea5c0804ea749d11cb5dd2eecd590 /dev-java/swt
parentVersion bump. Remove old versions (diff)
downloadgentoo-2-79b3d6dcf383e6aacce1e3b4bdeb5b00444b2756.tar.gz
gentoo-2-79b3d6dcf383e6aacce1e3b4bdeb5b00444b2756.tar.bz2
gentoo-2-79b3d6dcf383e6aacce1e3b4bdeb5b00444b2756.zip
Apply previous patches only on x86 as a workaround for bug #155725.
(Portage version: 2.1.2_rc1-r7)
Diffstat (limited to 'dev-java/swt')
-rw-r--r--dev-java/swt/ChangeLog5
-rw-r--r--dev-java/swt/swt-3.2.1.ebuild9
2 files changed, 10 insertions, 4 deletions
diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index 578c6b3187c2..bc6414865b3f 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/swt
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.52 2006/11/19 18:59:50 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.53 2006/11/20 01:02:33 caster Exp $
+
+ 20 Nov 2006; Vlastimil Babka <caster@gentoo.org> swt-3.2.1.ebuild:
+ Apply previous patches only on x86 as a workaround for bug #155725.
19 Nov 2006; Petteri Räty <betelgeuse@gentoo.org>
+files/swt-3.2.1-firefox.patch, +files/swt-3.2.1-libswt-xpcomgcc4.patch,
diff --git a/dev-java/swt/swt-3.2.1.ebuild b/dev-java/swt/swt-3.2.1.ebuild
index 69ed2c283994..dd48d110db2e 100644
--- a/dev-java/swt/swt-3.2.1.ebuild
+++ b/dev-java/swt/swt-3.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2.1.ebuild,v 1.2 2006/11/19 18:59:50 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2.1.ebuild,v 1.3 2006/11/20 01:02:33 caster Exp $
inherit eutils java-pkg-2 java-ant-2
@@ -68,9 +68,12 @@ src_unpack() {
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=165097
epatch "${FILESDIR}"/${PN}-3.2.1-remove-stripping.patch
- epatch "${FILESDIR}"/${PN}-3.2.1-libswt-xpcomgcc4.patch
+ # bug #155725
+ if use x86; then
+ epatch "${FILESDIR}"/${PN}-3.2.1-libswt-xpcomgcc4.patch
- epatch "${FILESDIR}"/${PN}-3.2.1-firefox.patch
+ epatch "${FILESDIR}"/${PN}-3.2.1-firefox.patch
+ fi
if [[ ${ARCH} == "amd64" ]] ; then
epatch "${FILESDIR}"/${PN}-3.2-cairo-signedness-x86_64.patch