From e29021a86cf734d53a6183fbe4685351fa0d5271 Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Fri, 3 Mar 2017 00:52:51 -0500
Subject: jmol-14.9.1-1.parabola1: updating version

---
 libre/jmol/PKGBUILD                   | 13 +++++---
 libre/jmol/jmol-14.6.4_dontsign.patch | 63 -----------------------------------
 libre/jmol/jmol-build.patch           | 20 +++++++++++
 libre/jmol/jmol-dontsign.patch        | 63 +++++++++++++++++++++++++++++++++++
 4 files changed, 91 insertions(+), 68 deletions(-)
 delete mode 100644 libre/jmol/jmol-14.6.4_dontsign.patch
 create mode 100644 libre/jmol/jmol-build.patch
 create mode 100644 libre/jmol/jmol-dontsign.patch

(limited to 'libre/jmol')

diff --git a/libre/jmol/PKGBUILD b/libre/jmol/PKGBUILD
index 1dc7299fb..76e30fd31 100644
--- a/libre/jmol/PKGBUILD
+++ b/libre/jmol/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=jmol
-pkgver=14.8.0
+pkgver=14.9.1
 pkgrel=1.parabola1
 pkgdesc="a Java 3D viewer for chemical structures"
 arch=(any)
@@ -10,9 +10,11 @@ license=(LGPL)
 depends=('java-runtime')
 makedepends=('apache-ant-contrib' 'icedtea-web' 'java-commons-cli' 'java-naga' 'saxon6' 'unzip')
 source=("http://downloads.sourceforge.net/jmol/Jmol-$pkgver-full.tar.gz"
-        'jmol-14.6.4_dontsign.patch')
-sha1sums=('f98f5db2cbfefa6d2b22cf627d674896a5d881e3'
-          '03c3ba2a05d0e2192a627b6cd00219b5e4389e75')
+        'jmol-dontsign.patch'
+        'jmol-build.patch')
+sha256sums=('c3b9086308a96cdd898ffde57cf6a86cdc9431007a1f46f0500597387c55333a'
+            '3356db7f8c61c77a96269b245ec55835e2fa399efab43350979449b6802d8f39'
+            '42e9c4e6a3df0341c3af985ed8b5bf4ba662ddbecd1f296c460076bfc20f5670')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -21,7 +23,8 @@ prepare() {
   rm -v doc/jcfl-*.tar.gz
   rm -v jsmol.zip
 
-  patch -Np1 -i ../jmol-14.6.4_dontsign.patch
+  patch -Np1 -i ../jmol-dontsign.patch
+  patch -Np1 -i ../jmol-build.patch
 
   ln -sf /usr/share/icedtea-web/plugin.jar jars/netscape.jar
   ln -sf /usr/share/java/commons-cli.jar jars/commons-cli-1.2.jar
diff --git a/libre/jmol/jmol-14.6.4_dontsign.patch b/libre/jmol/jmol-14.6.4_dontsign.patch
deleted file mode 100644
index daccac469..000000000
--- a/libre/jmol/jmol-14.6.4_dontsign.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- jmol-14.6.4_2016.10.02.orig/build.xml	2016-10-02 23:01:03.000000000 -0500
-+++ jmol-14.6.4_2016.10.02/build.xml	2016-11-09 18:43:28.077873627 -0500
-@@ -159,7 +159,7 @@
-     </fileset>
-   </path>
- 
--  <target name="main" id="main" depends="init,jar,applet-jar,signed-applet,smiles-applet-jar"/>
-+  <target name="main" id="main" depends="init,jar,applet-jar,smiles-applet-jar"/>
-   
-   <target name="all" id="all" depends="doc,main"/>
- 
-@@ -520,10 +520,10 @@
-       <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
-       <fileset dir="src/org/jmol/translation/JmolApplet" includes="Messages*.class"/>
-     </jar>
--    <antcall target="sign-jar-file">
-+    <!--<antcall target="sign-jar-file">
-       <param name="sign-jar-file-dir" value="build" />
-       <param name="sign-jar-file-name"  value="Jmol.jar" />
--    </antcall>
-+    </antcall>-->
-   	
-     <jar destfile="build/JmolData.jar"
-          manifest="manifest/applicationData.txt">
-@@ -555,10 +555,10 @@
-       <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
-       <fileset dir="src/org/jmol/translation/JmolApplet" includes="Messages*.class"/>
-     </jar>
--    <antcall target="sign-jar-file">
-+    <!--<antcall target="sign-jar-file">
-       <param name="sign-jar-file-dir" value="build" />
-       <param name="sign-jar-file-name"  value="JmolData.jar" />
--    </antcall>
-+    </antcall>-->
- 
-     <copy todir="build">
-       <fileset dir=".">
-@@ -586,10 +586,10 @@
-       </fileset>
-       <fileset dir="${appjars.dir}" includes="**/*"/>
-     </jar>
--    <antcall target="sign-jar-file">
-+    <!--<antcall target="sign-jar-file">
-       <param name="sign-jar-file-dir" value="build" />
-       <param name="sign-jar-file-name"  value="Jvxl.jar" />
--    </antcall>
-+    </antcall>-->
-   	<!--
-     <jar destfile="ChimeToJmol.jar"
-          manifest="manifest/chimetojmol.txt">
-@@ -1163,10 +1163,10 @@
-       </indexjars>
-     </jar>
-   	<echo> signing JmolApplet*.jar</echo>
--    <antcall target="sign-jar-file">
-+    <!--<antcall target="sign-jar-file">
-       <param name="sign-jar-file-dir" value="build" />
-       <param name="sign-jar-file-name"  value="JmolApplet*.jar" />
--    </antcall>
-+    </antcall>-->
-   </else></if>
-   </target>
- 
diff --git a/libre/jmol/jmol-build.patch b/libre/jmol/jmol-build.patch
new file mode 100644
index 000000000..855b45cce
--- /dev/null
+++ b/libre/jmol/jmol-build.patch
@@ -0,0 +1,20 @@
+--- jmol-14.9.1.orig/build.xml	2017-03-02 23:51:27.039100000 -0500
++++ jmol-14.9.1/build.xml	2017-03-02 23:57:43.422441631 -0500
+@@ -64,7 +64,7 @@
+   <!-- pull developer-specific settings from their home directory -->
+   <property file="${user.home}/.jmol.build.properties" />
+   <!-- compile options -->
+-  <property name="build.sysclasspath" value="ignore" />
++  <property name="build.sysclasspath" value="last" />
+   <property name="build.compiler" value="javac1.6" />
+   <!-- for some reason, I can't get ant to use this ${java.version}
+        property as the value of the source parameter -->
+@@ -97,7 +97,7 @@
+   <echo message="version=${version}" />
+   <property name="jvxl_version" value="0.1" />
+ 
+-  <input message="private property file:" addproperty="Private.propertyFile" defaultValue="none" />
++  <!--<input message="private property file:" addproperty="Private.propertyFile" defaultValue="none" />-->
+   <if><available file="${Private.propertyFile}" /><then>
+   	<property file="${Private.propertyFile}" />
+ 	<echo>using ${Private.keystore} ${Private.storetype}</echo>
diff --git a/libre/jmol/jmol-dontsign.patch b/libre/jmol/jmol-dontsign.patch
new file mode 100644
index 000000000..daccac469
--- /dev/null
+++ b/libre/jmol/jmol-dontsign.patch
@@ -0,0 +1,63 @@
+--- jmol-14.6.4_2016.10.02.orig/build.xml	2016-10-02 23:01:03.000000000 -0500
++++ jmol-14.6.4_2016.10.02/build.xml	2016-11-09 18:43:28.077873627 -0500
+@@ -159,7 +159,7 @@
+     </fileset>
+   </path>
+ 
+-  <target name="main" id="main" depends="init,jar,applet-jar,signed-applet,smiles-applet-jar"/>
++  <target name="main" id="main" depends="init,jar,applet-jar,smiles-applet-jar"/>
+   
+   <target name="all" id="all" depends="doc,main"/>
+ 
+@@ -520,10 +520,10 @@
+       <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
+       <fileset dir="src/org/jmol/translation/JmolApplet" includes="Messages*.class"/>
+     </jar>
+-    <antcall target="sign-jar-file">
++    <!--<antcall target="sign-jar-file">
+       <param name="sign-jar-file-dir" value="build" />
+       <param name="sign-jar-file-name"  value="Jmol.jar" />
+-    </antcall>
++    </antcall>-->
+   	
+     <jar destfile="build/JmolData.jar"
+          manifest="manifest/applicationData.txt">
+@@ -555,10 +555,10 @@
+       <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
+       <fileset dir="src/org/jmol/translation/JmolApplet" includes="Messages*.class"/>
+     </jar>
+-    <antcall target="sign-jar-file">
++    <!--<antcall target="sign-jar-file">
+       <param name="sign-jar-file-dir" value="build" />
+       <param name="sign-jar-file-name"  value="JmolData.jar" />
+-    </antcall>
++    </antcall>-->
+ 
+     <copy todir="build">
+       <fileset dir=".">
+@@ -586,10 +586,10 @@
+       </fileset>
+       <fileset dir="${appjars.dir}" includes="**/*"/>
+     </jar>
+-    <antcall target="sign-jar-file">
++    <!--<antcall target="sign-jar-file">
+       <param name="sign-jar-file-dir" value="build" />
+       <param name="sign-jar-file-name"  value="Jvxl.jar" />
+-    </antcall>
++    </antcall>-->
+   	<!--
+     <jar destfile="ChimeToJmol.jar"
+          manifest="manifest/chimetojmol.txt">
+@@ -1163,10 +1163,10 @@
+       </indexjars>
+     </jar>
+   	<echo> signing JmolApplet*.jar</echo>
+-    <antcall target="sign-jar-file">
++    <!--<antcall target="sign-jar-file">
+       <param name="sign-jar-file-dir" value="build" />
+       <param name="sign-jar-file-name"  value="JmolApplet*.jar" />
+-    </antcall>
++    </antcall>-->
+   </else></if>
+   </target>
+ 
-- 
cgit v1.2.3