Updated to 10.2.0

3 files changed, 15 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d77ad917f98b..b9f99fbfafa4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = chemdoodle
 	pkgdesc = Chemical and Biological Publishing Software
-	pkgver = 8.1.0
+	pkgver = 10.2.0
 	pkgrel = 1
 	url = http://www.chemdoodle.com
-	arch = i686
 	arch = x86_64
 	license = custom
 	makedepends = gendesk
@@ -14,14 +13,11 @@ pkgbase = chemdoodle
 	depends = libxslt
 	depends = libxxf86vm
 	depends = alsa-lib
-	depends = gcc-libs-multilib
+	source = https://www.ichemlabs.com/downloads/ChemDoodle-linux-10.2.0.bin
 	source = chemdoodle.patch
-	md5sums = c1643ffbec64d90fa742cb4d1844f769
-	source_i686 = https://www.chemdoodle.com/downloads/ChemDoodle-linux-i586-8.1.0.bin
-	depends_i686 = gcc-libs
-	md5sums_i686 = e696fe450574d10ae6901a83d53d463f
-	source_x86_64 = https://www.chemdoodle.com/downloads/ChemDoodle-linux-8.1.0.bin
-	md5sums_x86_64 = 86e02b29a825b3a2e7a73cd022427faa
+	md5sums = 09ff47af09fb12412e5da6b5860e0283
+	md5sums = 23e25ceff4ee4d1580a09e5ca709fdc7
+	depends_x86_64 = gcc-libs-multilib
 
 pkgname = chemdoodle
 
diff --git a/PKGBUILD b/PKGBUILD
index 21c5657953f5..0a5b08efe042 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Dan McCurry <dan.mccurry at linux dot com>
 pkgname=chemdoodle
-pkgver=8.1.0
+pkgver=10.2.0
 pkgrel=1
 pkgdesc="Chemical and Biological Publishing Software"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.chemdoodle.com"
 license=('custom')
 depends=('java-runtime-common'
@@ -16,12 +16,10 @@ depends=('java-runtime-common'
 depends_x86_64=('gcc-libs-multilib')
 depends_i686=('gcc-libs')
 makedepends=('gendesk')
-source=("$pkgname.patch")
-source_x86_64=("https://www.chemdoodle.com/downloads/ChemDoodle-linux-${pkgver}.bin")
-source_i686=("https://www.chemdoodle.com/downloads/ChemDoodle-linux-i586-${pkgver}.bin")
-md5sums=('c1643ffbec64d90fa742cb4d1844f769')
-md5sums_i686=('e696fe450574d10ae6901a83d53d463f')
-md5sums_x86_64=('86e02b29a825b3a2e7a73cd022427faa')
+source=("https://www.ichemlabs.com/downloads/ChemDoodle-linux-${pkgver}.bin"
+	"$pkgname.patch")
+md5sums=('09ff47af09fb12412e5da6b5860e0283'
+         '23e25ceff4ee4d1580a09e5ca709fdc7')
 
 _installer=ChemDoodle
 
@@ -54,7 +52,7 @@ package() {
 	install -Dm644 "ChemDoodle.jar" \
 		"$pkgdir/opt/ChemDoodle/ChemDoodle.jar"
 
-	cp -R {njre,docs,external,resources,config} \
+	cp -R {docs,external,resources,config} \
 		$pkgdir/opt/ChemDoodle/
 	find $pkgdir/opt/ChemDoodle/ -type f -exec chmod 644 {} \;
 	find $pkgdir/opt/ChemDoodle/ -type d -exec chmod 755 {} \;
diff --git a/chemdoodle.patch b/chemdoodle.patch
index b730e705f9e8..579e074d5e14 100644
--- a/chemdoodle.patch
+++ b/chemdoodle.patch
@@ -1,7 +1,6 @@
-diff -aur ChemDoodle.pristine/ChemDoodle ChemDoodle/ChemDoodle
---- ChemDoodle.pristine/ChemDoodle	2016-08-03 12:21:31.620610882 -0500
-+++ ChemDoodle/ChemDoodle	2016-08-03 12:23:29.742378065 -0500
-@@ -4,20 +4,20 @@
+--- ChemDoodle/ChemDoodle	2020-01-24 17:38:48.000000000 +0100
++++ ChemDoodle/ChemDoodle	2020-02-09 20:45:52.339713369 +0100
+@@ -4,9 +4,9 @@
  #
  clear
  
@@ -13,18 +12,3 @@ diff -aur ChemDoodle.pristine/ChemDoodle ChemDoodle/ChemDoodle
  PATH=$JAVA_HOME/bin:$PATH
  export ICL_APP_DIR ICL_FROM_SHELL JAVA_HOME PATH
  
- if [ "$ICL_APP_DIR" != "" -a -d $ICL_APP_DIR/njre ]
- then
--  if [ -d $ICL_APP_DIR/jre ]
-+  if [ -d /tmp/jre ]
-   then
--    rm -rf $ICL_APP_DIR/jre
-+    rm -rf /tmp/jre
-   fi
--  mv $ICL_APP_DIR/njre $ICL_APP_DIR/jre
--  chmod 0755 $ICL_APP_DIR/jre/bin/*
-+  cp -R $ICL_APP_DIR/njre /tmp/jre
-+  chmod 0755 /tmp/jre/bin/*
- fi
- 
- $JAVA_HOME/bin/java `cat $ICL_APP_DIR/ChemDoodle.ini` -jar $ICL_APP_DIR/ChemDoodle.jar $*