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

[andyrtr at archlinux.org]

    Date: Wednesday, November 9, 2011 @ 01:36:04
  Author: andyrtr
Revision: 142414

upgpkg: icedtea-web-java7 1.1.4-1

upstream update 1.1.4

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-09 05:54:47 UTC (rev 142413)
+++ PKGBUILD	2011-11-09 06:36:04 UTC (rev 142414)
@@ -3,7 +3,7 @@
 
 pkgbase=icedtea-web-java7
 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
-pkgver=1.1.3
+pkgver=1.1.4
 #_date=20110925
 #pkgrel=0.${_date}.1
 pkgrel=1
@@ -12,11 +12,11 @@
 license=('GPL2')
 makedepends=('jdk7-openjdk' 'zip' 'xulrunner')
 source=(#ftp://ftp.archlinux.org/other/$pkgname/${pkgbase}-${_date}.tar.xz
-	http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
+	http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz
 	#http://icedtea.classpath.org/download/source/${pkgname}-${pkgver}.tar.gz
-md5sums=('0e2e653c7436d81edcbc1d4255571ab6')
-sha1sums=('5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37')
-
+	icedtea-web-1.1.4-npapi-fix.patch)
+md5sums=('1ed24b7e58da26471187dfae80b020b6'
+         '81ac36e05ea1b55f1580bdb28c24f4db')
 _javaver=7
 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
@@ -32,13 +32,14 @@
 build() {
   cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
 
-  #. /etc/profile.d/jre.sh
-  . /etc/profile.d/jre7-openjdk.sh
-  #. /etc/profile.d/jdk.sh
-  . /etc/profile.d/jdk7-openjdk.sh
+  . /etc/profile.d/jre.sh
+  . /etc/profile.d/jdk.sh
   
-  autoreconf --force --install
+  #autoreconf --force --install
   
+  # fix build with Xulrunner 8
+  patch -Np1 -i ${srcdir}/icedtea-web-1.1.4-npapi-fix.patch
+  
   ./configure --prefix=${_jvmdir} \
       --datarootdir=/usr/share \
       --with-jdk-home=${_jvmdir}

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 06:36:04 UTC (rev 142414)
@@ -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");