diff --git a/srcpkgs/freeplane/patches/jdk11-default.patch b/srcpkgs/freeplane/patches/jdk11-default.patch deleted file mode 100644 index 2f27d35af84a8c..00000000000000 --- a/srcpkgs/freeplane/patches/jdk11-default.patch +++ /dev/null @@ -1,15 +0,0 @@ -freeplane does not work with jdk17, so set jdk11 as the default. -This can be overridden by the upstream-created method still. - ---- a/freeplane_framework/script/freeplane.sh -+++ b/freeplane_framework/script/freeplane.sh -@@ -5,6 +5,9 @@ - set -x - fi - -+# set openjdk11 as the default, regardless of xbps-alternatives -+[ -z "$FREEPLANE_JAVA_HOME" ] && FREEPLANE_JAVA_HOME=/usr/lib/jvm/openjdk11 -+ - ########## FUNCTIONS DEFINITIONS ####################################### - - _debug() { diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template index e98b19dc01e6af..7a3a8c6a10b38e 100644 --- a/srcpkgs/freeplane/template +++ b/srcpkgs/freeplane/template @@ -1,15 +1,15 @@ # Template file for 'freeplane' pkgname=freeplane -version=1.9.14 +version=1.12.14 revision=1 -hostmakedepends="apache-ant openjdk11 unzip gradle" -depends="openjdk11-jre" +hostmakedepends="apache-ant openjdk17 unzip gradle" +depends="openjdk17-jre" short_desc="Application for Mind Mapping, Knowledge Management, Project Management" maintainer="Andrea Brancaleoni " license="GPL-2.0-or-later" homepage="http://freeplane.sourceforge.net/" -distfiles="https://github.com/freeplane/freeplane/archive/release-${version}.tar.gz" -checksum=8c463c997675b0e351724673e9ca6357f4ef47bd9df0c49b73645090fb19cd7f +distfiles="https://github.com/freeplane/freeplane/archive/refs/tags/release-${version}.tar.gz" +checksum=f089558abc3d8b5c17618ae105d5bdc3a53828fe24a5ab8a21b729a61618767b make_dirs=" /usr/share/freeplane/fwdir/condperm/ 755 root root @@ -29,12 +29,24 @@ do_build() { do_install() { unzip DIST/freeplane_bin-$version.zip -d install - find install -type f -name \*.exe -delete - vmkdir usr/share/$pkgname - mv install/$pkgname-$version/* $DESTDIR/usr/share/$pkgname + isrc="install/freeplane-$version" + case "$XBPS_MACHINE" in + x86_64*) vinstall $isrc/libflatlaf-linux-x86_64.so 644 usr/lib ;; + arm*) vinstall $isrc/libflatlaf-linux-arm64.so 644 usr/lib ;; + esac + # Remove already installed and not needed files + rm -f $isrc/freeplane.bat + rm -f $isrc/freeplane.png + rm -f $isrc/freeplane256.png + rm -f $isrc/*.dll + rm -f $isrc/*.so + rm -f $isrc/license.txt + # Install rest vmkdir usr/bin - ln -s /usr/share/freeplane/freeplane.sh $DESTDIR/usr/bin/$pkgname vmkdir usr/share/pixmaps + vmkdir usr/share/freeplane + mv install/freeplane-$version/* $DESTDIR/usr/share/freeplane + ln -s /usr/share/freeplane/freeplane.sh $DESTDIR/usr/bin/freeplane ln -s /usr/share/freeplane/freeplane.svg $DESTDIR/usr/share/pixmaps/freeplane.svg vinstall $FILESDIR/freeplane.desktop 644 usr/share/applications }