Date: Sunday, December 25, 2011 @ 09:19:28
Author: andyrtr
Revision: 145638
upgpkg: icedtea-web-java7 1.1.4-2
use npapi-sdk, some cleanup; add more tests
Modified:
icedtea-web-java7/trunk/PKGBUILD
Deleted:
icedtea-web-java7/trunk/icedtea-web-1.1.4-npapi-fix.patch
-----------------------------------+
PKGBUILD | 36 ++++++++----------------------------
icedtea-web-1.1.4-npapi-fix.patch | 12 ------------
2 files changed, 8 insertions(+), 40 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-12-25 11:01:07 UTC (rev 145637)
+++ PKGBUILD 2011-12-25 14:19:28 UTC (rev 145638)
@@ -4,42 +4,23 @@
pkgbase=icedtea-web-java7
pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
pkgver=1.1.4
-#_date=20110925
-#pkgrel=0.${_date}.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://icedtea.classpath.org/wiki/IcedTea-Web";
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/${pkgname}-${pkgver}.tar.gz
- icedtea-web-1.1.4-npapi-fix.patch)
-md5sums=('1ed24b7e58da26471187dfae80b020b6'
- '81ac36e05ea1b55f1580bdb28c24f4db')
+makedepends=('jdk7-openjdk' 'zip' 'gtk' 'npapi-sdk' 'rhino' 'junit')
+source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
+md5sums=('1ed24b7e58da26471187dfae80b020b6')
+
_javaver=7
_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-mksource() {
- mkdir /tmp/${pkgbase}-${_date}
- pushd /tmp/${pkgbase}-${_date}
- hg clone http://icedtea.classpath.org/hg/icedtea-web ${pkgbase}-${_date}
- rm -rf ${pkgbase}-${_date}/.hg*
- tar -cvJf /tmp/${pkgbase}-${_date}/${pkgbase}-${_date}.tar.xz *
- popd
-}
-
build() {
- cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
+ cd "${srcdir}"/icedtea-web*
. /etc/profile.d/jre.sh
. /etc/profile.d/jdk.sh
- #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}
@@ -47,7 +28,7 @@
}
check() {
- cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
+ cd "${srcdir}"/icedtea-web*
make -k check
}
@@ -88,8 +69,7 @@
pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
- cd "${srcdir}"/icedtea-web* #${pkgbase}-${_date}"
-# install -m755 -d ${pkgdir}/${_jvmdir}/jre/lib
+ cd "${srcdir}"/icedtea-web*
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 11:01:07 UTC (rev 145637)
+++ icedtea-web-1.1.4-npapi-fix.patch 2011-12-25 14:19:28 UTC (rev 145638)
@@ -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");
