From d602b6071fc360f0b248f6cbcf83a080cff2ffa6 Mon Sep 17 00:00:00 2001 From: moparisthebest Date: Sat, 1 Sep 2018 00:37:26 -0400 Subject: [PATCH] Update filebot, truecraft-git --- src/filebot/PKGBUILD | 40 +++++++++++++++++++++---------------- src/filebot/filebot-arch.sh | 4 +++- src/jdk/jdk.install | 2 +- src/truecraft-git/PKGBUILD | 4 ++-- 4 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/filebot/PKGBUILD b/src/filebot/PKGBUILD index 25d5210..be1f98c 100644 --- a/src/filebot/PKGBUILD +++ b/src/filebot/PKGBUILD @@ -6,31 +6,29 @@ # Contributor: Nathan Owe pkgname=filebot -pkgver=4.8.1 +pkgver=4.8.4 pkgrel=1 -_jnaver=4.5.1 -_fixedcommit=0761faded4cfacbb4005a5842d8b89ce0a36f811 +_jnaver=4.5.2 +_fixedcommit=b9572f4501ba9d5af9d445a792fa902274f37679 pkgdesc="The ultimate tool to rename TV/anime shows, download subtitles, and validate checksums." -arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h') +arch=('i686' 'x86_64' 'aarch64' 'armv7l' 'armv7h') url="https://github.com/filebot/filebot" license=('GPL') install=$pkgname.install depends=('java-runtime>=9' 'fontconfig' 'chromaprint') makedepends=('unzip' 'apache-ivy' 'jdk>=9' 'git') -[[ $CARCH == "i686" ]] && _intarch=x86 -[[ $CARCH == "x86_64" ]] && _intarch=x86-64 -[[ $CARCH == "arm" ]] && _intarch=arm -[[ $CARCH == "armv6h" ]] && _intarch=arm -[[ $CARCH == "armv7h" ]] && _intarch=arm +[[ $CARCH == "i686" ]] && _intarch=i686 +[[ $CARCH == "x86_64" ]] && _intarch=x86_64 +[[ $CARCH == "armv7l" ]] && _intarch=armv7l +[[ $CARCH == "armv7h" ]] && _intarch=armv7l source=("${pkgname}::git+https://github.com/filebot/filebot.git" - https://github.com/java-native-access/jna/archive/$_jnaver.tar.gz + #https://github.com/java-native-access/jna/archive/$_jnaver.tar.gz $pkgname-arch.sh $pkgname.svg $pkgname.desktop) md5sums=('SKIP' - '3cf5c206ba2246386af2e9248fa6f035' - '38c3f0029e094043cfca147981d41081' + 'fa7b8d4b811f5d9e0d27cffbb20dc0ee' '04f46be047049448dba3f0de29fe192d' 'f37edd0bba7570904d28ab1681c7a7f3') @@ -45,8 +43,10 @@ prepare() { cd "$srcdir/$pkgname/" git checkout $_fixedcommit sed -i -E 's/release="([^"]*)"/target="\1" source="\1"/' build.xml + sed -i -E 's/-portable.tar.xz/-portable.tar.gz/' build.xml sed -i -E 's/jre.version: 10/jre.version: 9/' app.properties sed -i -E 's/jvm.version: 10/jvm.version: 9/' app.properties + sed -i -E 's/tar.compression: xz/tar.compression: gzip/' app.properties cat <> app.properties url.data: https://app.filebot.net/data @@ -58,19 +58,25 @@ apikey.acoustid: 0B3qZnQc apikey.anidb: filebot apikey.opensubtitles: FileBot EOT - cd "$srcdir/jna-$_jnaver/lib/native/" - unzip linux-$_intarch.jar 2>&1 >/dev/null + #cd "$srcdir/jna-$_jnaver/lib/native/" + #unzip linux-$_intarch.jar 2>&1 >/dev/null } build() { + export JAVA_HOME=/usr/lib/jvm/java-10-jdk cd $pkgname ant resolve - ant fatjar + ant jar + ant tar + cd dist + mkdir portable + tar -xf FileBot_$pkgver-portable.tar.gz -C ./portable } package() { - install -Dm644 $pkgname/dist/FileBot_$pkgver.jar "$pkgdir/usr/share/java/$pkgname/$pkgname.jar" - install -Dm644 jna-$_jnaver/lib/native/libjnidispatch.so "$pkgdir/usr/share/java/$pkgname/libjnidispatch.so" + install -Dm644 $pkgname/dist/portable/lib/Linux-$_intarch/libjnidispatch.so "$pkgdir/usr/share/java/$pkgname/libjnidispatch.so" + cp -dpr --no-preserve=ownership $pkgname/dist/portable/jar/* "$pkgdir/usr/share/java/$pkgname/" + install -Dm755 $pkgname-arch.sh "$pkgdir/usr/bin/$pkgname" install -Dm644 $pkgname.svg "$pkgdir/usr/share/pixmaps/$pkgname.svg" install -Dm644 $pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop" diff --git a/src/filebot/filebot-arch.sh b/src/filebot/filebot-arch.sh index 65cbecb..cbf8ac3 100644 --- a/src/filebot/filebot-arch.sh +++ b/src/filebot/filebot-arch.sh @@ -5,6 +5,8 @@ export LANG="en_US.UTF-8" export LC_ALL="en_US.UTF-8" APP_ROOT=/usr/share/java/filebot +cd $APP_ROOT + # add APP_ROOT to LD_LIBRARY_PATH if [ ! -z "$LD_LIBRARY_PATH" ]; then export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$APP_ROOT" @@ -18,5 +20,5 @@ EXTRACTOR="ApacheVFS" # use Apache Commons VFS2 with junrar plugin # EXTRACTOR="SevenZipNativeBindings" # use the lib7-Zip-JBinding.so native library # start filebot -java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=false -Dapplication.deployment=AUR -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Djna.nosys=false -Djna.nounpack=true -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="fpcalc" -Dapplication.dir=$HOME/.config/filebot -Djava.io.tmpdir=/tmp/filebot -Dapplication.update=skip -Djna.library.path=/usr/share/java $JAVA_OPTS -cp /usr/share/java/filebot/filebot.jar net.filebot.Main "$@" +java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=false -Dapplication.deployment=AUR -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Djna.nosys=false -Djna.nounpack=true -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="fpcalc" -Dapplication.dir=$HOME/.config/filebot -Djava.io.tmpdir=/tmp/filebot -Dapplication.update=skip -Djna.library.path=/usr/share/java/filebot $JAVA_OPTS -cp /usr/share/java/filebot/filebot.jar net.filebot.Main "$@" diff --git a/src/jdk/jdk.install b/src/jdk/jdk.install index 701d44a..8c38f1a 100644 --- a/src/jdk/jdk.install +++ b/src/jdk/jdk.install @@ -1,4 +1,4 @@ -VERSION='10' +VERSION='' THIS_JAVA='java-${VERSION}-jdk' NAME='JDK' diff --git a/src/truecraft-git/PKGBUILD b/src/truecraft-git/PKGBUILD index 97c489b..51432cf 100644 --- a/src/truecraft-git/PKGBUILD +++ b/src/truecraft-git/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=truecraft pkgname=truecraft-git -pkgver=r816.90160bd +pkgver=r817.91b1f5f pkgrel=1 epoch=1 pkgdesc="A completely clean-room implementation of Minecraft beta 1.7.3 (circa September 2011)." @@ -12,7 +12,7 @@ license=('MIT') depends=('mono>=4.0' 'desktop-file-utils' 'gtk2' 'webkitgtk2' 'gtk-sharp-2' 'sdl_mixer') makedepends=('git' 'nuget') source=("${_pkgname}"::"git://github.com/SirCmpwn/TrueCraft.git" - "${_pkgname}.svg"::'https://truecraft.io/static/truecraft_earth.svg') + "${_pkgname}.svg"::'https://raw.githubusercontent.com/SirCmpwn/truecraft.io/master/_static/truecraft_earth.svg') provides=('truecraft') conflicts=('truecraft') md5sums=('SKIP'