upgpkg: java-gnome 4.1.3-5

Fix build on Java versions lower than 8

2 files changed, 13 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e20a241df063..6fc460403742 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Wed May 18 16:31:04 UTC 2016
 pkgbase = java-gnome
 	pkgdesc = Java bindings to the GNOME platform (including gtk, glib and glade)
 	pkgver = 4.1.3
-	pkgrel = 4
+	pkgrel = 5
 	url = http://java-gnome.sourceforge.net
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 9d0c09be722c..362e674e3043 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=java-gnome
 pkgver=4.1.3
-pkgrel=4
+pkgrel=5
 pkgdesc="Java bindings to the GNOME platform (including gtk, glib and glade)"
 arch=('i686' 'x86_64')
 url="http://java-gnome.sourceforge.net"
@@ -24,8 +24,15 @@ sha256sums=('060b2b249bad918b91a55a82b8a2ed085bec5734defaf31e6c8c5ad006532373'
 prepare() {
 	# Fix Javadoc 8 doclint annoying behaviour by disabling it
 	# Actually, you've to add a line in the script'$srcdir/build/faster'
-	cd "$srcdir/$pkgname-$pkgver"
-	patch -Np2 -i "$srcdir/jdk8-javadoc_disable-doclint.patch"
+	# Apply only when needed!
+	local java_version=`javac -version 2>&1`
+	java_version=${java_version/javac 1./}
+	java_version=${java_version/.*/}
+	if [ "x$java_version" == "x8" ];
+	then
+		cd "$srcdir/$pkgname-$pkgver"
+		patch -Np2 -i "$srcdir/jdk8-javadoc_disable-doclint.patch"
+	fi
 }
 
 build() {