Date: Monday, September 1, 2014 @ 17:54:07 Author: guillaume Revision: 220876
archrelease: copy trunk to extra-i686, extra-x86_64 Added: icedtea-web/repos/extra-i686/001_do_not_set_classpath.patch (from rev 220875, icedtea-web/trunk/001_do_not_set_classpath.patch) icedtea-web/repos/extra-i686/PKGBUILD (from rev 220875, icedtea-web/trunk/PKGBUILD) icedtea-web/repos/extra-i686/install_icedtea-web.sh (from rev 220875, icedtea-web/trunk/install_icedtea-web.sh) icedtea-web/repos/extra-x86_64/001_do_not_set_classpath.patch (from rev 220875, icedtea-web/trunk/001_do_not_set_classpath.patch) icedtea-web/repos/extra-x86_64/PKGBUILD (from rev 220875, icedtea-web/trunk/PKGBUILD) icedtea-web/repos/extra-x86_64/install_icedtea-web.sh (from rev 220875, icedtea-web/trunk/install_icedtea-web.sh) Deleted: icedtea-web/repos/extra-i686/001_do_not_set_classpath.patch icedtea-web/repos/extra-i686/PKGBUILD icedtea-web/repos/extra-i686/install_icedtea-web.sh icedtea-web/repos/extra-x86_64/001_do_not_set_classpath.patch icedtea-web/repos/extra-x86_64/PKGBUILD icedtea-web/repos/extra-x86_64/install_icedtea-web.sh ---------------------------------------------+ /001_do_not_set_classpath.patch | 72 ++++++++++ /PKGBUILD | 184 ++++++++++++++++++++++++++ /install_icedtea-web.sh | 22 +++ extra-i686/001_do_not_set_classpath.patch | 36 ----- extra-i686/PKGBUILD | 97 ------------- extra-i686/install_icedtea-web.sh | 11 - extra-x86_64/001_do_not_set_classpath.patch | 36 ----- extra-x86_64/PKGBUILD | 97 ------------- extra-x86_64/install_icedtea-web.sh | 11 - 9 files changed, 278 insertions(+), 288 deletions(-) Deleted: extra-i686/001_do_not_set_classpath.patch =================================================================== --- extra-i686/001_do_not_set_classpath.patch 2014-09-01 15:53:15 UTC (rev 220875) +++ extra-i686/001_do_not_set_classpath.patch 2014-09-01 15:54:07 UTC (rev 220876) @@ -1,36 +0,0 @@ -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}" Copied: icedtea-web/repos/extra-i686/001_do_not_set_classpath.patch (from rev 220875, icedtea-web/trunk/001_do_not_set_classpath.patch) =================================================================== --- extra-i686/001_do_not_set_classpath.patch (rev 0) +++ extra-i686/001_do_not_set_classpath.patch 2014-09-01 15:54:07 UTC (rev 220876) @@ -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}" Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2014-09-01 15:53:15 UTC (rev 220875) +++ extra-i686/PKGBUILD 2014-09-01 15:54:07 UTC (rev 220876) @@ -1,97 +0,0 @@ -# Maintainer: Andreas Radke <andy...@archlinux.org> -# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> - -pkgbase=icedtea-web -pkgname=('icedtea-web' 'icedtea-web-doc') -pkgver=1.5.1 -pkgrel=2 -arch=('i686' 'x86_64') -url='http://icedtea.classpath.org/wiki/IcedTea-Web' -license=('GPL2') -# TODO do we still need 'chromium' and '--with-chromium'? What does it do? -# https://www.java.com/en/download/faq/chrome.xml -makedepends=('java-environment-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' - 'firefox' 'chromium' 'epiphany') -optdepends=('rhino: for using proxy auto config files') -# 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 - 001_do_not_set_classpath.patch) -sha256sums=('03f16356fa84564f1ae32286e0a090a464c87ec123b40602dcea925757900195' - 'f929a292f1d2385b4a07ece9432a14ccba9be46a91d7b64168ddcb9a3e96302a') - -prepare() { - cd "${srcdir}" - 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 -} - -build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - ./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 \ - --with-epiphany=/usr/bin/epiphany - make -} - -#check() { -# cd "${srcdir}"/${pkgbase}-${pkgver} -# # as more tests have been added some are expectged to fail -# # see http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017566.html -# make -k check -#} - - -package_icedtea-web() { - - pkgdesc='Free web browser plugin to run applets written in Java and an implementation of Java Web Start' - depends=('java-runtime-openjdk' 'desktop-file-utils') - provides=('java-web-start') - replaces=('icedtea-web-java7') - install=install_${pkgname}.sh - - cd "${srcdir}"/${pkgbase}-${pkgver} - # possible make target (see bottom of Makefile.am: install-exec-local install-data-local - make DESTDIR="${pkgdir}" install-exec-local install-data-local - - # Install desktop files. - install -m 755 -d "${pkgdir}"/usr/share/{applications,pixmaps} - install -m 644 javaws.png "${pkgdir}"/usr/share/pixmaps - install -m 644 {javaws,itweb-settings}.desktop "${pkgdir}"/usr/share/applications - # remove splitted doc files - rm -rf "${pkgdir}"/usr/share/doc - - # link binaries into /usr/bin + jre/bin - install -m 755 -d "${pkgdir}"/usr/bin - pushd "${pkgdir}"/usr/share/${pkgbase}/bin - for file in *; do - ln -sf /usr/share/${pkgbase}/bin/${file} "${pkgdir}"/usr/bin - done - popd - - # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml - install -m 755 -d "${pkgdir}"/usr/lib/mozilla/plugins/ - ln -sf /usr/share/${pkgbase}/lib/IcedTeaPlugin.so "${pkgdir}"/usr/lib/mozilla/plugins/ -} - -package_icedtea-web-doc() { - - pkgdesc='icedtea-web browser plugin + Java WebStart - documentation files' - replaces=('icedtea-web-java7-doc') - - cd "${srcdir}"/${pkgbase}-${pkgver} - make DESTDIR="${pkgdir}" install-data-local - # remove javaws about and man page - rm -rf "${pkgdir}"/usr/lib - rm -rf "${pkgdir}"/usr/share/man - rm -rf "${pkgdir}"/usr/share/icedtea-web # conflicting and unneeded file it seems -} Copied: icedtea-web/repos/extra-i686/PKGBUILD (from rev 220875, icedtea-web/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2014-09-01 15:54:07 UTC (rev 220876) @@ -0,0 +1,92 @@ +# Maintainer: Andreas Radke <andy...@archlinux.org> +# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> + +pkgbase=icedtea-web +pkgname=('icedtea-web' 'icedtea-web-doc') +pkgver=1.5.1 +pkgrel=3 +arch=('i686' 'x86_64') +url='http://icedtea.classpath.org/wiki/IcedTea-Web' +license=('GPL2') +# TODO do we still need 'chromium' and '--with-chromium'? What does it do? +# https://www.java.com/en/download/faq/chrome.xml +makedepends=('java-environment-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' + 'firefox' 'chromium' 'epiphany') +optdepends=('rhino: for using proxy auto config files') +# 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') + +prepare() { + cd "${srcdir}" + LANG=en_US.UTF-8 bsdtar -x -f "${srcdir}"/${pkgbase}-${pkgver}.tar.gz +} + +build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + ./configure \ + --prefix=/usr/share/${pkgbase} \ + --datarootdir=/usr/share \ + --with-jdk-home=/usr/lib/jvm/default \ + --with-jre-home=/usr/lib/jvm/default-runtime \ + --with-java=/usr/bin/java \ + --with-browser-tests \ + --with-firefox=/usr/bin/firefox \ + --with-chromium=/usr/bin/chromium \ + --with-epiphany=/usr/bin/epiphany + make +} + +#check() { +# cd "${srcdir}"/${pkgbase}-${pkgver} +# # as more tests have been added some are expectged to fail +# # see http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017566.html +# make -k check +#} + + +package_icedtea-web() { + + pkgdesc='Free web browser plugin to run applets written in Java and an implementation of Java Web Start' + depends=('java-runtime-openjdk' 'desktop-file-utils') + provides=('java-web-start') + replaces=('icedtea-web-java7') + install=install_${pkgname}.sh + + cd "${srcdir}"/${pkgbase}-${pkgver} + # possible make target (see bottom of Makefile.am: install-exec-local install-data-local + make DESTDIR="${pkgdir}" install-exec-local install-data-local + + # Install desktop files. + install -m 755 -d "${pkgdir}"/usr/share/{applications,pixmaps} + install -m 644 javaws.png "${pkgdir}"/usr/share/pixmaps + install -m 644 {javaws,itweb-settings}.desktop "${pkgdir}"/usr/share/applications + # remove splitted doc files + rm -rf "${pkgdir}"/usr/share/doc + + # link binaries into /usr/bin + jre/bin + install -m 755 -d "${pkgdir}"/usr/bin + pushd "${pkgdir}"/usr/share/${pkgbase}/bin + for file in *; do + ln -sf /usr/share/${pkgbase}/bin/${file} "${pkgdir}"/usr/bin + done + popd + + # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml + install -m 755 -d "${pkgdir}"/usr/lib/mozilla/plugins/ + ln -sf /usr/share/${pkgbase}/lib/IcedTeaPlugin.so "${pkgdir}"/usr/lib/mozilla/plugins/ +} + +package_icedtea-web-doc() { + + pkgdesc='icedtea-web browser plugin + Java WebStart - documentation files' + replaces=('icedtea-web-java7-doc') + + cd "${srcdir}"/${pkgbase}-${pkgver} + make DESTDIR="${pkgdir}" install-data-local + # remove javaws about and man page + rm -rf "${pkgdir}"/usr/lib + rm -rf "${pkgdir}"/usr/share/man + rm -rf "${pkgdir}"/usr/share/icedtea-web # conflicting and unneeded file it seems +} Deleted: extra-i686/install_icedtea-web.sh =================================================================== --- extra-i686/install_icedtea-web.sh 2014-09-01 15:53:15 UTC (rev 220875) +++ extra-i686/install_icedtea-web.sh 2014-09-01 15:54:07 UTC (rev 220876) @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} Copied: icedtea-web/repos/extra-i686/install_icedtea-web.sh (from rev 220875, icedtea-web/trunk/install_icedtea-web.sh) =================================================================== --- extra-i686/install_icedtea-web.sh (rev 0) +++ extra-i686/install_icedtea-web.sh 2014-09-01 15:54:07 UTC (rev 220876) @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + update-desktop-database -q +} + +post_remove() { + update-desktop-database -q +} Deleted: extra-x86_64/001_do_not_set_classpath.patch =================================================================== --- extra-x86_64/001_do_not_set_classpath.patch 2014-09-01 15:53:15 UTC (rev 220875) +++ extra-x86_64/001_do_not_set_classpath.patch 2014-09-01 15:54:07 UTC (rev 220876) @@ -1,36 +0,0 @@ -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}" Copied: icedtea-web/repos/extra-x86_64/001_do_not_set_classpath.patch (from rev 220875, icedtea-web/trunk/001_do_not_set_classpath.patch) =================================================================== --- extra-x86_64/001_do_not_set_classpath.patch (rev 0) +++ extra-x86_64/001_do_not_set_classpath.patch 2014-09-01 15:54:07 UTC (rev 220876) @@ -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}" Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2014-09-01 15:53:15 UTC (rev 220875) +++ extra-x86_64/PKGBUILD 2014-09-01 15:54:07 UTC (rev 220876) @@ -1,97 +0,0 @@ -# Maintainer: Andreas Radke <andy...@archlinux.org> -# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> - -pkgbase=icedtea-web -pkgname=('icedtea-web' 'icedtea-web-doc') -pkgver=1.5.1 -pkgrel=2 -arch=('i686' 'x86_64') -url='http://icedtea.classpath.org/wiki/IcedTea-Web' -license=('GPL2') -# TODO do we still need 'chromium' and '--with-chromium'? What does it do? -# https://www.java.com/en/download/faq/chrome.xml -makedepends=('java-environment-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' - 'firefox' 'chromium' 'epiphany') -optdepends=('rhino: for using proxy auto config files') -# 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 - 001_do_not_set_classpath.patch) -sha256sums=('03f16356fa84564f1ae32286e0a090a464c87ec123b40602dcea925757900195' - 'f929a292f1d2385b4a07ece9432a14ccba9be46a91d7b64168ddcb9a3e96302a') - -prepare() { - cd "${srcdir}" - 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 -} - -build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - ./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 \ - --with-epiphany=/usr/bin/epiphany - make -} - -#check() { -# cd "${srcdir}"/${pkgbase}-${pkgver} -# # as more tests have been added some are expectged to fail -# # see http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017566.html -# make -k check -#} - - -package_icedtea-web() { - - pkgdesc='Free web browser plugin to run applets written in Java and an implementation of Java Web Start' - depends=('java-runtime-openjdk' 'desktop-file-utils') - provides=('java-web-start') - replaces=('icedtea-web-java7') - install=install_${pkgname}.sh - - cd "${srcdir}"/${pkgbase}-${pkgver} - # possible make target (see bottom of Makefile.am: install-exec-local install-data-local - make DESTDIR="${pkgdir}" install-exec-local install-data-local - - # Install desktop files. - install -m 755 -d "${pkgdir}"/usr/share/{applications,pixmaps} - install -m 644 javaws.png "${pkgdir}"/usr/share/pixmaps - install -m 644 {javaws,itweb-settings}.desktop "${pkgdir}"/usr/share/applications - # remove splitted doc files - rm -rf "${pkgdir}"/usr/share/doc - - # link binaries into /usr/bin + jre/bin - install -m 755 -d "${pkgdir}"/usr/bin - pushd "${pkgdir}"/usr/share/${pkgbase}/bin - for file in *; do - ln -sf /usr/share/${pkgbase}/bin/${file} "${pkgdir}"/usr/bin - done - popd - - # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml - install -m 755 -d "${pkgdir}"/usr/lib/mozilla/plugins/ - ln -sf /usr/share/${pkgbase}/lib/IcedTeaPlugin.so "${pkgdir}"/usr/lib/mozilla/plugins/ -} - -package_icedtea-web-doc() { - - pkgdesc='icedtea-web browser plugin + Java WebStart - documentation files' - replaces=('icedtea-web-java7-doc') - - cd "${srcdir}"/${pkgbase}-${pkgver} - make DESTDIR="${pkgdir}" install-data-local - # remove javaws about and man page - rm -rf "${pkgdir}"/usr/lib - rm -rf "${pkgdir}"/usr/share/man - rm -rf "${pkgdir}"/usr/share/icedtea-web # conflicting and unneeded file it seems -} Copied: icedtea-web/repos/extra-x86_64/PKGBUILD (from rev 220875, icedtea-web/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2014-09-01 15:54:07 UTC (rev 220876) @@ -0,0 +1,92 @@ +# Maintainer: Andreas Radke <andy...@archlinux.org> +# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> + +pkgbase=icedtea-web +pkgname=('icedtea-web' 'icedtea-web-doc') +pkgver=1.5.1 +pkgrel=3 +arch=('i686' 'x86_64') +url='http://icedtea.classpath.org/wiki/IcedTea-Web' +license=('GPL2') +# TODO do we still need 'chromium' and '--with-chromium'? What does it do? +# https://www.java.com/en/download/faq/chrome.xml +makedepends=('java-environment-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' + 'firefox' 'chromium' 'epiphany') +optdepends=('rhino: for using proxy auto config files') +# 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') + +prepare() { + cd "${srcdir}" + LANG=en_US.UTF-8 bsdtar -x -f "${srcdir}"/${pkgbase}-${pkgver}.tar.gz +} + +build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + ./configure \ + --prefix=/usr/share/${pkgbase} \ + --datarootdir=/usr/share \ + --with-jdk-home=/usr/lib/jvm/default \ + --with-jre-home=/usr/lib/jvm/default-runtime \ + --with-java=/usr/bin/java \ + --with-browser-tests \ + --with-firefox=/usr/bin/firefox \ + --with-chromium=/usr/bin/chromium \ + --with-epiphany=/usr/bin/epiphany + make +} + +#check() { +# cd "${srcdir}"/${pkgbase}-${pkgver} +# # as more tests have been added some are expectged to fail +# # see http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017566.html +# make -k check +#} + + +package_icedtea-web() { + + pkgdesc='Free web browser plugin to run applets written in Java and an implementation of Java Web Start' + depends=('java-runtime-openjdk' 'desktop-file-utils') + provides=('java-web-start') + replaces=('icedtea-web-java7') + install=install_${pkgname}.sh + + cd "${srcdir}"/${pkgbase}-${pkgver} + # possible make target (see bottom of Makefile.am: install-exec-local install-data-local + make DESTDIR="${pkgdir}" install-exec-local install-data-local + + # Install desktop files. + install -m 755 -d "${pkgdir}"/usr/share/{applications,pixmaps} + install -m 644 javaws.png "${pkgdir}"/usr/share/pixmaps + install -m 644 {javaws,itweb-settings}.desktop "${pkgdir}"/usr/share/applications + # remove splitted doc files + rm -rf "${pkgdir}"/usr/share/doc + + # link binaries into /usr/bin + jre/bin + install -m 755 -d "${pkgdir}"/usr/bin + pushd "${pkgdir}"/usr/share/${pkgbase}/bin + for file in *; do + ln -sf /usr/share/${pkgbase}/bin/${file} "${pkgdir}"/usr/bin + done + popd + + # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml + install -m 755 -d "${pkgdir}"/usr/lib/mozilla/plugins/ + ln -sf /usr/share/${pkgbase}/lib/IcedTeaPlugin.so "${pkgdir}"/usr/lib/mozilla/plugins/ +} + +package_icedtea-web-doc() { + + pkgdesc='icedtea-web browser plugin + Java WebStart - documentation files' + replaces=('icedtea-web-java7-doc') + + cd "${srcdir}"/${pkgbase}-${pkgver} + make DESTDIR="${pkgdir}" install-data-local + # remove javaws about and man page + rm -rf "${pkgdir}"/usr/lib + rm -rf "${pkgdir}"/usr/share/man + rm -rf "${pkgdir}"/usr/share/icedtea-web # conflicting and unneeded file it seems +} Deleted: extra-x86_64/install_icedtea-web.sh =================================================================== --- extra-x86_64/install_icedtea-web.sh 2014-09-01 15:53:15 UTC (rev 220875) +++ extra-x86_64/install_icedtea-web.sh 2014-09-01 15:54:07 UTC (rev 220876) @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} Copied: icedtea-web/repos/extra-x86_64/install_icedtea-web.sh (from rev 220875, icedtea-web/trunk/install_icedtea-web.sh) =================================================================== --- extra-x86_64/install_icedtea-web.sh (rev 0) +++ extra-x86_64/install_icedtea-web.sh 2014-09-01 15:54:07 UTC (rev 220876) @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + update-desktop-database -q +} + +post_remove() { + update-desktop-database -q +}