diff options
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 24 | ||||
-rw-r--r-- | bluej | 30 |
3 files changed, 35 insertions, 29 deletions
@@ -1,6 +1,6 @@ pkgbase = bluej pkgdesc = A free Java Development Environment designed for beginners, used by millions worlwide. - pkgver = 5.1.0 + pkgver = 5.2.0 pkgrel = 1 url = https://www.bluej.org arch = any @@ -10,18 +10,18 @@ pkgbase = bluej license = CDDL license = CPL license = custom + makedepends = zstd depends = gtk2 depends = archlinux-java-run depends = java-runtime=17 depends = java-environment=17 depends = java17-openjfx - noextract = BlueJ-linux-510.deb - source = https://www.bluej.org/download/files/BlueJ-linux-510.deb + source = https://www.bluej.org/download/files/BlueJ-linux-520.deb source = bluej source = bluej.desktop source = bluej.xml - sha256sums = b4e6f5e7053d3a352dd03f25fc991a1988fce0bec75781549d0401e5c440c46d - sha256sums = fa1e1b8524e32ec4151565b901411a08458855e4a8f2a77ae77827af86db85a9 + sha256sums = b0e4fcea8a4c6bdcadc4995f51122c0f4e8788ffa3fa8cf7950d03aa62d5d701 + sha256sums = 6154ee3e8a270fc7831ffef58cce202ed435f56b0e16636fdbeee891fb1e079d sha256sums = a845f3997ce91cfb1eeb882f4a6e1e4408b7a7d7c2e164495b5a077bdf353e7f sha256sums = e05453bd791b34ab6cfd6b67250dd18210f47505344b7980ad28bf922c014772 @@ -8,35 +8,43 @@ # Contributor: zerathidune <zerathidune @ gmail . com> pkgname=bluej -pkgver=5.1.0 +pkgver=5.2.0 pkgrel=1 pkgdesc="A free Java Development Environment designed for beginners, used by millions worlwide." arch=('any') url="https://www.${pkgname}.org" license=('GPL2' 'Apache' 'BSD' 'CDDL' 'CPL' 'custom') depends=('gtk2' 'archlinux-java-run' 'java-runtime=17' 'java-environment=17' 'java17-openjfx') +makedepends=('zstd') source=("https://www.${pkgname}.org/download/files/BlueJ-linux-${pkgver//.}.deb" "${pkgname}" "${pkgname}.desktop" "${pkgname}.xml") -noextract=("BlueJ-linux-${pkgver//.}.deb") -sha256sums=('b4e6f5e7053d3a352dd03f25fc991a1988fce0bec75781549d0401e5c440c46d' - 'fa1e1b8524e32ec4151565b901411a08458855e4a8f2a77ae77827af86db85a9' +#noextract=("BlueJ-linux-${pkgver//.}.deb") +sha256sums=('b0e4fcea8a4c6bdcadc4995f51122c0f4e8788ffa3fa8cf7950d03aa62d5d701' + '6154ee3e8a270fc7831ffef58cce202ed435f56b0e16636fdbeee891fb1e079d' 'a845f3997ce91cfb1eeb882f4a6e1e4408b7a7d7c2e164495b5a077bdf353e7f' 'e05453bd791b34ab6cfd6b67250dd18210f47505344b7980ad28bf922c014772') + +prepare() { + cd "${srcdir}" + tar --use-compress-program=unzstd -xvf data.tar.zst +} package() { cd "${srcdir}" -ar p "BlueJ-linux-${pkgver//.}.deb" data.tar.xz | tar xJ mkdir -p "${pkgdir}/opt/${pkgname}" mkdir -p "${pkgdir}/usr/share/doc/${pkgname}/examples" -rm -R "usr/share/${pkgname}/javafx" -rm -R "usr/share/${pkgname}/jdk" +#rm -R "usr/share/${pkgname}/javafx" +#rm -R "usr/share/${pkgname}/jdk" +#cd "usr/share/${pkgname}" +#find -type f -name "javafx-*" -delete +#cd "${srcdir}" cp -r "usr/share/${pkgname}" "${pkgdir}/opt" -cp -r usr/share/doc/BlueJ/*/ "${pkgdir}/usr/share/doc/${pkgname}/examples" +#cp -r usr/share/doc/BlueJ/*/ "${pkgdir}/usr/share/doc/${pkgname}/examples" install -Dm755 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}" install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" @@ -1,25 +1,23 @@ #!/bin/sh -if [ -e /usr/lib/jvm/java-17-openjfx/lib ]; then - JAVAFXPATH=/usr/lib/jvm/java-17-openjfx +if [ -e /usr/lib/jvm/java-20-openjfx/lib ]; then + JAVAFXPATH=/usr/lib/jvm/java-20-openjfx/lib else - JAVAFXPATH=/usr/lib/jvm/java-17-openjdk + JAVAFXPATH=/usr/lib/jvm/java-20-openjdk/lib fi -CP="/opt/bluej/bluej.jar" -JAVAFXJARS="$JAVAFXPATH/lib/javafx.base.jar" -JAVAFXJARS="$JAVAFXJARS:$JAVAFXPATH/lib/javafx.controls.jar" -JAVAFXJARS="$JAVAFXJARS:$JAVAFXPATH/lib/javafx.fxml.jar" -JAVAFXJARS="$JAVAFXJARS:$JAVAFXPATH/lib/javafx.graphics.jar" -JAVAFXJARS="$JAVAFXJARS:$JAVAFXPATH/lib/javafx.media.jar" -JAVAFXJARS="$JAVAFXJARS:$JAVAFXPATH/lib/javafx.properties.jar" -JAVAFXJARS="$JAVAFXJARS:$JAVAFXPATH/lib/javafx.swing.jar" -JAVAFXJARS="$JAVAFXJARS:$JAVAFXPATH/lib/javafx.web.jar" +CP="/opt/bluej/boot.jar" +#JAVAFXJARS="$JAVAFXPATH/javafx.base.jar" +#JAVAFXJARS="$JAVAFXJARS:$JAVAFXPATH/javafx.controls.jar" +#JAVAFXJARS="$JAVAFXJARS:$JAVAFXPATH/javafx.fxml.jar" +#JAVAFXJARS="$JAVAFXJARS:$JAVAFXPATH/javafx.graphics.jar" +#JAVAFXJARS="$JAVAFXJARS:$JAVAFXPATH/javafx.media.jar" +#JAVAFXJARS="$JAVAFXJARS:$JAVAFXPATH/javafx.swing.jar" +#JAVAFXJARS="$JAVAFXJARS:$JAVAFXPATH/javafx.web.jar" +JAVAFXJARS=`ls -1 /opt/bluej/javafx* | paste -sd ":" -` CP="$CP:$JAVAFXJARS" -JFXRTOPT="-javafxpath=$JAVAFXPATH" -JFXRTOPT2="-javafxjars=$JAVAFXJARS" -archlinux-java-run -a 17 -b 17 -- \ +archlinux-java-run -a 20 -b 20 -- \ -Djdk.gtk.version=2 \ -Dawt.useSystemAAFontSettings=on -Xmx512M \ - -cp "$CP" bluej.Boot ${JFXRTOPT:+"$JFXRTOPT"} ${JFXRTOPT2:+"$JFXRTOPT2"} \ + -cp "$CP" bluej.Boot \ "$@" |