Attachment #98958: diff from 3.2.1 to 3.2.1-r1 for bug #150314

	exeinto ${ECLIPSE_DIR}

apply-patchset() {

	# begin: patches/comments from fedora

	# Build JNI libs

	# FIXME:  these should be built by upstream build method

	# http://www.bagu.org/eclipse/plugin-source-drops.html

	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637

	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848

	# GNU XML issue identified by Michael Koch

	# %patch2 -p0

	epatch ${FILESDIR}/${P}-build.patch

	# %patch4 -p0

	epatch ${FILESDIR}/${P}-libupdatebuild.patch

	# %patch5 -p0

	epatch ${FILESDIR}/${P}-libupdatebuild2.patch

	# Build swttools.jar

	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364

	pushd plugins/org.eclipse.swt.gtk.linux.x86_64 >/dev/null

	# %patch18 -p0

	epatch ${FILESDIR}/${P}-swttools.patch

	popd >/dev/null

	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90630

	# %patch22 -p0

	epatch ${FILESDIR}/${P}-updatehomedir.patch

	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535

	pushd plugins/org.eclipse.core.runtime >/dev/null

	# %patch24 -p0

	epatch ${FILESDIR}/${P}-fileinitializer.patch

	popd >/dev/null

	##

	## FIXME: breaks!!

	##

	## tomcat patches

	## These patches need to go upstream

	## https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371

	#pushd plugins/org.eclipse.tomcat >/dev/null

	## %patch28 -p0

	#epatch ${FILESDIR}/${P}-tomcat55.patch

	## %patch29 -p0

	#epatch ${FILESDIR}/${P}-tomcat55-build.patch

	#popd >/dev/null

	#sed --in-place "s/4.1.130/5.5.17/"                      \

	#		features/org.eclipse.platform/build.xml \

	#		plugins/org.eclipse.tomcat/build.xml    \

	#		assemble.*.xml

	#pushd plugins/org.eclipse.help.webapp >/dev/null

	## %patch31 -p0

	#epatch ${FILESDIR}/${P}-webapp-tomcat55.patch

	#popd >/dev/null

	# pushd plugins/org.eclipse.compare

	# COMMENTED BY FEDORA %patch33 -p0

	# popd

	# JPackage []s in names of symlinks ...

	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177

	pushd plugins/org.eclipse.jdt.core >/dev/null

	# %patch34 -p0

	epatch ${FILESDIR}/${P}-bz162177.patch

	# Use ecj for gcj

	# %patch57 -p0

	epatch ${FILESDIR}/${P}-ecj-gcj.patch

	popd >/dev/null

	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=114001

	# %patch38 -p0

	epatch ${FILESDIR}/${P}-helpindexbuilder.patch

	# %patch40 -p0

	epatch ${FILESDIR}/${P}-usebuiltlauncher.patch

	# DO NOT APPLY %patch43

	pushd plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library >/dev/null

	# Build cairo native libs

	# %patch46

	# epatch ${FILESDIR}/${P}-libswt-xpcomgcc4.patch

	popd >/dev/null

	# Because the launcher source is zipped up, we need to unzip, patch, and re-pack

	mkdir launchertmp

	unzip -qq -d launchertmp plugins/org.eclipse.platform/launchersrc.zip >/dev/null || die "unzip failed"

	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=79592

	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=168726

	pushd launchertmp >/dev/null

	# %patch47 -p1

	epatch ${FILESDIR}/${P}-launcher-link.patch

	zip -q -9 -r ../launchersrc.zip * >/dev/null || die "zip failed"

	popd >/dev/null

	mv launchersrc.zip plugins/org.eclipse.platform

	rm -rf launchertmp

	pushd features/org.eclipse.platform.launchers >/dev/null

	# %patch47 -p1

	epatch ${FILESDIR}/${P}-launcher-link.patch

	popd >/dev/null

	# Link against our system-installed javadocs

	# Don't attempt to link to Sun's javadocs

	# %patch48 -p0

	epatch ${FILESDIR}/${P}-javadoclinks.patch

	sed --in-place "s:/usr/share/:%{_datadir}/:g"           \

		plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt  \

		plugins/org.eclipse.pde.doc.user/pdeOptions.txt \

		plugins/org.eclipse.pde.doc.user/pdeOptions     \

		plugins/org.eclipse.platform.doc.isv/platformOptions.txt 

	# Always generate debug info when building RPMs (Andrew Haley)

	# %patch49 -p0

	epatch ${FILESDIR}/${P}-ecj-rpmdebuginfo.patch

	# generic releng plugins that can be used to build plugins

	# see this thread for deails: 

	# https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html

	pushd plugins/org.eclipse.pde.build >/dev/null

	# %patch53

	epatch ${FILESDIR}/${P}-pde.build-add-package-build.patch

	sed --in-place "s:@eclipse_base@:%{_datadir}/%{name}:" templates/package-build/build.properties

	popd >/dev/null

	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=191536

	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=142861

	pushd plugins/org.eclipse.swt/Eclipse\ SWT >/dev/null

	# %patch54 

	epatch ${FILESDIR}/${P}-swt-rm-ON_TOP.patch

	popd >/dev/null

	# We need to disable junit4 and apt until GCJ can handle Java5 code

	# %patch55 -p0

	epatch ${FILESDIR}/${P}-disable-junit4-apt.patch

	rm plugins/org.junit4/junit-4.1.jar

	##

	## FIXME: breaks!!

	##

	## I love directories with spaces in their names

	#pushd plugins/org.eclipse.swt >/dev/null

	#mv "Eclipse SWT Mozilla" Eclipse_SWT_Mozilla

	#mv "Eclipse SWT PI" Eclipse_SWT_PI

	## Build against firefox:

	##  - fix swt profile include path

	##  - don't compile the mozilla 1.7 / firefox profile library -- build it inline

	##  - don't use symbols not in our firefox builds

	## FIXME:  add reference(s) to discussion(s) and bug(s)

	## Note:  I made this patch from within Eclipse and then did the following to

	##        it due to spaces in the paths:

	##  sed --in-place "s/Eclipse\ SWT\ Mozilla/Eclipse_SWT_Mozilla/g" eclipse-swt-firefox.patch

	##  sed --in-place "s/Eclipse\ SWT\ PI/Eclipse_SWT_PI/g" eclipse-swt-firefox.patch

	## %patch59

	#epatch ${FILESDIR}/${P}-swt-firefox.patch

	#mv Eclipse_SWT_Mozilla "Eclipse SWT Mozilla"

	#mv Eclipse_SWT_PI "Eclipse SWT PI"

	#popd >/dev/null

	#pushd plugins/org.eclipse.swt.tools >/dev/null

	#mv "JNI Generation" JNI_Generation 

	## %patch60

	#epatch ${FILESDIR}/${P}-swt-firefox.2.patch

	#mv JNI_Generation "JNI Generation"

	#popd >/dev/null

	# FIXME check if this has been applied upstream

	pushd plugins/org.eclipse.platform.doc.isv >/dev/null

	# %patch100 -p0

	epatch ${FILESDIR}/customBuildCallbacks.xml-add-pre.gather.bin.parts.patch

	popd >/dev/null

	pushd plugins/org.eclipse.platform.doc.user >/dev/null

	# %patch100 -p0

	epatch ${FILESDIR}/customBuildCallbacks.xml-add-pre.gather.bin.parts.patch

	popd >/dev/null

	pushd plugins/org.eclipse.platform >/dev/null

	cp ${FILESDIR}/splash.bmp .

	popd >/dev/null

	# FIXME this should be patched upstream with a flag to turn on and off 

	# all output should be directed to stdout

	find -type f -name \*.xml -exec sed --in-place -r "s/output=\".*(txt|log).*\"//g" "{}" \;

}

        # Build using O2

        # https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637

        pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library >/dev/null

        # %patch0 -p0

        epatch ${FILESDIR}/${P}-gentoo-libswt-enableallandO2.patch

        popd >/dev/null