clojure-1.8.0-1.parabola1: updating version

2 files changed, 51 insertions, 54 deletions

diff --git a/libre/clojure/PKGBUILD b/libre/clojure/PKGBUILD
index 203c6792e..6834e274f 100644
--- a/libre/clojure/PKGBUILD
+++ b/libre/clojure/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=clojure
-pkgver=1.7.0
+pkgver=1.8.0
 pkgrel=1.parabola1
 pkgdesc='LISP for the JVM'
 url='http://clojure.org/'
@@ -16,7 +16,7 @@ source=("$pkgname::git://github.com/clojure/clojure.git#tag=$pkgname-$pkgver"
         'LICENSE.txt'
         'clj.sh' "$pkgname.sh")
 sha256sums=('SKIP'
-            'b04cd1381bc78e40271fc18a1ec7d8e45f630a12fdafe571ace746c3426fb003'
+            'eb5323ca0ff21d1fb3110f059ff1ce47251f1421d1b1b4e4a6958f3c1d0ab8b3'
             '9bcd4c6eac491d1c9bbade5b35182a778fc7e08021de30edc387ac2adce75035'
             '2194819fd417174351172d94e3ccff050479401ca883b57d325a349072200bee'
             'b3fa6257dad10fb39851e87563269b80b2473623126595d9c279bbd90e97f052')
@@ -47,10 +47,10 @@ package() {
   jh mvn-install "org.${pkgname}" ${pkgname} ${pkgver} \
     "pom.xml" \
     "${pkgname}-${pkgver}.jar" \
-    "${pkgname}.jar"
+    "${pkgname}-${pkgver}.jar"
 
-  ln -s "/usr/share/java/${pkgname}.jar" \
-    "${pkgdir}/usr/share/java/${pkgname}-${pkgver}.jar"
+  ln -s "/usr/share/java/${pkgname}-${pkgver}.jar" \
+    "${pkgdir}/usr/share/java/${pkgname}.jar"
 
   install -Dm755 "${srcdir}/clj.sh" "$pkgdir/usr/bin/clj"
   install -Dm755 "${srcdir}/clj.sh" "$pkgdir/usr/bin/clojure"
diff --git a/libre/clojure/clojure-replace_asm.patch b/libre/clojure/clojure-replace_asm.patch
index 0c41a37e9..4fe1a4ef9 100644
--- a/libre/clojure/clojure-replace_asm.patch
+++ b/libre/clojure/clojure-replace_asm.patch
@@ -1,6 +1,6 @@
---- clojure-1.7.0.orig/build.xml	2015-06-30 09:23:20.000000000 -0500
-+++ clojure-1.7.0/build.xml	2015-12-09 17:37:31.497314803 -0500
-@@ -38,6 +38,7 @@
+--- clojure-1.8.0.orig/build.xml	2016-01-19 14:29:20.000000000 -0500
++++ clojure-1.8.0/build.xml	2016-01-23 16:45:54.194673136 -0500
+@@ -40,6 +40,7 @@
    <target name="compile-java" depends="init"
            description="Compile Java sources.">
      <javac srcdir="${jsrc}" destdir="${build}" includeJavaRuntime="yes"
@@ -8,7 +8,7 @@
             includeAntRuntime="false"
             debug="true" source="1.6" target="1.6"/>
    </target>
-@@ -45,7 +46,7 @@
+@@ -47,7 +48,7 @@
    <target name="compile-clojure"
            description="Compile Clojure sources.">
      <java classname="clojure.lang.Compile"
@@ -17,26 +17,26 @@
            failonerror="true"
            fork="true">
        <sysproperty key="clojure.compile.path" value="${build}"/>
-@@ -87,7 +88,7 @@
-     <javac srcdir="${jtestsrc}" destdir="${test-classes}" includeJavaRuntime="yes"
+@@ -92,7 +93,7 @@
             debug="true" source="1.6" target="1.6" includeantruntime="no"/>
+     <echo>Direct linking = ${directlinking}</echo>
      <java classname="clojure.lang.Compile"
 -          classpath="${test-classes}:${test}:${build}:${cljsrc}"
 +          classpath="/usr/share/java/asm-4.jar:/usr/share/java/asm-commons-4.jar:${test-classes}:${test}:${build}:${cljsrc}"
            failonerror="true"
  	  fork="true">
        <sysproperty key="clojure.compile.path" value="${test-classes}"/>
-@@ -106,6 +107,8 @@
-     <java classname="clojure.main" failonerror="true" fork="true">
+@@ -115,6 +116,8 @@
+                    value="#{clojure.test-clojure.compilation.load-ns}"/>
+       <sysproperty key="clojure.compiler.direct-linking" value="${directlinking}"/>
        <classpath>
-         <pathelement path="${maven.test.classpath}"/>
 +        <path location="/usr/share/java/asm-4.jar"/>
 +        <path location="/usr/share/java/asm-commons-4.jar"/>
+         <pathelement path="${maven.test.classpath}"/>
          <path location="${test-classes}"/>
          <path location="${test}"/>
-         <path location="${build}"/>
-@@ -122,6 +125,8 @@
-     <java classname="clojure.main" failonerror="true" fork="true">
+@@ -133,6 +136,8 @@
+       <sysproperty key="clojure.compiler.direct-linking" value="${directlinking}"/>
        <classpath>
          <pathelement path="${maven.test.classpath}"/>
 +        <path location="/usr/share/java/asm-4.jar"/>
@@ -44,9 +44,9 @@
          <path location="${test-classes}"/>
          <path location="${test}"/>
          <path location="${build}"/>
---- clojure-1.7.0.orig/src/clj/clojure/core.clj	2015-06-30 09:23:20.000000000 -0500
-+++ clojure-1.7.0/src/clj/clojure/core.clj	2015-12-09 17:45:49.203841272 -0500
-@@ -5222,10 +5222,10 @@
+--- clojure-1.8.0.orig/src/clj/clojure/core.clj	2016-01-19 14:29:20.000000000 -0500
++++ clojure-1.8.0/src/clj/clojure/core.clj	2016-01-23 16:50:12.926280030 -0500
+@@ -5246,10 +5246,10 @@
                     (.getAnnotation c java.lang.annotation.Retention)] 
            (= (.value r) java.lang.annotation.RetentionPolicy/RUNTIME)))))
  
