[arch-commits] Commit in icedtea-web/trunk (2 files)

[andyrtr at archlinux.org]

    Date: Sunday, December 25, 2011 @ 09:34:10
  Author: andyrtr
Revision: 145640

upgpkg: icedtea-web 1.1.4-2

use npapi-sdk, some cleanup; add more tests

Modified:
  icedtea-web/trunk/PKGBUILD
Deleted:
  icedtea-web/trunk/icedtea-web-1.1.4-npapi-fix.patch

-----------------------------------+
 PKGBUILD                          |   23 +++++------------------
 icedtea-web-1.1.4-npapi-fix.patch |   12 ------------
 2 files changed, 5 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-25 14:20:05 UTC (rev 145639)
+++ PKGBUILD	2011-12-25 14:34:10 UTC (rev 145640)
@@ -4,25 +4,19 @@
 pkgbase=icedtea-web
 pkgname=('icedtea-web' 'icedtea-web-doc')
 pkgver=1.1.4
-pkgrel=1
+pkgrel=2
 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')
+makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit')
+source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz)
+md5sums=('1ed24b7e58da26471187dfae80b020b6')
 
-build() {
   _javaver=6
   _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
+build() {
   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
@@ -40,9 +34,6 @@
   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
@@ -73,11 +64,7 @@
 
   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

Deleted: icedtea-web-1.1.4-npapi-fix.patch
===================================================================
--- icedtea-web-1.1.4-npapi-fix.patch	2011-12-25 14:20:05 UTC (rev 145639)
+++ icedtea-web-1.1.4-npapi-fix.patch	2011-12-25 14:34:10 UTC (rev 145640)
@@ -1,12 +0,0 @@
-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");