diff --git a/icedtea-web/PKGBUILD b/icedtea-web/PKGBUILD index 38d4b6818..e04f801f7 100644 --- a/icedtea-web/PKGBUILD +++ b/icedtea-web/PKGBUILD @@ -6,8 +6,8 @@ pkgname=icedtea-web pkgdesc="Provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project." -pkgver=1.2 -pkgrel=3 +pkgver=1.2.1 +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') @@ -18,12 +18,10 @@ install="${pkgname}.install" source=("http://icedtea.classpath.org/download/source/${pkgname}-${pkgver}.tar.gz" 'replacing-gtk-with-qt.patch' - 'include_unistd_h.patch' - 'enable-openjdk7.patch') -sha256sums=('3f8d22b655df207409dd3451ba02907f61a12ac051e4df4d44bb5ed47c4f778d' - '4aca8cffa3e20cbd242dc5b77093a559d0398ec213af6532439fbdc5d55d4f52' - 'e2258177b59c51425dd67327f6c21785a5f49155624db3522ee25e5dfa8537fd' - 'a5f94b9dd60c606e98013881a4ac0430d53eb08d919bce3c3ebbb6eb86a33362') + 'include_unistd_h.patch') +sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6' + '008be13b6854f63df996456cca67b14ec4739fc5688416970b7e42ae5f85e5f5' + 'e2258177b59c51425dd67327f6c21785a5f49155624db3522ee25e5dfa8537fd') _javaver=7 _jvmdir="/usr/lib/jvm/java-${_javaver}-openjdk" @@ -36,14 +34,11 @@ build() { cd build - # Replacing GTK+ with Qt patch -Np1 -i "${srcdir}/replacing-gtk-with-qt.patch" - # missing #include in plugin/icedteanp/IcedTeaPluginUtils.cc patch -Np1 -i "${srcdir}/include_unistd_h.patch" - # enable the detection of OpenJDK 7 - patch -Np1 -i "${srcdir}/enable-openjdk7.patch" ./configure --prefix="${_jvmdir}" \ + --with-jdk-home="${_jvmdir}" \ --datarootdir=/usr/share \ --disable-docs \ || return 1 diff --git a/icedtea-web/enable-openjdk7.patch b/icedtea-web/enable-openjdk7.patch deleted file mode 100644 index cb822bfc2..000000000 --- a/icedtea-web/enable-openjdk7.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur a/configure b/configure ---- a/configure 2012-08-11 17:07:08.118260290 +0200 -+++ b/configure 2012-08-11 17:06:40.968408145 +0200 -@@ -4459,6 +4459,7 @@ - - if test -z "${SYSTEM_JDK_DIR}"; then - for dir in /usr/lib/jvm/java-openjdk /usr/lib/jvm/icedtea6 \ -+ /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/icedtea7 \ - /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/openjdk \ - /usr/lib/jvm/java-icedtea /usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk \ - /usr/lib/jvm/cacao ; do diff --git a/icedtea-web/replacing-gtk-with-qt.patch b/icedtea-web/replacing-gtk-with-qt.patch index 5302cd823..1ed2bbbe0 100644 --- a/icedtea-web/replacing-gtk-with-qt.patch +++ b/icedtea-web/replacing-gtk-with-qt.patch @@ -277,7 +277,7 @@ diff -Naur icedtea-web-1.1.3-orig/plugin/icedteanp/IcedTeaNPPlugin.h icedtea-web -// GTK includes. -#include +// QT4 includes. -+#include ++#include #include "IcedTeaPluginUtils.h" #include "IcedTeaPluginRequestProcessor.h"