@@ -59,7 +59,7 @@
    (cond
     (vector? v) (let [avec (.visitArray av name)]
                   (doseq [vval v]
-@@ -5235,7 +5235,7 @@
+@@ -5259,7 +5259,7 @@
                   (cond 
                    (instance? java.lang.Enum ev)
                    (.visitEnum av name (descriptor (class ev)) (str ev))
@@ -68,8 +68,8 @@
                    :else (throw (IllegalArgumentException. 
                                  (str "Unsupported annotation value: " v " of class " (class ev))))))
     (seq? v) (let [[nested nv] v
---- clojure-1.7.0.orig/src/clj/clojure/core_proxy.clj	2015-06-30 09:23:20.000000000 -0500
-+++ clojure-1.7.0/src/clj/clojure/core_proxy.clj	2015-12-09 17:47:21.556152289 -0500
+--- clojure-1.8.0.orig/src/clj/clojure/core_proxy.clj	2016-01-19 14:29:20.000000000 -0500
++++ clojure-1.8.0/src/clj/clojure/core_proxy.clj	2016-01-23 16:51:18.359981058 -0500
 @@ -11,9 +11,9 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;; proxy ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  
@@ -82,8 +82,8 @@
   '(clojure.lang IProxy Reflector DynamicClassLoader IPersistentMap PersistentHashMap RT))
  
  (defn method-sig [^java.lang.reflect.Method meth]
---- clojure-1.7.0.orig/src/clj/clojure/genclass.clj	2015-06-30 09:23:20.000000000 -0500
-+++ clojure-1.7.0/src/clj/clojure/genclass.clj	2015-12-09 17:48:30.376239833 -0500
+--- clojure-1.8.0.orig/src/clj/clojure/genclass.clj	2016-01-19 14:29:20.000000000 -0500
++++ clojure-1.8.0/src/clj/clojure/genclass.clj	2016-01-23 16:52:02.684638807 -0500
 @@ -9,8 +9,8 @@
  (in-ns 'clojure.core)
  
@@ -95,8 +95,19 @@
          '(clojure.lang IPersistentMap))
  
  ;(defn method-sig [^java.lang.reflect.Method meth]
---- clojure-1.7.0.orig/src/jvm/clojure/lang/Compiler.java	2015-06-30 09:23:20.000000000 -0500
-+++ clojure-1.7.0/src/jvm/clojure/lang/Compiler.java	2015-12-09 17:56:08.474634356 -0500
+--- clojure-1.8.0.orig/src/clj/clojure/reflect/java.clj	2016-01-19 14:29:20.000000000 -0500
++++ clojure-1.8.0/src/clj/clojure/reflect/java.clj	2016-01-23 16:58:39.629981468 -0500
+@@ -11,7 +11,7 @@
+ 
+ (require '[clojure.set :as set]
+          '[clojure.string :as str])
+-(import '[clojure.asm ClassReader ClassVisitor Type Opcodes]
++(import '[org.objectweb.asm ClassReader ClassVisitor Type Opcodes]
+          '[java.lang.reflect Modifier]
+          java.io.InputStream)
+ 
+--- clojure-1.8.0.orig/src/jvm/clojure/lang/Compiler.java	2016-01-19 14:29:20.000000000 -0500
++++ clojure-1.8.0/src/jvm/clojure/lang/Compiler.java	2016-01-23 16:56:35.772261713 -0500
 @@ -12,11 +12,12 @@
  
  package clojure.lang;
@@ -104,12 +115,9 @@
 -//*
 +/*
  
--import clojure.asm.*;
--import clojure.asm.commons.GeneratorAdapter;
--import clojure.asm.commons.Method;
-+import org.objectweb.asm.*;
-+import org.objectweb.asm.commons.GeneratorAdapter;
-+import org.objectweb.asm.commons.Method;
+ import clojure.asm.*;
+ import clojure.asm.commons.GeneratorAdapter;
+ import clojure.asm.commons.Method;
 +*/
  
  import java.io.*;
@@ -132,8 +140,8 @@
  
  public class Compiler implements Opcodes{
  
---- clojure-1.7.0.orig/src/jvm/clojure/lang/Intrinsics.java	2015-06-30 09:23:20.000000000 -0500
-+++ clojure-1.7.0/src/jvm/clojure/lang/Intrinsics.java	2015-12-09 17:58:29.934629288 -0500
+--- clojure-1.8.0.orig/src/jvm/clojure/lang/Intrinsics.java	2016-01-19 14:29:20.000000000 -0500
++++ clojure-1.8.0/src/jvm/clojure/lang/Intrinsics.java	2016-01-23 16:57:05.184262012 -0500
 @@ -12,7 +12,7 @@
  
  package clojure.lang;
@@ -143,20 +151,9 @@
  
  public class Intrinsics implements Opcodes{
  private static Object[] oa(Object... arr){
---- clojure-1.7.0.orig/src/clj/clojure/reflect/java.clj	2015-06-30 09:23:20.000000000 -0500
-+++ clojure-1.7.0/src/clj/clojure/reflect/java.clj	2015-12-09 18:02:15.637317716 -0500
-@@ -11,7 +11,7 @@
- 
- (require '[clojure.set :as set]
-          '[clojure.string :as str])
--(import '[clojure.asm ClassReader ClassVisitor Type Opcodes]
-+(import '[org.objectweb.asm ClassReader ClassVisitor Type Opcodes]
-          '[java.lang.reflect Modifier]
-          java.io.InputStream)
- 
---- clojure-1.7.0.orig/test/clojure/test_clojure/reflect.clj	2015-06-30 09:23:20.000000000 -0500
-+++ clojure-1.7.0/test/clojure/test_clojure/reflect.clj	2015-12-09 18:04:43.783663964 -0500
-@@ -25,7 +25,7 @@
+--- clojure-1.8.0.orig/test/clojure/test_clojure/reflect.clj	2016-01-19 14:29:20.000000000 -0500
++++ clojure-1.8.0/test/clojure/test_clojure/reflect.clj	2016-01-23 16:59:58.489740657 -0500
+@@ -26,7 +26,7 @@
  
  (deftest field-descriptor->class-symbol-test
    (are [s d] (= s (@#'reflect/field-descriptor->class-symbol d))
@@ -165,21 +162,21 @@
         'int "I"
         'java.lang.Object "Ljava.lang.Object;"))
  
---- clojure-1.7.0.orig/pom.xml	2015-06-30 09:23:20.000000000 -0500
-+++ clojure-1.7.0/pom.xml	2015-12-09 18:12:28.005103036 -0500
-@@ -69,6 +69,16 @@
+--- clojure-1.8.0.orig/pom.xml	2016-01-19 14:29:20.000000000 -0500
++++ clojure-1.8.0/pom.xml	2016-01-23 17:02:41.205699248 -0500
+@@ -73,6 +73,16 @@
          </exclusion>
        </exclusions>
      </dependency>
 +    <dependency>
 +      <groupId>org.ow2.asm</groupId>
 +      <artifactId>asm</artifactId>
-+      <version>5.0.3</version>
++      <version>5.0.4</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.ow2.asm</groupId>
 +      <artifactId>asm-commons</artifactId>
-+      <version>5.0.3</version>
++      <version>5.0.4</version>
 +    </dependency>
    </dependencies>