diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | jameica-start-script.patch | 37 | ||||
| -rw-r--r-- | jameicaserver-start-script.patch | 33 |
4 files changed, 53 insertions, 47 deletions
@@ -1,7 +1,7 @@ pkgbase = jameica pkgdesc = free runtime environment for java applications - pkgver = 2.6.4 - pkgrel = 3 + pkgver = 2.6.5 + pkgrel = 1 url = https://www.willuhn.de/products/jameica/ install = jameica.install arch = i686 @@ -15,13 +15,13 @@ pkgbase = jameica source = jameica-start-script.patch source = jameicaserver-start-script.patch source = jameica.install - sha1sums = a6a696d465929f373d6c0d469463aa28b0f4c11f - sha1sums = 05ca5cf474523db10789eea9cb483cdf12d8549b + sha1sums = 05df02b44e3d4f44e9b63c72eb68880413b20cdc + sha1sums = a7cd3dff30d8513a2d00f9b3c69938ad230e7287 sha1sums = 39c008050c7f90f3fde05b849cba80559207bdb5 - source_i686 = jameica-2.6.4.zip::https://www.willuhn.de/projects/jameica/releases/2.6/jameica/jameica-linux.zip - sha1sums_i686 = f659abd95ac062846f14c067fea5061bd5c4cd54 - source_x86_64 = jameica-2.6.4.zip::https://www.willuhn.de/projects/jameica/releases/2.6/jameica/jameica-linux64.zip - sha1sums_x86_64 = 7d3d6104b75d41b0baebdf7cbbdf3fca64012e13 + source_i686 = jameica-2.6.5.zip::https://www.willuhn.de/projects/jameica/releases/2.6/jameica/jameica-linux.zip + sha1sums_i686 = 794f42ff28f38a8d133cbc2537b9d7839dae9ad0 + source_x86_64 = jameica-2.6.5.zip::https://www.willuhn.de/projects/jameica/releases/2.6/jameica/jameica-linux64.zip + sha1sums_x86_64 = 794f42ff28f38a8d133cbc2537b9d7839dae9ad0 pkgname = jameica @@ -1,8 +1,8 @@ # former Maintainer: Bjoern Franke <bjo@nord-west.org> pkgname=jameica -pkgver=2.6.4 +pkgver=2.6.5 _pkgver=2.6 -pkgrel=3 +pkgrel=1 pkgdesc="free runtime environment for java applications" arch=('i686' 'x86_64') url="https://www.willuhn.de/products/jameica/" @@ -13,15 +13,15 @@ makedepends=('unzip') install="jameica.install" # See https://willuhn.de/products/jameica/download.php for checksums source_i686=("${pkgname}-${pkgver}.zip::https://www.willuhn.de/projects/jameica/releases/$_pkgver/jameica/$pkgname-linux.zip") -sha1sums_i686=('f659abd95ac062846f14c067fea5061bd5c4cd54') +sha1sums=('9aa6aed3ffc50c8f01497d0332ff24d21f7189bf' + '79be8955392bf3dfade9c0118ee4d72f081e07b8' + '39c008050c7f90f3fde05b849cba80559207bdb5') +sha1sums_i686=('794f42ff28f38a8d133cbc2537b9d7839dae9ad0') +sha1sums_x86_64=('794f42ff28f38a8d133cbc2537b9d7839dae9ad0') source_x86_64=("${pkgname}-${pkgver}.zip::https://www.willuhn.de/projects/jameica/releases/$_pkgver/jameica/$pkgname-linux64.zip") -sha1sums_x86_64=('7d3d6104b75d41b0baebdf7cbbdf3fca64012e13') source=("jameica-start-script.patch" "jameicaserver-start-script.patch" "jameica.install") -sha1sums=('a6a696d465929f373d6c0d469463aa28b0f4c11f' - '05ca5cf474523db10789eea9cb483cdf12d8549b' - '39c008050c7f90f3fde05b849cba80559207bdb5') prepare() { patch jameica/jameica.sh jameica-start-script.patch diff --git a/jameica-start-script.patch b/jameica-start-script.patch index 820f0f1a3b5e..1b15af5f90ad 100644 --- a/jameica-start-script.patch +++ b/jameica-start-script.patch @@ -1,17 +1,20 @@ -6c6 -< #_JCONSOLE="-Dcom.sun.management.jmxremote" ---- -> cd /opt/jameica -11,13d10 -< link=$(readlink -f "$0") -< dir=$(dirname "$link") -< cd "$dir" -21c18,23 -< LIBOVERLAY_SCROLLBAR=0 GDK_NATIVE_WINDOWS=1 SWT_GTK3=0 exec java -Djava.net.preferIPv4Stack=true -Xmx512m $_JCONSOLE -jar jameica-linux${archsuffix}.jar $@ ---- -> # enable to use the default version of java provided by java-runtime-common -> #_java=/usr/bin/java -> # use java 8 for mashup plugin -> _java=/usr/lib/jvm/java-8-openjdk/jre/bin/java -> -> LIBOVERLAY_SCROLLBAR=0 GDK_NATIVE_WINDOWS=1 SWT_GTK3=0 exec $_java -Djava.net.preferIPv4Stack=true -Xmx512m $_JCONSOLE -jar jameica-linux${archsuffix}.jar $@ +diff --git a/jameica.sh b/jameica.sh +index 589e3dd..347922e 100755 +--- a/jameica.sh ++++ b/jameica.sh +@@ -3,14 +3,7 @@ + # Linux Start-Script fuer regulaeren Standalone-Betrieb. + # Jameica wird hierbei mit GUI gestartet. + +-#_JCONSOLE="-Dcom.sun.management.jmxremote" +- +-# https://www.willuhn.de/bugzilla/show_bug.cgi?id=774 +-# https://www.willuhn.de/bugzilla/show_bug.cgi?id=798 +- +-link=$(readlink -f "$0") +-dir=$(dirname "$link") +-cd "$dir" ++cd /opt/jameica + + if uname -m |grep -q 64; then + archsuffix="64" diff --git a/jameicaserver-start-script.patch b/jameicaserver-start-script.patch index 416cec6ad4ec..f34bb4f7ef82 100644 --- a/jameicaserver-start-script.patch +++ b/jameicaserver-start-script.patch @@ -1,15 +1,18 @@ -6,8c6 -< link=$(readlink -f "$0") -< dir=$(dirname "$link") -< cd "$dir" ---- -> cd /opt/jameica -14c12,17 -< java -Djava.net.preferIPv4Stack=true -Xmx256m $_JCONSOLE -jar jameica-linux.jar -d $@ ---- -> # enable to use the default version of java provided by java-runtime-common -> #_java=/usr/bin/java -> # use java 8 for mashup plugin -> _java=/usr/lib/jvm/java-8-openjdk/jre/bin/java -> -> $_java -Djava.net.preferIPv4Stack=true -Xmx256m $_JCONSOLE -jar jameica-linux.jar -d $@ +diff --git a/jameicaserver b/jameicaserver +index 8c2e5ff..4f232cc 100755 +--- a/jameicaserver ++++ b/jameicaserver +@@ -3,12 +3,8 @@ + # Linux Start-Script fuer Server-Betrieb. + # Jameica wird hierbei OHNE GUI gestartet. + +-link=$(readlink -f "$0") +-dir=$(dirname "$link") +-cd "$dir" ++cd /opt/jameica + + #_JCONSOLE="-Dcom.sun.management.jmxremote" + +-# https://www.willuhn.de/bugzilla/show_bug.cgi?id=798 +- + java -Djava.net.preferIPv4Stack=true -Xmx512m $_JCONSOLE -jar jameica-linux.jar -d $@ |