mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-03 16:47:21 -08:00
Alexander Puck Neuwirth
4469d66676
Closes: https://bugs.gentoo.org/955476 Closes: https://bugs.gentoo.org/890784 Part-of: https://github.com/gentoo/gentoo/pull/43644 Closes: https://github.com/gentoo/gentoo/pull/43644 Signed-off-by: Alexander Puck Neuwirth <apn-pucky@gentoo.org>
62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
|
|
We are changing the javac -soure value from 1.4 to java-pkg_get-source
|
|
and java-pkg_get-target which is supported by all Java versions presently
|
|
available in ::gentoo.
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -123,7 +123,7 @@ AC_ARG_WITH(javagui,
|
|
[ --with-javagui Compile and install the java-based GUI.])
|
|
|
|
if test "x$with_javagui" != "xno"; then
|
|
- THEPEG_HAS_JAVA([1.4], [], [with_javagui=no; AC_MSG_NOTICE([Java GUI disabled])])
|
|
+ THEPEG_HAS_JAVA([JAVA_PKG_GET_SOURCE], [], [with_javagui=no; AC_MSG_NOTICE([Java GUI disabled])])
|
|
fi
|
|
|
|
AM_CONDITIONAL([JAVAGUI], [test "x$with_javagui" != "xno"])
|
|
--- a/java/Makefile.am
|
|
+++ b/java/Makefile.am
|
|
@@ -11,8 +12,7 @@ JAVASOURCES = SetupThePEG.java ObjectFrame.java \
|
|
|
|
CLEANFILES = ThePEG.jar thepeg.sh
|
|
|
|
-jardir = $(pkglibdir)
|
|
-nodist_jar_DATA = ThePEG.jar
|
|
+noinst_DATA = ThePEG.jar
|
|
|
|
dist_noinst_DATA = $(JAVASOURCES) jar-manifest
|
|
|
|
@@ -27,14 +27,14 @@ clean-local:
|
|
ThePEG:
|
|
mkdir -p ThePEG
|
|
for file in $(JAVASOURCES) jar-manifest; do \
|
|
- cd ThePEG; $(LN_S) ../$(srcdir)/$$file $$file; cd ..; done
|
|
+ cd ThePEG; cp ../$(srcdir)/$$file $$file; cd ..; done
|
|
|
|
ThePEG.jar: ThePEG $(JAVASOURCES)
|
|
- $(JAVAC) `for file in $(JAVASOURCES); do echo ThePEG/$$file; done`
|
|
+ $(JAVAC) -source JAVA_PKG_GET_SOURCE -target JAVA_PKG_GET_TARGET `for file in $(JAVASOURCES); do echo ThePEG/$$file; done`
|
|
$(JAR) cmf ThePEG/jar-manifest ThePEG.jar ThePEG/*.class
|
|
|
|
thepeg.sh: thepeg.install Makefile
|
|
- sed -e s:@pkglibdir[@]:$(pkglibdir):g \
|
|
+ sed -e s:@datadir[@]:$(datadir):g \
|
|
-e s:@bindir[@]:$(bindir):g \
|
|
-e s:@java[@]:$(JAVA):g $(srcdir)/thepeg.install > thepeg.sh
|
|
chmod +x thepeg.sh
|
|
--- a/java/thepeg.install
|
|
+++ b/java/thepeg.install
|
|
@@ -1,6 +1,6 @@
|
|
#!/bin/sh
|
|
|
|
-pkglibdir=@pkglibdir@
|
|
+source @datadir@/thepeg/package.env
|
|
bindir=@bindir@
|
|
|
|
ThePEG_CMD="${bindir}/setupThePEG"
|
|
@@ -19,4 +19,4 @@
|
|
|
|
|
|
|
|
-exec @java@ ${HEADLESS} -jar ${pkglibdir}/ThePEG.jar ${ThePEG_CMD} "$@"
|
|
+exec @java@ ${HEADLESS} -jar ${CLASSPATH} ${ThePEG_CMD} "$@"
|