diff options
| author | Square | 2019-05-23 00:18:34 +0200 |
|---|---|---|
| committer | Square | 2019-05-23 00:18:34 +0200 |
| commit | 55ee2c70b4cc58b38c3b9dfbd445015026561754 (patch) | |
| tree | 7a3acd4b82601967c7d29cd60c5897f514e636b0 | |
| parent | 97b993416221daf0739683cd738183e68ded29f6 (diff) | |
| download | aur-55ee2c70b4cc58b38c3b9dfbd445015026561754.tar.gz | |
Fix pkgbuild for amd64 java with sugg fix from r-9
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | PKGBUILD | 37 |
3 files changed, 24 insertions, 22 deletions
@@ -1,7 +1,7 @@ pkgbase = jameica-nightly pkgdesc = Jameica is a free Java application platform pkgver = 2.9.0 - pkgrel = 3 + pkgrel = 4 url = http://www.willuhn.de/products/jameica/ arch = any license = GPL diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..49cd88453da7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +pkg +src +*.xz +*.zip +.* +!.SRCINFO +!.gitignore @@ -5,8 +5,8 @@ pkgname=jameica-nightly pkgver=2.9.0 -pkgrel=3 -pkgdesc="Jameica Plattform" +pkgrel=4 +pkgdesc="Jameica is a free Java application platform" arch=('any') url="http://www.willuhn.de/products/jameica/" license=('GPL') @@ -23,26 +23,21 @@ package() { # remove local swt lib rm -rf "$pkgdir"/usr/share/java/jameica/lib/swt/linux64 - if [ "$CARCH" = "armv6h" ] || [ "$CARCH" = "armv7h" ] || [ "$CARCH" = "aarch64" ]; then - - # adjust classpath in order to use system swt - unzip "$pkgdir"/usr/share/java/jameica/jameica-linux64.jar \ + # adjust classpath in order to use system swt + unzip "$pkgdir"/usr/share/java/jameica/jameica-linux64.jar \ -d "$pkgdir"/usr/share/java/jameica/unzipped - sed -i 's|lib/swt/linux64/swt.jar|/usr/share/java/swt.jar|g' \ - "$pkgdir"/usr/share/java/jameica/unzipped/META-INF/MANIFEST.MF - - pushd "$pkgdir"/usr/share/java/jameica/unzipped - zip -r ../jameica-linux64.jar * - popd - - # remove dead bodies - rm -rf "$pkgdir"/usr/share/java/jameica/unzipped - - # link jameica-linux64.jar to jameica-linux.jar - ln -s /usr/share/java/jameica/jameica-linux64.jar \ - "$pkgdir"/usr/share/java/jameica/jameica-linux.jar - - fi + sed -i 's|lib/swt/linux64/swt.jar|/usr/share/java/swt.jar|g' \ + "$pkgdir"/usr/share/java/jameica/unzipped/META-INF/MANIFEST.MF + + pushd "$pkgdir"/usr/share/java/jameica/unzipped + zip -r ../jameica-linux64.jar * + popd + + # remove dead bodies + rm -rf "$pkgdir"/usr/share/java/jameica/unzipped + # link jameica-linux64.jar to jameica-linux.jar + ln -s /usr/share/java/jameica/jameica-linux64.jar \ + "$pkgdir"/usr/share/java/jameica/jameica-linux.jar install -m 644 "$srcdir"/jameica.desktop "$pkgdir"/usr/share/applications } |