From: Vlastimil Babka Date: Wed, 6 Dec 2006 21:22:11 +0000 (+0000) Subject: Apply the seamonkey patches to fix bug #155725 for ppc. Thanks to David Gurvich ... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eab29453e8c24aeb36cb4ed22e3c62eda0a04fc0;p=gentoo.git Apply the seamonkey patches to fix bug #155725 for ppc. Thanks to David Gurvich for testing them. Patches are now packed in distfile. Package-Manager: portage-2.1.2_rc2-r5 --- diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog index 97f84c47e7e0..01e4dcfbd0ec 100644 --- a/dev-java/swt/ChangeLog +++ b/dev-java/swt/ChangeLog @@ -1,23 +1,22 @@ # 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.54 2006/12/01 00:40:33 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.55 2006/12/06 21:22:11 caster Exp $ + + 06 Dec 2006; Vlastimil Babka + -files/patches-3.2.1/*, swt-3.2.1.ebuild: + Apply the seamonkey patches to fix bug #155725 for ppc (same patches as x86). + Thanks to David Gurvich for testing them. Patches + are now packed in a distfile. 01 Dec 2006; Vlastimil Babka -files/swt-3.2.1-firefox.patch, -files/swt-3.2.1-libswt-xpcomgcc4.patch, - -files/swt-3.2.1-remove-stripping.patch, - +files/patches-3.2.1/10_all_gcc-4.x-warning-fix.patch, - +files/patches-3.2.1/20_all_remove-stripping.patch, - +files/patches-3.2.1/30_amd64_libswt-xpcomgcc4.patch, - +files/patches-3.2.1/30_x86_libswt-xpcomgcc4.patch, - +files/patches-3.2.1/31_amd64_firefox.patch, - +files/patches-3.2.1/31_x86_firefox.patch, - +files/patches-3.2.1/40_amd64_cairo-signedness.patch, - +files/patches-3.2.1/40_x86_cairo-signedness.patch, swt-3.2.1.ebuild: - Fixed building with seamonkey useflag - bugs #156716 and #155725. Thanks to - Jorge Manuel B. S. Vicetto for adjusting the x86 - patches for amd64, and ron widler and William Thomson - for testing them. Now using dir-based epatch to apply - them. + -files/swt-3.2.1-remove-stripping.patch, +files/patches-3.2.1/*, + swt-3.2.1.ebuild: + Fixed building on amd64 with seamonkey useflag - bugs #156716 and #155725. + Thanks to Jorge Manuel B. S. Vicetto for adjusting + the x86 patches for amd64, and Ron Widler and William + Thomson for testing them. Now using dir-based epatch to + apply them. 20 Nov 2006; Vlastimil Babka swt-3.2.1.ebuild: Apply previous patches only on x86 as a workaround for bug #155725. diff --git a/dev-java/swt/files/digest-swt-3.2.1 b/dev-java/swt/files/digest-swt-3.2.1 index 169b024bc008..58c254a074ad 100644 --- a/dev-java/swt/files/digest-swt-3.2.1 +++ b/dev-java/swt/files/digest-swt-3.2.1 @@ -1,3 +1,6 @@ +MD5 51968023aef611ee58cf50c923ecf590 swt-3.2.1-gentoo-patches.tar.bz2 3979 +RMD160 20e3011c0795b114208a7967724d9e889bc26992 swt-3.2.1-gentoo-patches.tar.bz2 3979 +SHA256 2026a5d7ad2e041187fbd18058d620924bc6481785781760f2f57be50e81d866 swt-3.2.1-gentoo-patches.tar.bz2 3979 MD5 5b22588a74f065d27ea09b345386aaaf swt-3.2.1-gtk-linux-ppc.zip 3043491 RMD160 0246bacb58dc294719435fe6104a84aa512436f8 swt-3.2.1-gtk-linux-ppc.zip 3043491 SHA256 267e116f59f72d0b701d60a6bf3c410f81c51e7d468862ecbcf34e7bf4e3b096 swt-3.2.1-gtk-linux-ppc.zip 3043491 diff --git a/dev-java/swt/swt-3.2.1.ebuild b/dev-java/swt/swt-3.2.1.ebuild index f423eff2c431..7b8009e55a9e 100644 --- a/dev-java/swt/swt-3.2.1.ebuild +++ b/dev-java/swt/swt-3.2.1.ebuild @@ -1,16 +1,17 @@ # 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.4 2006/12/01 00:40:33 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2.1.ebuild,v 1.5 2006/12/06 21:22:11 caster Exp $ inherit eutils java-pkg-2 java-ant-2 MY_DMF="R-${PV}-200609210945" - +PATCHSET="${P}-gentoo-patches" DESCRIPTION="GTK based SWT Library" HOMEPAGE="http://www.eclipse.org/" SRC_URI="x86? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${PV}-gtk-linux-x86.zip ) amd64? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${PV}-gtk-linux-x86_64.zip ) - ppc? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${PV}-gtk-linux-ppc.zip )" + ppc? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${PV}-gtk-linux-ppc.zip ) + mirror://gentoo/${PATCHSET}.tar.bz2" SLOT="3" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" @@ -51,6 +52,7 @@ S="${WORKDIR}" src_unpack() { unzip -jq "${DISTDIR}/${A}" "*src.zip" || die "unable to extract distfile" + unpack "${PATCHSET}.tar.bz2" unpack ./src.zip @@ -63,7 +65,7 @@ src_unpack() { mkdir ${S}/src && mv ${S}/org ${S}/src || die "Unable to restructure SWT sources" # apply all the patches, including arch-specific - EPATCH_SOURCE="${FILESDIR}/patches-${PV}" EPATCH_SUFFIX="patch" epatch + EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" epatch sed -i "s/CFLAGS = -O -Wall/CFLAGS = ${CFLAGS} -Wall/" \ make_linux.mak \