Update j8-git to 1.4.2-2

2 files changed, 11 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ca798c40b88..08fbc7ad758a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = j8-git
 	pkgdesc = J is a modern, high-level, general-purpose, high-performance programming language
 	pkgver = 1.4.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.jsoftware.com
 	arch = i686
 	arch = x86_64
@@ -13,12 +13,10 @@ pkgbase = j8-git
 	depends = qt5-webengine
 	depends = wget
 	depends = pcre
-	source = http://www.jsoftware.com/download/j701_b_source.tar.gz
 	source = http://www.jsoftware.com/gitlist/qtide.git/zipball/master
-	source = http://www.databaserossoverde.it/jsoftware/j804_env_20150620.tar.gz
-	md5sums = 2ef8f28c383665258588300587263294
+	source = http://www.databaserossoverde.it/jsoftware/j804_env_20150622.tar.gz
 	md5sums = SKIP
-	md5sums = d331e03cd54f50a07efa8ea980d2c5cf
+	md5sums = 2c3b921dcb2ce7f23a4836fd11eeaa0c
 
 pkgname = j8-git
 
diff --git a/PKGBUILD b/PKGBUILD
index ec6d7c57fc20..9d385f411b47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,20 @@
 
 pkgname=j8-git
 pkgver=1.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc='J is a modern, high-level, general-purpose, high-performance programming language'
 arch=('i686' 'x86_64')
 url='http://www.jsoftware.com'
 license=('GPL3'  'LGPL')
 depends=('ncurses' 'qt5-tools' 'qt5-websockets' 'qt5-webengine' 'wget' 'pcre')
-source=('http://www.jsoftware.com/download/j701_b_source.tar.gz' 'http://www.jsoftware.com/gitlist/qtide.git/zipball/master' 'http://www.databaserossoverde.it/jsoftware/j804_env_20150620.tar.gz')
-md5sums=('2ef8f28c383665258588300587263294' 'SKIP' 'd331e03cd54f50a07efa8ea980d2c5cf')
+source=('http://www.jsoftware.com/gitlist/qtide.git/zipball/master' 'http://www.databaserossoverde.it/jsoftware/j804_env_20150622.tar.gz')
+md5sums=('SKIP' '2c3b921dcb2ce7f23a4836fd11eeaa0c')
 if [ "${CARCH}" = x86_64 ]; then
 _xarch=x86_64
+_noarch=i686
 else
 _xarch=x86
+_noarch=x86_64
 fi
 
 pkgver() {
@@ -21,22 +23,7 @@ _version=$(sed -n -e 2p "${srcdir}"/lib/lib.pro)
 echo ${_version:10}
 }
 
-prepare() {
-cd "${srcdir}"/jgplsrc
-sed -i 's@# readline=1@readline=1@' bin/jconfig
-sed -i 's@# LIBREADLINE=" -ledit -lncurses "@LIBREADLINE=" -ledit -lncurses "@' bin/jconfig
-sed -i 's@-W1,soname,libj.so@-Wl,-soname,libj.so@' bin/jconfig
-sed -i 's@#define SY_ALIGN.*@#define SY_ALIGN 1@' js.h
-if [ "${CARCH}" = x86_64 ]; then
-sed -i 's@bits=32@bits=64@' bin/jconfig
-fi
-}
-
 build() {
-cd "${srcdir}"/jgplsrc
-bin/build_jconsole
-bin/build_libj
-bin/build_defs
 cd "${srcdir}"/lib
 qmake && make
 cd "${srcdir}"/main
@@ -46,9 +33,9 @@ qmake && make
 package() {
 cd "${srcdir}"
 cp -a jenv/* "${pkgdir}"/
-cp -a jgplsrc/j/bin/jconsole "${pkgdir}"/usr/lib/j8/bin/
-cp -a jgplsrc/j/bin/libj.so "${pkgdir}"/usr/lib/j8/bin/
-cp -a jgplsrc/j/system/defs "${pkgdir}"/usr/lib/j8/system/
+mv "${pkgdir}"/usr/lib/j8/bin/"${CARCH}"/* "${pkgdir}"/usr/lib/j8/bin/
+rm -d "${pkgdir}"/usr/lib/j8/bin/"${CARCH}"
+rm -r "${pkgdir}"/usr/lib/j8/bin/"${_noarch}"
 cp -a bin/linux-"${_xarch}"/release/*  "${pkgdir}"/usr/lib/j8/bin/
 echo "${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.xz (Arch Linux package)" > ${pkgdir}/usr/lib/j8/bin/installer.txt
 chown -R nobody:nobody "${pkgdir}"/srv/j8