[arch-commits] Commit in eclipse-ecj/trunk (01-ecj-include-props.patch PKGBUILD)

[Guillaume Alaux]

    Date: Wednesday, January 9, 2013 @ 07:32:37
  Author: guillaume
Revision: 174934

Added patch for missing resource to fix FS#33151

Added:
  eclipse-ecj/trunk/01-ecj-include-props.patch
Modified:
  eclipse-ecj/trunk/PKGBUILD

----------------------------+
 01-ecj-include-props.patch |   15 +++++++++++++++
 PKGBUILD                   |   21 ++++++++++++---------
 2 files changed, 27 insertions(+), 9 deletions(-)

Added: 01-ecj-include-props.patch
===================================================================
--- 01-ecj-include-props.patch	                        (rev 0)
+++ 01-ecj-include-props.patch	2013-01-09 12:32:37 UTC (rev 174934)
@@ -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>

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-09 12:15:29 UTC (rev 174933)
+++ PKGBUILD	2013-01-09 12:32:37 UTC (rev 174934)
@@ -5,30 +5,33 @@
 
 pkgname=eclipse-ecj
 pkgver=4.2.1
-pkgrel=1
+pkgrel=2
 _date=201209141800
 pkgdesc='Eclipse java bytecode compiler'
 arch=('any')
 license=('EPL')
 url='http://www.eclipse.org/'
 depends=('java-runtime')
-makedepends=('unzip' 'apache-ant' 'java-environment')
+makedepends=('apache-ant' 'java-environment')
 source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/ecjsrc-${pkgver}.jar
+        01-ecj-include-props.patch
         ecj)
 sha256sums=('d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4'
+            '8f6259c76dfe493549bbaec3c8a7ba29e82c70e127c918adca28737dcb570f6b'
             '63aff3d126243d303ddc4305cfa77827df72e87ccf85bd8a22a2f832357e396c')
 
 build() {
   cd ${srcdir}
-  mkdir src
-  unzip ecjsrc-${pkgver}.jar -d src
-  cd src
+  #imkdir src
+  #jar xf ecjsrc-${pkgver}.jar -d src
+  #cd src
+  patch -p0 < 01-ecj-include-props.patch
   ant build
 }
 
 package() {
-  install -Dm644 ${srcdir}/src/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 -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
 }