diff options
| -rw-r--r-- | libre/jmol/PKGBUILD | 13 | ||||
| -rw-r--r-- | libre/jmol/jmol-build.patch | 20 | ||||
| -rw-r--r-- | libre/jmol/jmol-dontsign.patch (renamed from libre/jmol/jmol-14.6.4_dontsign.patch) | 0 |
3 files changed, 28 insertions, 5 deletions
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-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-14.6.4_dontsign.patch b/libre/jmol/jmol-dontsign.patch index daccac469..daccac469 100644 --- a/libre/jmol/jmol-14.6.4_dontsign.patch +++ b/libre/jmol/jmol-dontsign.patch |