Update to javascript version

4 files changed, 25 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4b205ddf8ea1..bb2da7473624 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,19 @@
 pkgbase = circuit-simulator
 	pkgdesc = Electronic circuit simulator written by Paul Falstad
-	pkgver = 1.6
-	pkgrel = 5
-	url = http://www.falstad.com/circuit-java
-	arch = any
+	pkgver = 9.3.2
+	pkgrel = 1
+	url = http://www.falstad.com/circuit
+	arch = x86_64
 	license = GPL
-	makedepends = unzip
+	makedepends = tar
 	makedepends = imagemagick
-	depends = java-runtime>=6
+	depends = libglvnd
 	depends = hicolor-icon-theme
-	depends = bash
-	source = http://www.falstad.com/circuit-java/circuit.zip
-	source = circuit-simulator
+	source = http://www.falstad.com/circuit/offline/circuitjs1-linux64.tgz
+	source = http://www.falstad.com/circuit/favicon.ico
 	source = circuit.desktop
-	md5sums = 392f5956d1153755949b167842ccd7cc
-	md5sums = f6f1a25d07ebe8d2322950e8a52f7877
+	md5sums = 7b6f2b26165630882ce25f09aaa869a3
+	md5sums = 062a9b61267bbef5e406a41b20a7d6a7
 	md5sums = deaff8b1646089d6c2c737dcbc540255
 
 pkgname = circuit-simulator
-
diff --git a/PKGBUILD b/PKGBUILD
index 04da7d00d9df..106d2d4e9a4e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,27 @@
 # Maintainer: Ákos Uzonyi <uzonyi.akos@gmail.com>
 pkgname=circuit-simulator
-pkgver=1.6
-pkgrel=5
+pkgver=9.3.2
+pkgrel=1
 pkgdesc="Electronic circuit simulator written by Paul Falstad"
-arch=("any")
-url="http://www.falstad.com/circuit-java"
+arch=("x86_64")
+url="http://www.falstad.com/circuit"
 license=("GPL")
-depends=("java-runtime>=6" "hicolor-icon-theme" "bash")
-makedepends=("unzip" "imagemagick")
-source=("http://www.falstad.com/circuit-java/circuit.zip" "circuit-simulator" "circuit.desktop")
-md5sums=("392f5956d1153755949b167842ccd7cc"
-         "f6f1a25d07ebe8d2322950e8a52f7877"
-	     "deaff8b1646089d6c2c737dcbc540255"
-)
+depends=("libglvnd" "hicolor-icon-theme")
+makedepends=("tar" "imagemagick")
+source=("http://www.falstad.com/circuit/offline/circuitjs1-linux64.tgz" "http://www.falstad.com/circuit/favicon.ico" "circuit.desktop")
+md5sums=("7b6f2b26165630882ce25f09aaa869a3" "062a9b61267bbef5e406a41b20a7d6a7" "deaff8b1646089d6c2c737dcbc540255")
 
 package() {
 	cd "$srcdir"
-	
+
 	OPT_DIR="$pkgdir/opt/$pkgname"
 	mkdir -pm 755 "$OPT_DIR"
-	unzip circuit.zip -d "$OPT_DIR"
-	chmod -R 644 "$OPT_DIR"
-	chmod -R +X "$OPT_DIR"
-	
-	install -D -m755 "${srcdir}/circuit-simulator" "${pkgdir}/usr/bin/circuit-simulator"
+	tar -xf circuitjs1-linux64.tgz -C "$OPT_DIR"
+
+	mkdir -pm 755 "${pkgdir}/usr/bin"
+	ln -s /opt/circuit-simulator/circuitjs1/circuitjs1 "${pkgdir}/usr/bin/circuit-simulator"
 	install -D -m644 "${srcdir}/circuit.desktop" "${pkgdir}/usr/share/applications/circuit.desktop"
-	
-	mkdir -pm 755 "${pkgdir}/usr/share/icons/hicolor/16x16/apps"
-	convert "${OPT_DIR}/favicon.ico" "${pkgdir}/usr/share/icons/hicolor/16x16/apps/circuit.png"
 
-	SOURCE_DIR="${pkgdir}/usr/src/$pkgname"
-	mkdir -pm 755 "$SOURCE_DIR"
-	unzip "${OPT_DIR}/src.zip" -d "$SOURCE_DIR"
+	mkdir -pm 755 "${pkgdir}/usr/share/icons/hicolor/16x16/apps"
+	convert "favicon.ico" "${pkgdir}/usr/share/icons/hicolor/16x16/apps/circuit.png"
 }
diff --git a/circuit b/circuit
deleted file mode 100755
index 82f2721e184d..000000000000
--- a/circuit
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd /opt/circuit
-exec java -jar circuit.jar
diff --git a/circuit-simulator b/circuit-simulator
deleted file mode 100755
index 973ecea288cf..000000000000
--- a/circuit-simulator
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd /opt/circuit-simulator
-exec java -jar circuit.jar