Date: Saturday, August 30, 2014 @ 18:10:24 Author: guillaume Revision: 220817
Fix FS#41639 scripts cannot find JAVA_HOME Added: icedtea-web/trunk/001_do_not_set_classpath.patch Modified: icedtea-web/trunk/PKGBUILD --------------------------------+ 001_do_not_set_classpath.patch | 36 ++++++++++++++++++++++++++++++++++++ PKGBUILD | 13 ++++++++++--- 2 files changed, 46 insertions(+), 3 deletions(-) Added: 001_do_not_set_classpath.patch =================================================================== --- 001_do_not_set_classpath.patch (rev 0) +++ 001_do_not_set_classpath.patch 2014-08-30 16:10:24 UTC (rev 220817) @@ -0,0 +1,36 @@ +diff -r 4f76df2f1438 launcher/launchers.in +--- a/launcher/launchers.in Fri Aug 15 09:49:16 2014 +0200 ++++ b/launcher/launchers.in Sat Aug 30 18:01:25 2014 +0200 +@@ -7,7 +7,6 @@ + BINARY_LOCATION=@BIN_LOCATION@ + SPLASH_LOCATION=@JAVAWS_SPLASH_LOCATION@ + PROGRAM_NAME=@PROGRAM_NAME@ +-CP=@JRE@/lib/rt.jar + + CONFIG_HOME=$XDG_CONFIG_HOME + if [ "x$CONFIG_HOME" = "x" ] ; then +@@ -25,11 +24,10 @@ + CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" /etc/.java/.deploy/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"` + fi; + if [ "x$CUSTOM_JRE" != "x" ] ; then +- if [ -e "$CUSTOM_JRE" -a -e "$CUSTOM_JRE/bin/java" -a -e "$CUSTOM_JRE/lib/rt.jar" ] ; then ++ if [ -e "$CUSTOM_JRE" -a -e "$CUSTOM_JRE/bin/java" ] ; then + JAVA=$CUSTOM_JRE/bin/java +- CP=$CUSTOM_JRE/lib/rt.jar + else +- echo "Your custom JRE $CUSTOM_JRE read from deployment.properties under key $PROPERTY_NAME as $CUSTOM_JRE is not valid. Using default ($JAVA, $CP) in attempt to start. Please fix this." ++ echo "Your custom JRE $CUSTOM_JRE read from deployment.properties under key $PROPERTY_NAME as $CUSTOM_JRE is not valid. Using default ($JAVA) in attempt to start. Please fix this." + fi + fi; + +@@ -78,10 +76,6 @@ + i=$((i+1)) + k=$((k+1)) + done +-COMMAND[k]="-classpath" +-k=$((k+1)) +-COMMAND[k]="${CP}" +-k=$((k+1)) + COMMAND[k]="-Dicedtea-web.bin.name=${PROGRAM_NAME}" + k=$((k+1)) + COMMAND[k]="-Dicedtea-web.bin.location=${BINARY_LOCATION}" Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-08-30 14:34:14 UTC (rev 220816) +++ PKGBUILD 2014-08-30 16:10:24 UTC (rev 220817) @@ -4,7 +4,7 @@ pkgbase=icedtea-web pkgname=('icedtea-web' 'icedtea-web-doc') pkgver=1.5.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://icedtea.classpath.org/wiki/IcedTea-Web' license=('GPL2') @@ -14,8 +14,10 @@ 'firefox' 'chromium' 'epiphany') # Due to broken path names in the tarball that fails with LANG=C in our chroot noextract=${pkgbase}-${pkgver}.tar.gz -source=(http://icedtea.classpath.org/download/source/${pkgbase}-${pkgver}.tar.gz) -sha256sums=('03f16356fa84564f1ae32286e0a090a464c87ec123b40602dcea925757900195') +source=(http://icedtea.classpath.org/download/source/${pkgbase}-${pkgver}.tar.gz + 001_do_not_set_classpath.patch) +sha256sums=('03f16356fa84564f1ae32286e0a090a464c87ec123b40602dcea925757900195' + 'f929a292f1d2385b4a07ece9432a14ccba9be46a91d7b64168ddcb9a3e96302a') build() { # extract it @@ -23,10 +25,15 @@ LANG=en_US.UTF-8 bsdtar -x -f "${srcdir}"/${pkgbase}-${pkgver}.tar.gz cd "${srcdir}"/${pkgbase}-${pkgver} + + # FS#41639 + patch -p1 < "${srcdir}"/001_do_not_set_classpath.patch + ./configure \ --prefix=/usr/share/${pkgbase} \ --datarootdir=/usr/share \ --with-jdk-home=/usr/lib/jvm/java-default-runtime \ + --with-java=/usr/bin/java \ --with-browser-tests \ --with-firefox=/usr/bin/firefox \ --with-chromium=/usr/bin/chromium \