diff options
| -rw-r--r-- | libre/jmol/PKGBUILD | 10 | ||||
| -rw-r--r-- | libre/jmol/jmol-build.patch | 10 | ||||
| -rw-r--r-- | libre/jmol/jmol-dontsign.patch | 32 |
3 files changed, 28 insertions, 24 deletions
diff --git a/libre/jmol/PKGBUILD b/libre/jmol/PKGBUILD index acce98829..19b94c64f 100644 --- a/libre/jmol/PKGBUILD +++ b/libre/jmol/PKGBUILD @@ -11,16 +11,16 @@ pkgrel=1 pkgrel+=.parabola1 pkgdesc="a Java 3D viewer for chemical structures" arch=(any) -url="https://jmol.sourceforge.net" +url="http://jmol.sourceforge.net" license=(LGPL) -depends=('java-runtime') -makedepends=('apache-ant-contrib' 'icedtea-web' 'java-commons-cli' 'java-naga' 'saxon6' 'unzip') +depends=('jre8-openjdk') +makedepends=('apache-ant-contrib' 'icedtea-web' 'java-commons-cli' 'java-naga' 'jdk8-openjdk' 'saxon6' 'unzip') source=("https://downloads.sourceforge.net/jmol/Jmol-$pkgver-full.tar.gz" 'jmol-dontsign.patch' 'jmol-build.patch') sha256sums=('3f95a4b860f355e18e83df2ecb619802fa09d4d8ff6171b87ece79ed6e5adce8' - '3356db7f8c61c77a96269b245ec55835e2fa399efab43350979449b6802d8f39' - '42e9c4e6a3df0341c3af985ed8b5bf4ba662ddbecd1f296c460076bfc20f5670') + '5ba0a1feb1a0ced57d285885747a32b31cca424f286fbae6112522dcb3d6d915' + '1d37510f8fd0d3a75382c7f0bbb0d6fc3308e4e26295774c10d1f8ae53eef3f4') prepare() { cd $pkgname-$pkgver diff --git a/libre/jmol/jmol-build.patch b/libre/jmol/jmol-build.patch index 855b45cce..3256fdc98 100644 --- a/libre/jmol/jmol-build.patch +++ b/libre/jmol/jmol-build.patch @@ -1,6 +1,8 @@ ---- 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 @@ +diff --git a/build.xml b/build.xml +index bae9a5d..9a9fc88 100644 +--- a/build.xml ++++ b/build.xml +@@ -59,7 +59,7 @@ when the Jmol code is modified, is as follows: <!-- pull developer-specific settings from their home directory -->
<property file="${user.home}/.jmol.build.properties" />
<!-- compile options -->
@@ -9,7 +11,7 @@ <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 @@ +@@ -92,7 +92,7 @@ when the Jmol code is modified, is as follows: <echo message="version=${version}" />
<property name="jvxl_version" value="0.1" />
diff --git a/libre/jmol/jmol-dontsign.patch b/libre/jmol/jmol-dontsign.patch index daccac469..381dfcf0c 100644 --- a/libre/jmol/jmol-dontsign.patch +++ b/libre/jmol/jmol-dontsign.patch @@ -1,18 +1,20 @@ ---- 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>
-
+diff --git a/build.xml b/build.xml +index 2c891f0..bae9a5d 100644 +--- a/build.xml ++++ b/build.xml +@@ -321,7 +321,7 @@ Release Note: When releasing stable version, remove "-beta" +
+
+
- <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>
+@@ -685,10 +685,10 @@ all support for previous versions removed +
+ <echo message="Creating Jmol.jar -- if this fails, check to see that build/Jmol.jar is not open." />
+
- <antcall target="sign-jar-file">
+ <!--<antcall target="sign-jar-file">
<param name="sign-jar-file-dir" value="build" />
@@ -22,9 +24,9 @@ <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"/>
+@@ -724,10 +724,10 @@ all support for previous versions removed + </fileset>
+ <fileset dir="${appjars.dir}" includes="**/cli/** **/naga/**" />
</jar>
- <antcall target="sign-jar-file">
+ <!--<antcall target="sign-jar-file">
@@ -35,7 +37,7 @@ <copy todir="build">
<fileset dir=".">
-@@ -586,10 +586,10 @@ +@@ -755,10 +755,10 @@ all support for previous versions removed </fileset>
<fileset dir="${appjars.dir}" includes="**/*"/>
</jar>
@@ -48,7 +50,7 @@ <!--
<jar destfile="ChimeToJmol.jar"
manifest="manifest/chimetojmol.txt">
-@@ -1163,10 +1163,10 @@ +@@ -1309,10 +1309,10 @@ all support for previous versions removed </indexjars>
</jar>
<echo> signing JmolApplet*.jar</echo>
|