diff options
| author | root <root@rshg054.dnsready.net> | 2011-11-10 23:14:50 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-11-10 23:14:50 +0000 |
| commit | 4141f5b04aab597f88a617a82649a404c773469a (patch) | |
| tree | b293827df78bf1e9b7059db63c04c3f7ab854ae6 /extra/icedtea-web-java7 | |
| parent | 7b0cdd65ac7bcd3c7597b528a10de58e4e0a430f (diff) | |
Thu Nov 10 23:14:50 UTC 2011
Diffstat (limited to 'extra/icedtea-web-java7')
| -rw-r--r-- | extra/icedtea-web-java7/PKGBUILD | 21 | ||||
| -rw-r--r-- | extra/icedtea-web-java7/icedtea-web-1.1.4-npapi-fix.patch | 12 |
2 files changed, 23 insertions, 10 deletions
diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index 5aa4b468f..d5424ed9e 100644 --- a/extra/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -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 @@ 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/${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,12 +32,13 @@ mksource() { 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 \ diff --git a/extra/icedtea-web-java7/icedtea-web-1.1.4-npapi-fix.patch b/extra/icedtea-web-java7/icedtea-web-1.1.4-npapi-fix.patch new file mode 100644 index 000000000..79ca0a6c0 --- /dev/null +++ b/extra/icedtea-web-java7/icedtea-web-1.1.4-npapi-fix.patch @@ -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"); |