From d166e8815a1fdf65e412c532ba9d68c36fc72fc6 Mon Sep 17 00:00:00 2001
From: Neofytos Kolokotronis <tetris4@chakraos.org>
Date: Mon, 20 Feb 2017 13:09:45 +0100
Subject: [PATCH] eclipse-ecj: moved from core to desktop, FS#1381

---
 eclipse-ecj/01-ecj-include-props.patch     | 15 +++++++++
 eclipse-ecj/02-buildxml-fix-manifest.patch | 11 ++++++
 eclipse-ecj/PKGBUILD                       | 39 ++++++++++++++++++++++
 eclipse-ecj/ecj                            |  4 +++
 4 files changed, 69 insertions(+)
 create mode 100644 eclipse-ecj/01-ecj-include-props.patch
 create mode 100644 eclipse-ecj/02-buildxml-fix-manifest.patch
 create mode 100644 eclipse-ecj/PKGBUILD
 create mode 100644 eclipse-ecj/ecj

diff --git a/eclipse-ecj/01-ecj-include-props.patch b/eclipse-ecj/01-ecj-include-props.patch
new file mode 100644
index 000000000..32766266b
--- /dev/null
+++ b/eclipse-ecj/01-ecj-include-props.patch
@@ -0,0 +1,15 @@
+--- build.xml	2012-09-14 18:22:48.000000000 +0000
++++ build.xml.patched	2013-01-09 10:19:28.414079935 +0000
+@@ -46,9 +46,10 @@
+ 				<include name="**/*.rsc"/>
+ 				<include name="META-INF/**"/>
+ 				<include name="**/*.properties"/>
++				<include name="**/*.props"/>
+ 				<exclude name="META-INF/eclipse.inf"/>
+ 			</fileset>
+ 		</zip>
+ 		<delete dir="${output}" />
+ 	</target>
+-</project>
+\ No newline at end of file
++</project>
diff --git a/eclipse-ecj/02-buildxml-fix-manifest.patch b/eclipse-ecj/02-buildxml-fix-manifest.patch
new file mode 100644
index 000000000..ba9cd0a64
--- /dev/null
+++ b/eclipse-ecj/02-buildxml-fix-manifest.patch
@@ -0,0 +1,11 @@
+--- build.xml.orig	2013-10-03 13:55:28.579003290 +0000
++++ build.xml	2013-10-03 13:57:52.971400439 +0000
+@@ -39,8 +39,6 @@
+ 			<compilerarg line="-Xlint:none"/>
+ 		</javac>
+ 
+-		<delete file="${basedir}/META-INF/MANIFEST.MF" failonerror="false"/>
+-		<copy tofile="${basedir}/META-INF/MANIFEST.MF" file="${basedir}/scripts/binary/META-INF/MANIFEST.MF"/>
+ 		<zip destfile="${basedir}/${jar_file}">
+ 			<fileset dir="${output}" />
+ 			<fileset dir="${basedir}">
diff --git a/eclipse-ecj/PKGBUILD b/eclipse-ecj/PKGBUILD
new file mode 100644
index 000000000..c423fe3e0
--- /dev/null
+++ b/eclipse-ecj/PKGBUILD
@@ -0,0 +1,39 @@
+# contributions from Arch: https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/eclipse-ecj
+
+pkgname=eclipse-ecj
+pkgver=4.6.1
+pkgrel=1
+_date=201609071200
+pkgdesc='Eclipse java bytecode compiler'
+arch=('x86_64')
+license=('EPL')
+url='http://www.eclipse.org/'
+depends=('java-runtime')
+makedepends=('apache-ant' 'java-environment')
+source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/ecjsrc-${pkgver}.jar
+        01-ecj-include-props.patch
+        02-buildxml-fix-manifest.patch
+        ecj)
+sha256sums=('36a664f84b5d2ba2c31dc8b3cf72783a979c9cffe689fbed5c58130f2b269fbc'
+            '8f6259c76dfe493549bbaec3c8a7ba29e82c70e127c918adca28737dcb570f6b'
+            '5ca6bd94c2b1cb4c6f116d38c160edf1c4ca520647ac74b26486f958254767af'
+            '63aff3d126243d303ddc4305cfa77827df72e87ccf85bd8a22a2f832357e396c')
+
+build() {
+  cd "${srcdir}"
+  patch -p0 -i "$srcdir/01-ecj-include-props.patch"
+  patch -p0 -i "$srcdir/02-buildxml-fix-manifest.patch"
+  
+  sed -i -e "s/Xlint:none/Xlint:none -encoding cp1252/g" build.xml
+  
+  LANG=en_US.UTF-8
+  ant build
+}
+
+package() {
+  install -Dm644 "${srcdir}/ecj.jar" "${pkgdir}/usr/share/java/eclipse-ecj-${pkgver}.jar"
+  ln -s eclipse-ecj-${pkgver}.jar "${pkgdir}/usr/share/java/ecj.jar"
+  ln -s eclipse-ecj-${pkgver}.jar "${pkgdir}/usr/share/java/eclipse-ecj.jar"
+  install -Dm755 ecj "${pkgdir}/usr/bin/ecj"
+  install -D -m 644 ecj.1 "${pkgdir}/usr/share/man/man1/ecj.1"
+}
diff --git a/eclipse-ecj/ecj b/eclipse-ecj/ecj
new file mode 100644
index 000000000..6d3557a74
--- /dev/null
+++ b/eclipse-ecj/ecj
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+CLASSPATH=/usr/share/java/ecj.jar${CLASSPATH:+:}$CLASSPATH \
+java org.eclipse.jdt.internal.compiler.batch.Main "$@"