diff -rupN tuxguitar-1.5.4-src.org/misc/tuxguitar.sh tuxguitar-1.5.4-src/misc/tuxguitar.sh --- tuxguitar-1.5.4-src.org/misc/tuxguitar.sh 2020-05-12 13:46:29.000000000 -0400 +++ tuxguitar-1.5.4-src/misc/tuxguitar.sh 2021-10-30 14:21:17.810700369 -0400 @@ -116,21 +116,18 @@ env_() [ -z ${JAVA_HOME} ] && t=$(java_guess_) && [ -d "$t" ] && JAVA_HOME="$t" if [ -d "${JAVA_HOME}" ] ; then export JAVA_HOME - JAVA="${JAVA:=${JAVA_HOME}/jre/bin/java}" + JAVA="${JAVA:=${JAVA_HOME}/bin/java}" [ -x ${JAVA} ] && export JAVA else JAVA=${JAVA:=java} export JAVA fi -# mozilla - [ -z ${MOZILLA_FIVE_HOME} ] \ - && t=$(mozilla_guess_) && [ -d "$t" ] && MOZILLA_FIVE_HOME="$t" - if [ -d "$MOZILLA_FIVE_HOME" ] ; then - export MOZILLA_FIVE_HOME - export LD_LIBRARY_PATH="$MOZILLA_FIVE_HOME" - else - echo '$MOZILLA_FIVE_HOME not valid : check doc shipped w/ tuxguitar' + # mozilla + if [ -z $MOZILLA_FIVE_HOME ]; then + MOZILLA_FIVE_HOME=/usr/lib64/firefox + [ ! -d ${MOZILLA_FIVE_HOME} ] && MOZILLA_FIVE_HOME=/usr/lib64/mozilla + [ ! -d ${MOZILLA_FIVE_HOME} ] && MOZILLA_FIVE_HOME=/usr/lib64/iceweasel fi [ ! -z ${DEBUG} ] && echo "# MOZILLA_FIVE_HOME=${MOZILLA_FIVE_HOME}" @@ -141,10 +138,10 @@ env_() tuxguitar_() { local PACKAGE=${PACKAGE:=tuxguitar} - local PACKAGE_HOME=${PACKAGE_HOME:=/usr/share/${PACKAGE}/} + local PACKAGE_HOME=${PACKAGE_HOME:=/usr/share/java/${PACKAGE}/} # local PACKAGE_MAIN=${PACKAGE_MAIN:=org.herac.tuxguitar.gui.TGMain} local PACKAGE_MAIN=${PACKAGE_MAIN:=org.herac.tuxguitar.app.TGMain} - local PACKAGE_LIB=${PACKAGE_LIB:=/usr/lib/jni} + local PACKAGE_LIB=${PACKAGE_LIB:=/usr/lib64/tuxguitar} # java env JAVA=${JAVA:=java} CLASSPATH=${CLASSPATH} @@ -154,10 +151,76 @@ tuxguitar_() [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t t="/usr/share/java/itext.jar" [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-alsa.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-ascii.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t +# t=${PACKAGE_HOME}/${PACKAGE}-awt-graphics.jar +# [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-browser-ftp.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-community.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-compat.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-converter.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-editor-utils.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-fluidsynth.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-gervill.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-gm-settings.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-gm-utils.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-gpx.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-gtp.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-gtp-ui.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-image.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-jack.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-jack-ui.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-jsa.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-lib.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-lilypond.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-midi.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-musicxml.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-oss.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t +# t=${PACKAGE_HOME}/${PACKAGE}-pdf.jar +# [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-ptb.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-svg.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-tef.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-tray.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-tuner.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-ui-toolkit.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-ui-toolkit-swt.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=${PACKAGE_HOME}/${PACKAGE}-viewer.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t t=$(swt_guess_) [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t - JAVA_FLAGS=${JAVA_FLAGS:="-Xms128m -Xmx128m"} + JAVA_FLAGS=${JAVA_FLAGS:="-Xms128m -Xmx512m"} JAVA_FLAGS=" ${JAVA_FLAGS} \ -Djava.library.path=${PACKAGE_LIB} \ -D${PACKAGE}.share.path=/usr/share/${PACKAGE} \ @@ -170,6 +233,9 @@ tuxguitar_() [ ! -z ${DEBUG} ] && ${JAVA} -version [ ! -z ${DEBUG} ] && ${JAVA} ${JAVA_FLAGS} ${PACKAGE_MAIN} --version + SWT_GTK3=0 + export SWT_GTK3 + ${JAVA} ${JAVA_FLAGS} ${PACKAGE_MAIN} $arg "$@" }