From 2d4f70d0030c5b4e68cb60d16b2e8645eadec6f1 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:39 -0400 Subject: [PATCH] jedit: fix name of /etc/profile.d/10_openjdk*.sh, hard-code openjdk11 --- srcpkgs/jedit/files/jedit | 4 +--- srcpkgs/jedit/template | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/jedit/files/jedit b/srcpkgs/jedit/files/jedit index 622bb917186..706d2f8dd45 100644 --- a/srcpkgs/jedit/files/jedit +++ b/srcpkgs/jedit/files/jedit @@ -1,10 +1,8 @@ #!/bin/sh # openjdk11 is required -. /etc/profile.d/10_openjdk11.sh - # default to gtk3, use antialiased fonts -exec "${JAVA_HOME}/bin/java" \ +exec "/usr/lib/jvm/openjdk11/bin/java" \ -Djdk.gtk.version=3 \ -Dawt.useSystemAAFontSettings=on \ -Dswing.aatext=true \ diff --git a/srcpkgs/jedit/template b/srcpkgs/jedit/template index cf7ac8cdd20..19ca4ac3df1 100644 --- a/srcpkgs/jedit/template +++ b/srcpkgs/jedit/template @@ -1,7 +1,7 @@ # Template file for 'jedit' pkgname=jedit version=5.6.0 -revision=1 +revision=2 wrksrc=jEdit hostmakedepends="apache-ant openjdk11 docbook-xsl" depends="openjdk11 desktop-file-utils" @@ -19,7 +19,7 @@ post_patch() { do_build() { . /etc/profile.d/apache-ant.sh - . /etc/profile.d/10_openjdk11.sh + . /etc/profile.d/openjdk.sh ant -propertyfile ${FILESDIR}/build.properties build ant -propertyfile ${FILESDIR}/build.properties docs-html