closure-compiler-20160619-1.parabola1: updating version

2 files changed, 49 insertions, 22 deletions

diff --git a/libre/closure-compiler/PKGBUILD b/libre/closure-compiler/PKGBUILD
index 5778dd03c..023891a1b 100644
--- a/libre/closure-compiler/PKGBUILD
+++ b/libre/closure-compiler/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=closure-compiler
-pkgver=20160517
-pkgrel=1
+pkgver=20160619
+pkgrel=1.parabola1
 pkgdesc="Performs checking, instrumentation and optimizations on Javascript code."
 arch=('any')
 url="https://developers.google.com/closure/compiler/"
@@ -24,12 +24,14 @@ makedepends=(
 )
 
 source=("https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz"
-        'closure-compiler.sh')
-sha256sums=('72cbbf6c52bfbdd8a5b35f888f942feea74bf13984c7d2e6fdfc6737bd67f294'
-            '10b0d74a305548b029f05bd4fb0ffabec2ff782f9e3c054c2f5236f1bf4c6630')
+        'closure-compiler.sh'
+        'closure-compiler-fix_build.patch')
+sha256sums=('c4abaf11f04bda2048d92ab33c53e072b37e82cb38f216c68dee55d1237c4a2e'
+            '10b0d74a305548b029f05bd4fb0ffabec2ff782f9e3c054c2f5236f1bf4c6630'
+            '214582d37ec2adeae4dd14bd12ac715a2d9cb0e48b66ad8567bd3dda1dca29a4')
 
 mkdepends=(git)
-mksource=("$pkgname-$pkgver::git+https://github.com/google/closure-compiler.git#tag=v${pkgver}")
+mksource=("$pkgname-$pkgver::git+https://github.com/google/closure-compiler.git#tag=v$pkgver")
 mkmd5sums=('SKIP')
 
 mksource() {
@@ -40,11 +42,11 @@ mksource() {
     /<target name=\"relversion\">/,/<\/target>/ {
       s/executable=\"git\"/executable=\"echo\"/
       /<arg/d
-      /<\/exec>/i<arg value=\"v${pkgver}\" />
+      /<\/exec>/i<arg value=\"v$pkgver\" />
     }" \
     build.xml
 
-  sed -i "s/1\.0-SNAPSHOT/v${pkgver}/g" \
+  sed -i "s/1\.0-SNAPSHOT/v$pkgver/g" \
     externs/pom.xml \
     pom.xml \
     pom-main.xml
@@ -53,8 +55,8 @@ mksource() {
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ln -sf /opt/apache-ant/lib/ant.jar          lib/ant.jar
-  ln -sf /opt/apache-ant/lib/ant-launcher.jar lib/ant-launcher.jar
+  ln -sf /usr/share/apache-ant/lib/ant.jar          lib/ant.jar
+  ln -sf /usr/share/apache-ant/lib/ant-launcher.jar lib/ant-launcher.jar
   ln -sf /usr/share/java/args4j.jar           lib/args4j.jar
   ln -sf /usr/share/java/guava.jar            lib/guava.jar
   #ln -sf /usr/share/java/jarjar.jar           lib/jarjar.jar
@@ -64,6 +66,8 @@ prepare() {
   #ln -sf /usr/share/java/mockito-core.jar     lib/mockito-core.jar
   #ln -sf /usr/share/java/objenesis.jar        lib/objenesis.jar
   ln -sf /usr/share/java/protobuf.jar         lib/protobuf-java.jar
+
+  patch -Np1 -i "$srcdir/closure-compiler-fix_build.patch"
 }
 
 build() {
@@ -75,23 +79,23 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # Install license file
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 
   # Install documentation
-  install -d "${pkgdir}/usr/share/doc/${pkgname}"
-  cp -r "build/javadoc" "${pkgdir}/usr/share/doc/${pkgname}"
+  install -d "$pkgdir/usr/share/doc/$pkgname"
+  cp -r "build/javadoc" "$pkgdir/usr/share/doc/$pkgname"
 
   # Install Maven artifacts
-  export DESTDIR="${pkgdir}"
-  jh mvn-install com.google.javascript "${pkgname}-parent"  "v${pkgver}" pom.xml
-  jh mvn-install com.google.javascript "${pkgname}-externs" "v${pkgver}" externs/pom.xml
-  jh mvn-install com.google.javascript "${pkgname}"         "v${pkgver}" pom-main.xml \
-    build/compiler.jar "${pkgname}-${pkgver}.jar"
-  ln -s "/usr/share/java/${pkgname}-${pkgver}.jar" \
-    "${pkgdir}/usr/share/java/${pkgname}.jar"
+  export DESTDIR="$pkgdir"
+  jh mvn-install com.google.javascript "$pkgname-parent"  "v$pkgver" pom.xml
+  jh mvn-install com.google.javascript "$pkgname-externs" "v$pkgver" externs/pom.xml
+  jh mvn-install com.google.javascript "$pkgname"         "v$pkgver" pom-main.xml \
+    build/compiler.jar "$pkgname-$pkgver.jar"
+  ln -s "/usr/share/java/$pkgname-$pkgver.jar" \
+    "$pkgdir/usr/share/java/$pkgname.jar"
 
-  install -Dm755 "${srcdir}/closure-compiler.sh" "${pkgdir}/usr/bin/closure-compiler"
+  install -Dm755 "$srcdir/closure-compiler.sh" "$pkgdir/usr/bin/closure-compiler"
 
   # symlink for compatibility with Arch's [community]/closure-compiler
-  ln -s closure-compiler "${pkgdir}/usr/bin/closure"
+  ln -s closure-compiler "$pkgdir/usr/bin/closure"
 }
diff --git a/libre/closure-compiler/closure-compiler-fix_build.patch b/libre/closure-compiler/closure-compiler-fix_build.patch
new file mode 100644
index 000000000..557e3b51a
--- /dev/null
+++ b/libre/closure-compiler/closure-compiler-fix_build.patch
@@ -0,0 +1,23 @@
+--- closure-compiler-20160619.orig/build.xml	2016-07-04 19:47:30.000000000 -0500
++++ closure-compiler-20160619/build.xml	2016-07-05 00:36:28.456947257 -0500
+@@ -312,11 +312,15 @@
+          author="false"
+          protected="true"
+          windowtitle="Closure Compiler"
+-         additionalparam=" -notimestamp ">
+-      <sourcepath>
+-        <pathelement location="${src.dir}" />
+-        <pathelement location="${gen.dir}" />
+-      </sourcepath>
++         additionalparam=" -notimestamp "
++         encoding="utf-8">
++      <fileset dir="${basedir}" defaultexcludes="yes">
++        <include name="src/**/*.java"/>
++        <include name="gen/**/*.java"/>
++        <exclude name="**/gwt/**"/>
++        <exclude name="**/debugger/**"/>
++        <exclude name="**/testing/**"/>
++      </fileset>
+       <classpath refid="allclasspath.path" />
+       <link href="http://docs.oracle.com/javase/7/docs/api/" />
+     </javadoc>