[arch-commits] Commit in icedtea-web-java7/repos (10 files)
Sven-Hendrik Haase
svenstaro at nymeria.archlinux.org
Tue Jul 16 09:06:07 UTC 2013
Date: Tuesday, July 16, 2013 @ 11:06:07
Author: svenstaro
Revision: 190129
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
icedtea-web-java7/repos/extra-i686/PKGBUILD
(from rev 190128, icedtea-web-java7/trunk/PKGBUILD)
icedtea-web-java7/repos/extra-i686/icedtea-web-java7.install
(from rev 190128, icedtea-web-java7/trunk/icedtea-web-java7.install)
icedtea-web-java7/repos/extra-i686/openjdk-hotfix.patch
(from rev 190128, icedtea-web-java7/trunk/openjdk-hotfix.patch)
icedtea-web-java7/repos/extra-x86_64/PKGBUILD
(from rev 190128, icedtea-web-java7/trunk/PKGBUILD)
icedtea-web-java7/repos/extra-x86_64/icedtea-web-java7.install
(from rev 190128, icedtea-web-java7/trunk/icedtea-web-java7.install)
icedtea-web-java7/repos/extra-x86_64/openjdk-hotfix.patch
(from rev 190128, icedtea-web-java7/trunk/openjdk-hotfix.patch)
Deleted:
icedtea-web-java7/repos/extra-i686/PKGBUILD
icedtea-web-java7/repos/extra-i686/icedtea-web-java7.install
icedtea-web-java7/repos/extra-x86_64/PKGBUILD
icedtea-web-java7/repos/extra-x86_64/icedtea-web-java7.install
----------------------------------------+
/PKGBUILD | 182 +++++++++++++++++++++++++++++++
/icedtea-web-java7.install | 22 +++
extra-i686/PKGBUILD | 88 --------------
extra-i686/icedtea-web-java7.install | 11 -
extra-i686/openjdk-hotfix.patch | 56 +++++++++
extra-x86_64/PKGBUILD | 88 --------------
extra-x86_64/icedtea-web-java7.install | 11 -
extra-x86_64/openjdk-hotfix.patch | 56 +++++++++
8 files changed, 316 insertions(+), 198 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-07-16 09:05:28 UTC (rev 190128)
+++ extra-i686/PKGBUILD 2013-07-16 09:06:07 UTC (rev 190129)
@@ -1,88 +0,0 @@
-# $Id: PKGBUILD 136836 2011-09-02 07:59:01Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgbase=icedtea-web-java7
-pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
-pkgver=1.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://icedtea.classpath.org/wiki/IcedTea-Web"
-license=('GPL2')
-makedepends=('jdk7-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany')
-noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot
-source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
-sha256sums=('e53a41fa132e086fa8d17cadf1e7e38cb3ab99577277949fbcae4ab8705245fb')
-
-_javaver=7
-_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-build() {
- # extract it
- cd "$srcdir"
- LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/${pkgbase/-java7/}-$pkgver.tar.gz
-
- cd "${srcdir}"/icedtea-web*
- ./configure --prefix=${_jvmdir} \
- --datarootdir=/usr/share \
- --with-jdk-home=${_jvmdir} \
- --with-browser-tests \
- --with-firefox=/usr/bin/firefox \
- --with-chromium=/usr/bin/chromium \
- --with-epiphany=/usr/bin/epiphany
- make
-}
-
-check() {
- cd "${srcdir}"/icedtea-web*
- # 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 || /bin/true
-}
-
-
-package_icedtea-web-java7() {
-
- pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
- depends=('jre7-openjdk' 'desktop-file-utils')
- provides=('java-web-start=7')
- replaces=('icedtea-web')
- install=${pkgname}.install
-
- cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
- # 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 -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
- install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
- install -m644 {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 -m755 -d ${pkgdir}/usr/bin
- install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin
- pushd ${pkgdir}/${_jvmdir}/bin
- for file in *; do
- ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin
- ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin
- done
- popd
-
- # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml
- install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
- ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
-}
-
-package_icedtea-web-java7-doc() {
-
- pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
- replaces=('icedtea-web-doc')
-
- cd "${srcdir}"/icedtea-web*
- 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-java7/repos/extra-i686/PKGBUILD (from rev 190128, icedtea-web-java7/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-07-16 09:06:07 UTC (rev 190129)
@@ -0,0 +1,91 @@
+# $Id: PKGBUILD 136836 2011-09-02 07:59:01Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=icedtea-web-java7
+pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
+pkgver=1.4
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://icedtea.classpath.org/wiki/IcedTea-Web"
+license=('GPL2')
+makedepends=('jdk7-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany')
+noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot
+source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz
+ openjdk-hotfix.patch)
+sha256sums=('e53a41fa132e086fa8d17cadf1e7e38cb3ab99577277949fbcae4ab8705245fb'
+ '1bf96e430d0694c53539e4e7a8c979c65a2ab5274d8ae38067b0fd7dd5bfba03')
+
+_javaver=7
+_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+
+build() {
+ # extract it
+ cd "$srcdir"
+ LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/${pkgbase/-java7/}-$pkgver.tar.gz
+
+ cd "${srcdir}"/icedtea-web*
+ patch -Np1 < $srcdir/openjdk-hotfix.patch
+ ./configure --prefix=${_jvmdir} \
+ --datarootdir=/usr/share \
+ --with-jdk-home=${_jvmdir} \
+ --with-browser-tests \
+ --with-firefox=/usr/bin/firefox \
+ --with-chromium=/usr/bin/chromium \
+ --with-epiphany=/usr/bin/epiphany
+ make
+}
+
+check() {
+ cd "${srcdir}"/icedtea-web*
+ # 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 || /bin/true
+}
+
+
+package_icedtea-web-java7() {
+
+ pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
+ depends=('jre7-openjdk' 'desktop-file-utils')
+ provides=('java-web-start=7')
+ replaces=('icedtea-web')
+ install=${pkgname}.install
+
+ cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
+ # 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 -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
+ install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
+ install -m644 {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 -m755 -d ${pkgdir}/usr/bin
+ install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin
+ pushd ${pkgdir}/${_jvmdir}/bin
+ for file in *; do
+ ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin
+ ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin
+ done
+ popd
+
+ # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml
+ install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
+ ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
+}
+
+package_icedtea-web-java7-doc() {
+
+ pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
+ replaces=('icedtea-web-doc')
+
+ cd "${srcdir}"/icedtea-web*
+ 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/icedtea-web-java7.install
===================================================================
--- extra-i686/icedtea-web-java7.install 2013-07-16 09:05:28 UTC (rev 190128)
+++ extra-i686/icedtea-web-java7.install 2013-07-16 09:06:07 UTC (rev 190129)
@@ -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-java7/repos/extra-i686/icedtea-web-java7.install (from rev 190128, icedtea-web-java7/trunk/icedtea-web-java7.install)
===================================================================
--- extra-i686/icedtea-web-java7.install (rev 0)
+++ extra-i686/icedtea-web-java7.install 2013-07-16 09:06:07 UTC (rev 190129)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ update-desktop-database -q
+}
+
+post_remove() {
+ update-desktop-database -q
+}
Copied: icedtea-web-java7/repos/extra-i686/openjdk-hotfix.patch (from rev 190128, icedtea-web-java7/trunk/openjdk-hotfix.patch)
===================================================================
--- extra-i686/openjdk-hotfix.patch (rev 0)
+++ extra-i686/openjdk-hotfix.patch 2013-07-16 09:06:07 UTC (rev 190129)
@@ -0,0 +1,56 @@
+diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/Boot.java
+--- a/netx/net/sourceforge/jnlp/runtime/Boot.java Mon Jun 10 13:22:53 2013 +0200
++++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Wed Jun 19 10:32:32 2013 +0200
+@@ -35,6 +35,8 @@
+ import net.sourceforge.jnlp.cache.UpdatePolicy;
+ import net.sourceforge.jnlp.security.viewer.CertificateViewer;
+ import net.sourceforge.jnlp.services.ServiceUtil;
++import sun.awt.AppContext;
++import sun.awt.SunToolkit;
+
+ /**
+ * This is the main entry point for the JNLP client. The main
+@@ -113,6 +115,9 @@
+ * Launch the JNLP file specified by the command-line arguments.
+ */
+ public static void main(String[] argsIn) {
++ if (AppContext.getAppContext() == null) {
++ SunToolkit.createNewAppContext();
++ }
+ args = argsIn;
+
+ if (null != getOption("-viewer")) {
+diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
+--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Mon Jun 10 13:22:53 2013 +0200
++++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Wed Jun 19 10:32:32 2013 +0200
+@@ -234,7 +234,7 @@
+ try {
+ UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+ } catch (Exception e) {
+- // ignore it
++ e.printStackTrace();
+ }
+
+ doMainAppContextHacks();
+diff -r 1a327a09262e plugin/icedteanp/java/sun/applet/PluginMain.java
+--- a/plugin/icedteanp/java/sun/applet/PluginMain.java Mon Jun 10 13:22:53 2013 +0200
++++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Wed Jun 19 10:32:32 2013 +0200
+@@ -72,6 +72,8 @@
+ import java.net.ProxySelector;
+ import java.util.Enumeration;
+ import java.util.Properties;
++import sun.awt.AppContext;
++import sun.awt.SunToolkit;
+
+ import net.sourceforge.jnlp.config.DeploymentConfiguration;
+ import net.sourceforge.jnlp.runtime.JNLPRuntime;
+@@ -94,6 +96,9 @@
+ */
+ public static void main(String args[])
+ throws IOException {
++ if (AppContext.getAppContext() == null) {
++ SunToolkit.createNewAppContext();
++ }
+ if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) {
+ System.err.println("Invalid pipe names provided. Refusing to proceed.");
+ System.exit(1);
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-07-16 09:05:28 UTC (rev 190128)
+++ extra-x86_64/PKGBUILD 2013-07-16 09:06:07 UTC (rev 190129)
@@ -1,88 +0,0 @@
-# $Id: PKGBUILD 136836 2011-09-02 07:59:01Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgbase=icedtea-web-java7
-pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
-pkgver=1.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://icedtea.classpath.org/wiki/IcedTea-Web"
-license=('GPL2')
-makedepends=('jdk7-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany')
-noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot
-source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
-sha256sums=('e53a41fa132e086fa8d17cadf1e7e38cb3ab99577277949fbcae4ab8705245fb')
-
-_javaver=7
-_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-build() {
- # extract it
- cd "$srcdir"
- LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/${pkgbase/-java7/}-$pkgver.tar.gz
-
- cd "${srcdir}"/icedtea-web*
- ./configure --prefix=${_jvmdir} \
- --datarootdir=/usr/share \
- --with-jdk-home=${_jvmdir} \
- --with-browser-tests \
- --with-firefox=/usr/bin/firefox \
- --with-chromium=/usr/bin/chromium \
- --with-epiphany=/usr/bin/epiphany
- make
-}
-
-check() {
- cd "${srcdir}"/icedtea-web*
- # 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 || /bin/true
-}
-
-
-package_icedtea-web-java7() {
-
- pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
- depends=('jre7-openjdk' 'desktop-file-utils')
- provides=('java-web-start=7')
- replaces=('icedtea-web')
- install=${pkgname}.install
-
- cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
- # 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 -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
- install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
- install -m644 {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 -m755 -d ${pkgdir}/usr/bin
- install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin
- pushd ${pkgdir}/${_jvmdir}/bin
- for file in *; do
- ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin
- ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin
- done
- popd
-
- # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml
- install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
- ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
-}
-
-package_icedtea-web-java7-doc() {
-
- pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
- replaces=('icedtea-web-doc')
-
- cd "${srcdir}"/icedtea-web*
- 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-java7/repos/extra-x86_64/PKGBUILD (from rev 190128, icedtea-web-java7/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-07-16 09:06:07 UTC (rev 190129)
@@ -0,0 +1,91 @@
+# $Id: PKGBUILD 136836 2011-09-02 07:59:01Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=icedtea-web-java7
+pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
+pkgver=1.4
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://icedtea.classpath.org/wiki/IcedTea-Web"
+license=('GPL2')
+makedepends=('jdk7-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany')
+noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot
+source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz
+ openjdk-hotfix.patch)
+sha256sums=('e53a41fa132e086fa8d17cadf1e7e38cb3ab99577277949fbcae4ab8705245fb'
+ '1bf96e430d0694c53539e4e7a8c979c65a2ab5274d8ae38067b0fd7dd5bfba03')
+
+_javaver=7
+_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+
+build() {
+ # extract it
+ cd "$srcdir"
+ LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/${pkgbase/-java7/}-$pkgver.tar.gz
+
+ cd "${srcdir}"/icedtea-web*
+ patch -Np1 < $srcdir/openjdk-hotfix.patch
+ ./configure --prefix=${_jvmdir} \
+ --datarootdir=/usr/share \
+ --with-jdk-home=${_jvmdir} \
+ --with-browser-tests \
+ --with-firefox=/usr/bin/firefox \
+ --with-chromium=/usr/bin/chromium \
+ --with-epiphany=/usr/bin/epiphany
+ make
+}
+
+check() {
+ cd "${srcdir}"/icedtea-web*
+ # 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 || /bin/true
+}
+
+
+package_icedtea-web-java7() {
+
+ pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
+ depends=('jre7-openjdk' 'desktop-file-utils')
+ provides=('java-web-start=7')
+ replaces=('icedtea-web')
+ install=${pkgname}.install
+
+ cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
+ # 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 -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
+ install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
+ install -m644 {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 -m755 -d ${pkgdir}/usr/bin
+ install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin
+ pushd ${pkgdir}/${_jvmdir}/bin
+ for file in *; do
+ ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin
+ ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin
+ done
+ popd
+
+ # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml
+ install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
+ ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
+}
+
+package_icedtea-web-java7-doc() {
+
+ pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
+ replaces=('icedtea-web-doc')
+
+ cd "${srcdir}"/icedtea-web*
+ 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/icedtea-web-java7.install
===================================================================
--- extra-x86_64/icedtea-web-java7.install 2013-07-16 09:05:28 UTC (rev 190128)
+++ extra-x86_64/icedtea-web-java7.install 2013-07-16 09:06:07 UTC (rev 190129)
@@ -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-java7/repos/extra-x86_64/icedtea-web-java7.install (from rev 190128, icedtea-web-java7/trunk/icedtea-web-java7.install)
===================================================================
--- extra-x86_64/icedtea-web-java7.install (rev 0)
+++ extra-x86_64/icedtea-web-java7.install 2013-07-16 09:06:07 UTC (rev 190129)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ update-desktop-database -q
+}
+
+post_remove() {
+ update-desktop-database -q
+}
Copied: icedtea-web-java7/repos/extra-x86_64/openjdk-hotfix.patch (from rev 190128, icedtea-web-java7/trunk/openjdk-hotfix.patch)
===================================================================
--- extra-x86_64/openjdk-hotfix.patch (rev 0)
+++ extra-x86_64/openjdk-hotfix.patch 2013-07-16 09:06:07 UTC (rev 190129)
@@ -0,0 +1,56 @@
+diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/Boot.java
+--- a/netx/net/sourceforge/jnlp/runtime/Boot.java Mon Jun 10 13:22:53 2013 +0200
++++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Wed Jun 19 10:32:32 2013 +0200
+@@ -35,6 +35,8 @@
+ import net.sourceforge.jnlp.cache.UpdatePolicy;
+ import net.sourceforge.jnlp.security.viewer.CertificateViewer;
+ import net.sourceforge.jnlp.services.ServiceUtil;
++import sun.awt.AppContext;
++import sun.awt.SunToolkit;
+
+ /**
+ * This is the main entry point for the JNLP client. The main
+@@ -113,6 +115,9 @@
+ * Launch the JNLP file specified by the command-line arguments.
+ */
+ public static void main(String[] argsIn) {
++ if (AppContext.getAppContext() == null) {
++ SunToolkit.createNewAppContext();
++ }
+ args = argsIn;
+
+ if (null != getOption("-viewer")) {
+diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
+--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Mon Jun 10 13:22:53 2013 +0200
++++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Wed Jun 19 10:32:32 2013 +0200
+@@ -234,7 +234,7 @@
+ try {
+ UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+ } catch (Exception e) {
+- // ignore it
++ e.printStackTrace();
+ }
+
+ doMainAppContextHacks();
+diff -r 1a327a09262e plugin/icedteanp/java/sun/applet/PluginMain.java
+--- a/plugin/icedteanp/java/sun/applet/PluginMain.java Mon Jun 10 13:22:53 2013 +0200
++++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Wed Jun 19 10:32:32 2013 +0200
+@@ -72,6 +72,8 @@
+ import java.net.ProxySelector;
+ import java.util.Enumeration;
+ import java.util.Properties;
++import sun.awt.AppContext;
++import sun.awt.SunToolkit;
+
+ import net.sourceforge.jnlp.config.DeploymentConfiguration;
+ import net.sourceforge.jnlp.runtime.JNLPRuntime;
+@@ -94,6 +96,9 @@
+ */
+ public static void main(String args[])
+ throws IOException {
++ if (AppContext.getAppContext() == null) {
++ SunToolkit.createNewAppContext();
++ }
+ if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) {
+ System.err.println("Invalid pipe names provided. Refusing to proceed.");
+ System.exit(1);
More information about the arch-commits
mailing list