[arch-commits] Commit in icedtea-web/repos (10 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Wed Nov 9 00:54:47 EST 2011


    Date: Wednesday, November 9, 2011 @ 00:54:47
  Author: andyrtr
Revision: 142413

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  icedtea-web/repos/extra-i686/PKGBUILD
    (from rev 142412, icedtea-web/trunk/PKGBUILD)
  icedtea-web/repos/extra-i686/icedtea-web-1.1.4-npapi-fix.patch
    (from rev 142412, icedtea-web/trunk/icedtea-web-1.1.4-npapi-fix.patch)
  icedtea-web/repos/extra-i686/icedtea-web.install
    (from rev 142412, icedtea-web/trunk/icedtea-web.install)
  icedtea-web/repos/extra-x86_64/PKGBUILD
    (from rev 142412, icedtea-web/trunk/PKGBUILD)
  icedtea-web/repos/extra-x86_64/icedtea-web-1.1.4-npapi-fix.patch
    (from rev 142412, icedtea-web/trunk/icedtea-web-1.1.4-npapi-fix.patch)
  icedtea-web/repos/extra-x86_64/icedtea-web.install
    (from rev 142412, icedtea-web/trunk/icedtea-web.install)
Deleted:
  icedtea-web/repos/extra-i686/PKGBUILD
  icedtea-web/repos/extra-i686/icedtea-web.install
  icedtea-web/repos/extra-x86_64/PKGBUILD
  icedtea-web/repos/extra-x86_64/icedtea-web.install

------------------------------------------------+
 extra-i686/PKGBUILD                            |  168 +++++++++++------------
 extra-i686/icedtea-web-1.1.4-npapi-fix.patch   |   12 +
 extra-i686/icedtea-web.install                 |   22 +--
 extra-x86_64/PKGBUILD                          |  168 +++++++++++------------
 extra-x86_64/icedtea-web-1.1.4-npapi-fix.patch |   12 +
 extra-x86_64/icedtea-web.install               |   22 +--
 6 files changed, 218 insertions(+), 186 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-11-09 05:53:44 UTC (rev 142412)
+++ extra-i686/PKGBUILD	2011-11-09 05:54:47 UTC (rev 142413)
@@ -1,82 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgbase=icedtea-web
-pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.1.3
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://icedtea.classpath.org/wiki/IcedTea-Web"
-license=('GPL2')
-makedepends=('openjdk6' 'zip' 'xulrunner')
-source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz)
-md5sums=('0e2e653c7436d81edcbc1d4255571ab6')
-sha1sums=('5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37')
-
-
-build() {
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr/lib/jvm/java-6-openjdk \
-      --datarootdir=/usr/share
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-
-package_icedtea-web() {
-
-  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=('openjdk6' 'gtk2' 'desktop-file-utils')
-  install=$pkgname.install
-
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd "$srcdir/$pkgname-$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 -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-doc() {
-
-  pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
-
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd "$srcdir/$pkgbase-$pkgver"
-#  install -m755 -d $pkgdir/${_jvmdir}/jre/lib
-  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 142412, icedtea-web/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-11-09 05:54:47 UTC (rev 142413)
@@ -0,0 +1,86 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=icedtea-web
+pkgname=('icedtea-web' 'icedtea-web-doc')
+pkgver=1.1.4
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://icedtea.classpath.org/wiki/IcedTea-Web"
+license=('GPL2')
+makedepends=('openjdk6' 'zip' 'xulrunner')
+source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz
+	icedtea-web-1.1.4-npapi-fix.patch)
+md5sums=('1ed24b7e58da26471187dfae80b020b6'
+         '81ac36e05ea1b55f1580bdb28c24f4db')
+
+build() {
+  _javaver=6
+  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+
+  cd "$srcdir/$pkgname-$pkgver"
+  
+  # fix build with Xulrunner 8
+  patch -Np1 -i ${srcdir}/icedtea-web-1.1.4-npapi-fix.patch
+  
+  ./configure --prefix=/usr/lib/jvm/java-6-openjdk \
+      --datarootdir=/usr/share
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -k check
+}
+
+
+package_icedtea-web() {
+
+  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=('openjdk6' 'gtk2' 'desktop-file-utils')
+  install=$pkgname.install
+
+  _javaver=6
+  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+
+  cd "$srcdir/$pkgname-$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 -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-doc() {
+
+  pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
+
+  _javaver=6
+  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+
+  cd "$srcdir/$pkgbase-$pkgver"
+#  install -m755 -d $pkgdir/${_jvmdir}/jre/lib
+  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/icedtea-web-1.1.4-npapi-fix.patch (from rev 142412, icedtea-web/trunk/icedtea-web-1.1.4-npapi-fix.patch)
===================================================================
--- extra-i686/icedtea-web-1.1.4-npapi-fix.patch	                        (rev 0)
+++ extra-i686/icedtea-web-1.1.4-npapi-fix.patch	2011-11-09 05:54:47 UTC (rev 142413)
@@ -0,0 +1,12 @@
+diff -up ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav ./plugin/icedteanp/IcedTeaNPPlugin.cc
+--- ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav	2011-11-08 17:27:29.046520865 -0500
++++ ./plugin/icedteanp/IcedTeaNPPlugin.cc	2011-11-08 17:27:40.469611421 -0500
+@@ -2262,7 +2262,7 @@ NP_Initialize (NPNetscapeFuncs* browserT
+ 
+ // Returns a string describing the MIME type that this plugin
+ // handles.
+-char*
++const char*
+ NP_GetMIMEDescription ()
+ {
+   PLUGIN_DEBUG ("NP_GetMIMEDescription\n");

Deleted: extra-i686/icedtea-web.install
===================================================================
--- extra-i686/icedtea-web.install	2011-11-09 05:53:44 UTC (rev 142412)
+++ extra-i686/icedtea-web.install	2011-11-09 05:54:47 UTC (rev 142413)
@@ -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/icedtea-web.install (from rev 142412, icedtea-web/trunk/icedtea-web.install)
===================================================================
--- extra-i686/icedtea-web.install	                        (rev 0)
+++ extra-i686/icedtea-web.install	2011-11-09 05:54:47 UTC (rev 142413)
@@ -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/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2011-11-09 05:53:44 UTC (rev 142412)
+++ extra-x86_64/PKGBUILD	2011-11-09 05:54:47 UTC (rev 142413)
@@ -1,82 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgbase=icedtea-web
-pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.1.3
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://icedtea.classpath.org/wiki/IcedTea-Web"
-license=('GPL2')
-makedepends=('openjdk6' 'zip' 'xulrunner')
-source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz)
-md5sums=('0e2e653c7436d81edcbc1d4255571ab6')
-sha1sums=('5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37')
-
-
-build() {
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr/lib/jvm/java-6-openjdk \
-      --datarootdir=/usr/share
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-
-package_icedtea-web() {
-
-  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=('openjdk6' 'gtk2' 'desktop-file-utils')
-  install=$pkgname.install
-
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd "$srcdir/$pkgname-$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 -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-doc() {
-
-  pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
-
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd "$srcdir/$pkgbase-$pkgver"
-#  install -m755 -d $pkgdir/${_jvmdir}/jre/lib
-  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 142412, icedtea-web/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2011-11-09 05:54:47 UTC (rev 142413)
@@ -0,0 +1,86 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=icedtea-web
+pkgname=('icedtea-web' 'icedtea-web-doc')
+pkgver=1.1.4
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://icedtea.classpath.org/wiki/IcedTea-Web"
+license=('GPL2')
+makedepends=('openjdk6' 'zip' 'xulrunner')
+source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz
+	icedtea-web-1.1.4-npapi-fix.patch)
+md5sums=('1ed24b7e58da26471187dfae80b020b6'
+         '81ac36e05ea1b55f1580bdb28c24f4db')
+
+build() {
+  _javaver=6
+  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+
+  cd "$srcdir/$pkgname-$pkgver"
+  
+  # fix build with Xulrunner 8
+  patch -Np1 -i ${srcdir}/icedtea-web-1.1.4-npapi-fix.patch
+  
+  ./configure --prefix=/usr/lib/jvm/java-6-openjdk \
+      --datarootdir=/usr/share
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -k check
+}
+
+
+package_icedtea-web() {
+
+  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=('openjdk6' 'gtk2' 'desktop-file-utils')
+  install=$pkgname.install
+
+  _javaver=6
+  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+
+  cd "$srcdir/$pkgname-$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 -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-doc() {
+
+  pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
+
+  _javaver=6
+  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+
+  cd "$srcdir/$pkgbase-$pkgver"
+#  install -m755 -d $pkgdir/${_jvmdir}/jre/lib
+  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/icedtea-web-1.1.4-npapi-fix.patch (from rev 142412, icedtea-web/trunk/icedtea-web-1.1.4-npapi-fix.patch)
===================================================================
--- extra-x86_64/icedtea-web-1.1.4-npapi-fix.patch	                        (rev 0)
+++ extra-x86_64/icedtea-web-1.1.4-npapi-fix.patch	2011-11-09 05:54:47 UTC (rev 142413)
@@ -0,0 +1,12 @@
+diff -up ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav ./plugin/icedteanp/IcedTeaNPPlugin.cc
+--- ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav	2011-11-08 17:27:29.046520865 -0500
++++ ./plugin/icedteanp/IcedTeaNPPlugin.cc	2011-11-08 17:27:40.469611421 -0500
+@@ -2262,7 +2262,7 @@ NP_Initialize (NPNetscapeFuncs* browserT
+ 
+ // Returns a string describing the MIME type that this plugin
+ // handles.
+-char*
++const char*
+ NP_GetMIMEDescription ()
+ {
+   PLUGIN_DEBUG ("NP_GetMIMEDescription\n");

Deleted: extra-x86_64/icedtea-web.install
===================================================================
--- extra-x86_64/icedtea-web.install	2011-11-09 05:53:44 UTC (rev 142412)
+++ extra-x86_64/icedtea-web.install	2011-11-09 05:54:47 UTC (rev 142413)
@@ -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/icedtea-web.install (from rev 142412, icedtea-web/trunk/icedtea-web.install)
===================================================================
--- extra-x86_64/icedtea-web.install	                        (rev 0)
+++ extra-x86_64/icedtea-web.install	2011-11-09 05:54:47 UTC (rev 142413)
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  update-desktop-database -q
+}
+
+post_remove() {
+  update-desktop-database -q
+}



More information about the arch-commits mailing list