v1.9.0

4 files changed, 50 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6092f824f5e8..92a6ce9afd70 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
 pkgbase = commonist
 	pkgdesc = A file upload tool for mediawiki using its api.php interface
-	pkgver = 1.7.0
+	pkgver = 1.9.0
 	pkgrel = 1
 	url = https://commons.wikimedia.org/wiki/Commons:Commonist
 	arch = any
 	license = GPL3
+	makedepends = sbt
 	depends = java-environment
-	source = http://neonstau.de/commonist/commonist-1.7.0.zip
-	sha256sums = 6c10c4e1e5f1a40fd0d554b89dc39dc2ff0a25ed8a1252d1a62b27f3a5f160e0
+	depends = bash
+	source = https://github.com/ritschwumm/commonist/archive/v-1.9.0.tar.gz
+	sha256sums = dda17d59f8824fd01c49d8516969e592a7425e64ec459a88d606e345f3f054e6
 
 pkgname = commonist
 
diff --git a/.gitignore b/.gitignore
index 0684ea4c8d05..69086f6396b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 /*.pkg.tar.xz
-/*.zip
+/*.tar.gz
 /pkg
 /src
diff --git a/PKGBUILD b/PKGBUILD
index 8dd566c52aac..55e21bccd1dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,59 @@
 # Maintainer: Sanpi <sanpi+aur@homecomputing.fr>
 pkgname=commonist
-pkgver=1.7.0
+pkgver=1.9.0
 pkgrel=1
 pkgdesc='A file upload tool for mediawiki using its api.php interface'
 url="https://commons.wikimedia.org/wiki/Commons:Commonist"
 arch=('any')
 license=('GPL3')
-depends=('java-environment')
-source=("http://neonstau.de/commonist/$pkgname-$pkgver.zip")
-sha256sums=('6c10c4e1e5f1a40fd0d554b89dc39dc2ff0a25ed8a1252d1a62b27f3a5f160e0')
+depends=('java-environment' 'bash')
+makedepends=('sbt')
+source=("https://github.com/ritschwumm/$pkgname/archive/v-$pkgver.tar.gz")
+sha256sums=('dda17d59f8824fd01c49d8516969e592a7425e64ec459a88d606e345f3f054e6')
 
 prepare()
 {
-    cd "$pkgname-$pkgver"
+    deps=(
+        'https://github.com/ritschwumm/xsbt-util'
+        'https://github.com/ritschwumm/xsbt-classpath'
+        'https://github.com/ritschwumm/xsbt-webstart'
+        'https://github.com/ritschwumm/xsbt-scriptstart'
+        'https://github.com/ritschwumm/xsbt-osxapp'
+        'https://github.com/ritschwumm/xsbt-capsule'
+        'https://github.com/ritschwumm/scutil'
+        'https://github.com/ritschwumm/scjson'
+    )
 
-    patch -Np1 -i "${srcdir}/../commonist.patch"
+    for dep in ${deps[*]}
+    do
+        if [ ! -e $(basename $dep) ]
+        then
+            git clone $dep
+        fi
+
+        cd $(basename $dep)
+        sbt publishLocal
+        cd -
+    done
+}
+
+build()
+{
+    cd "$pkgname-v-$pkgver"
+
+    sbt bundle
 }
 
 package()
 {
-    cd "$pkgname-$pkgver"
+    cd "$pkgname-v-$pkgver"
+
+    install --mode 755 --directory "$pkgdir/usr/lib/commonist"
+    install --mode 644 target/scala-2.12/scriptstart/commonist-1.9.0/lib/*.jar "$pkgdir/usr/lib/commonist"
 
     install --mode 755 --directory "$pkgdir/usr/bin"
-    install --mode 755 commonist "$pkgdir/usr/bin"
+    install --mode 755 target/scala-2.12/scriptstart/commonist-1.9.0/commonist "$pkgdir/usr/bin"
 
-    install --mode 755 --directory "$pkgdir/usr/lib/commonist"
-    install --mode 644 lib/*.jar "$pkgdir/usr/lib/commonist"
+    cd "$pkgdir"
+    patch -Np1 -i "${srcdir}/../commonist.patch"
 }
diff --git a/commonist.patch b/commonist.patch
index cc3c879e9adf..53a71d1fa09e 100644
--- a/commonist.patch
+++ b/commonist.patch
@@ -1,9 +1,9 @@
---- a/commonist	2017-02-21 01:12:30.000000000 +0100
-+++ b/commonist	2017-07-18 15:32:53.250098995 +0200
+--- a/usr/bin/commonist	2018-10-21 12:37:02.711656186 +0200
++++ b/usr/bin/commonist	2018-10-21 12:37:21.512134783 +0200
 @@ -19,4 +19,4 @@
  	BASE="$(dirname "$0")"
  fi
  
--exec java '-Xmx192m'  "-Dscriptstart.base=$BASE" -cp "$BASE"/'lib/minibpp-src.jar':"$BASE"/'lib/minibpp.jar':"$BASE"/'lib/bsh-2.0b2-fixed.jar':"$BASE"/'lib/httpclient-4.5.3.jar':"$BASE"/'lib/scjson-ast_2.12-0.108.0.jar':"$BASE"/'lib/httpmime-4.5.3.jar':"$BASE"/'lib/commons-logging-1.2.jar':"$BASE"/'lib/commons-codec-1.9.jar':"$BASE"/'lib/macify-1.6.jar':"$BASE"/'lib/httpcore-4.4.6.jar':"$BASE"/'lib/scmw_2.12-0.103.0.jar':"$BASE"/'lib/sanselan-0.97-incubator.jar':"$BASE"/'lib/scutil-core_2.12-0.98.0.jar':"$BASE"/'lib/scutil-base_2.12-0.98.0.jar':"$BASE"/'lib/scutil-swing_2.12-0.98.0.jar':"$BASE"/'lib/scjson-codec_2.12-0.108.0.jar':"$BASE"/'lib/scala-library-2.12.1.jar':"$BASE"/'lib/commonist-1.7.0.jar' 'commonist.Commonist'  "$@"
+-exec java '-Xmx192m'  "-Dscriptstart.base=$BASE" -cp "$BASE"/'lib/bsh-2.0b2-fixed.jar':"$BASE"/'lib/minibpp.jar':"$BASE"/'lib/minibpp-src.jar':"$BASE"/'lib/commons-logging-1.2.jar':"$BASE"/'lib/commons-codec-1.10.jar':"$BASE"/'lib/scutil-base_2.12.jar':"$BASE"/'lib/macify-1.6.jar':"$BASE"/'lib/httpcore-4.4.10.jar':"$BASE"/'lib/httpclient-4.5.6.jar':"$BASE"/'lib/sanselan-0.97-incubator.jar':"$BASE"/'lib/scala-library.jar':"$BASE"/'lib/scutil-swing_2.12.jar':"$BASE"/'lib/httpmime-4.5.6.jar':"$BASE"/'lib/scjson-ast_2.12.jar':"$BASE"/'lib/scjson-codec_2.12.jar':"$BASE"/'lib/scutil-core_2.12.jar':"$BASE"/'lib/commonist-1.9.0.jar' 'commonist.Commonist'  "$@"
 \ Pas de fin de ligne à la fin du fichier
-+exec java '-Xmx192m'  "-Dscriptstart.base=$BASE" -cp "$BASE"/'../lib/commonist/minibpp-src.jar':"$BASE"/'../lib/commonist/minibpp.jar':"$BASE"/'../lib/commonist/bsh-2.0b2-fixed.jar':"$BASE"/'../lib/commonist/httpclient-4.5.3.jar':"$BASE"/'../lib/commonist/scjson-ast_2.12-0.108.0.jar':"$BASE"/'../lib/commonist/httpmime-4.5.3.jar':"$BASE"/'../lib/commonist/commons-logging-1.2.jar':"$BASE"/'../lib/commonist/commons-codec-1.9.jar':"$BASE"/'../lib/commonist/macify-1.6.jar':"$BASE"/'../lib/commonist/httpcore-4.4.6.jar':"$BASE"/'../lib/commonist/scmw_2.12-0.103.0.jar':"$BASE"/'../lib/commonist/sanselan-0.97-incubator.jar':"$BASE"/'../lib/commonist/scutil-core_2.12-0.98.0.jar':"$BASE"/'../lib/commonist/scutil-base_2.12-0.98.0.jar':"$BASE"/'../lib/commonist/scutil-swing_2.12-0.98.0.jar':"$BASE"/'../lib/commonist/scjson-codec_2.12-0.108.0.jar':"$BASE"/'../lib/commonist/scala-library-2.12.1.jar':"$BASE"/'../lib/commonist/commonist-1.7.0.jar' 'commonist.Commonist'  "$@"
++exec java '-Xmx192m'  "-Dscriptstart.base=$BASE" -cp "$BASE"/'../lib/commonist/bsh-2.0b2-fixed.jar':"$BASE"/'../lib/commonist/minibpp.jar':"$BASE"/'../lib/commonist/minibpp-src.jar':"$BASE"/'../lib/commonist/commons-logging-1.2.jar':"$BASE"/'../lib/commonist/commons-codec-1.10.jar':"$BASE"/'../lib/commonist/scutil-base_2.12.jar':"$BASE"/'../lib/commonist/macify-1.6.jar':"$BASE"/'../lib/commonist/httpcore-4.4.10.jar':"$BASE"/'../lib/commonist/httpclient-4.5.6.jar':"$BASE"/'../lib/commonist/sanselan-0.97-incubator.jar':"$BASE"/'../lib/commonist/scala-library.jar':"$BASE"/'../lib/commonist/scutil-swing_2.12.jar':"$BASE"/'../lib/commonist/httpmime-4.5.6.jar':"$BASE"/'../lib/commonist/scjson-ast_2.12.jar':"$BASE"/'../lib/commonist/scjson-codec_2.12.jar':"$BASE"/'../lib/commonist/scutil-core_2.12.jar':"$BASE"/'../lib/commonist/commonist-1.9.0.jar' 'commonist.Commonist'  "$@"