From d098fa4efb52085d1ec416c52b4d0dff72b64c09 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 5 May 2022 11:41:49 -0400 Subject: [PATCH] freeplane: update to 1.9.14, hard-code jdk11 --- srcpkgs/freeplane/patches/jdk11-default.patch | 15 +++++++++++++++ srcpkgs/freeplane/template | 11 +++++------ 2 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/freeplane/patches/jdk11-default.patch diff --git a/srcpkgs/freeplane/patches/jdk11-default.patch b/srcpkgs/freeplane/patches/jdk11-default.patch new file mode 100644 index 00000000000000..2f27d35af84a8c --- /dev/null +++ b/srcpkgs/freeplane/patches/jdk11-default.patch @@ -0,0 +1,15 @@ +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 67a233224e9a5f..1c65ce682b38f6 100644 --- a/srcpkgs/freeplane/template +++ b/srcpkgs/freeplane/template @@ -1,17 +1,16 @@ # Template file for 'freeplane' pkgname=freeplane -version=1.9.12 -revision=2 +version=1.9.14 +revision=1 wrksrc="freeplane-release-${version}" -hostmakedepends="apache-ant openjdk8 unzip gradle" -depends="virtual?java-runtime" +hostmakedepends="apache-ant openjdk11 unzip gradle" +depends="openjdk11-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=200002b5cbe3e3286a7595847d28356d3efd8498ff930fa05e5e90af622e544f -broken="https://build.voidlinux.org/builders/x86_64_builder/builds/37505/steps/shell_3/logs/stdio" +checksum=8c463c997675b0e351724673e9ca6357f4ef47bd9df0c49b73645090fb19cd7f make_dirs=" /usr/share/freeplane/fwdir/condperm/ 755 root root