summaryrefslogtreecommitdiff
path: root/libre/jmol
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2019-10-20 18:25:49 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2019-10-22 11:22:02 -0400
commit1bfb1d0d8e8cbb7d8e8c350031176f9cda9048e9 (patch)
tree3f5cfd06609621420b3bf14eb2bbe94e82d3e175 /libre/jmol
parent596d9f688d563a3d301f651afdfe48a66d7a3d18 (diff)
downloadabslibre-1bfb1d0d8e8cbb7d8e8c350031176f9cda9048e9.tar.gz
abslibre-1bfb1d0d8e8cbb7d8e8c350031176f9cda9048e9.tar.bz2
abslibre-1bfb1d0d8e8cbb7d8e8c350031176f9cda9048e9.zip
[jmol]: upgrade to v14.29.54 (unpublished - patches need re-working)
Diffstat (limited to 'libre/jmol')
-rw-r--r--libre/jmol/PKGBUILD22
1 files changed, 14 insertions, 8 deletions
diff --git a/libre/jmol/PKGBUILD b/libre/jmol/PKGBUILD
index cfcc5dd92..acce98829 100644
--- a/libre/jmol/PKGBUILD
+++ b/libre/jmol/PKGBUILD
@@ -1,8 +1,14 @@
# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>
+# Contributor (Arch): James Spencer <james.s.spencer@gmail.com>
+
+# parabola changes and rationale:
+# - arch package not built from source
pkgname=jmol
-pkgver=14.29.3
-pkgrel=1.parabola1
+pkgver=14.29.54
+pkgrel=1
+pkgrel+=.parabola1
pkgdesc="a Java 3D viewer for chemical structures"
arch=(any)
url="https://jmol.sourceforge.net"
@@ -12,12 +18,13 @@ makedepends=('apache-ant-contrib' 'icedtea-web' 'java-commons-cli' 'java-naga' '
source=("https://downloads.sourceforge.net/jmol/Jmol-$pkgver-full.tar.gz"
'jmol-dontsign.patch'
'jmol-build.patch')
-sha256sums=('36f36f47195827fa1a6d248bf62c797b2856c541a531ff5c82faf5242d1db322'
+sha256sums=('3f95a4b860f355e18e83df2ecb619802fa09d4d8ff6171b87ece79ed6e5adce8'
'3356db7f8c61c77a96269b245ec55835e2fa399efab43350979449b6802d8f39'
'42e9c4e6a3df0341c3af985ed8b5bf4ba662ddbecd1f296c460076bfc20f5670')
prepare() {
cd $pkgname-$pkgver
+
rm src/com/sparshui/cpp/HPTouchSmart/*.{dll,exe}
rm -v {.,jars,plugin-jars,tools}/*.jar
rm -v doc/jcfl-*.tar.gz
@@ -34,12 +41,11 @@ prepare() {
build() {
cd $pkgname-$pkgver
- ant classes \
- -lib /usr/share/java/ant-contrib.jar
+
+ ant classes -lib /usr/share/java/ant-contrib.jar
jar -cvf jars/JSpecView.jar -C build/classes/ jspecview
- ant init jar applet-jar doc \
- -lib /usr/share/java/ant-contrib.jar
+ ant init jar applet-jar doc -lib /usr/share/java/ant-contrib.jar
}
package() {
@@ -59,7 +65,7 @@ package() {
install -d "$pkgdir/usr/share/$pkgname"
cp build/{Jmol,JmolData,JmolLib}.jar "$pkgdir/usr/share/$pkgname"
cp jars/JSpecView.jar "$pkgdir/usr/share/$pkgname"
- cp build/jmol.sh "$pkgdir/usr/share/$pkgname"
+ install -m755 build/jmol.sh "$pkgdir/usr/share/$pkgname/jmol.sh"
install -d "$pkgdir/usr/bin"
ln -s "/usr/share/$pkgname/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"