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

[andyrtr at archlinux.org]

    Date: Wednesday, November 9, 2011 @ 00:53:44
  Author: andyrtr
Revision: 142412

upgpkg: icedtea-web 1.1.4-1

upstream update 1.1.4

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-09 05:50:43 UTC (rev 142411)
+++ PKGBUILD	2011-11-09 05:53:44 UTC (rev 142412)
@@ -3,22 +3,26 @@
 
 pkgbase=icedtea-web
 pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.1.3
+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)
-md5sums=('0e2e653c7436d81edcbc1d4255571ab6')
-sha1sums=('5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37')
+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

Added: icedtea-web-1.1.4-npapi-fix.patch
===================================================================
--- icedtea-web-1.1.4-npapi-fix.patch	                        (rev 0)
+++ icedtea-web-1.1.4-npapi-fix.patch	2011-11-09 05:53:44 UTC (rev 142412)
@@ -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");