summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Santini2018-04-05 18:34:22 +0200
committerGiovanni Santini2018-04-05 18:34:22 +0200
commit7bad4e7cd4a06db70a8b71d0df384ffced721182 (patch)
treeb01e40ca280983cb5eb5290fb249069a701018ca
parent9199d184b9ece9b1cc21c5ffb53be2cd932f7f36 (diff)
downloadaur-java-gnome.tar.gz
upgpkg: java-gnome 4.1.3-6
- Tracking TU changes (geez, informing people...?) - Remove unused libunique3 dependency - Fixing build issues with enchant - Set proper Java version
-rw-r--r--.SRCINFO8
-rwxr-xr-xPKGBUILD74
-rw-r--r--enchant_2.patch23
3 files changed, 68 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d78ded13dbb3..eeaba0c99c30 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
pkgbase = java-gnome
pkgdesc = Java bindings to the GNOME platform (including gtk, glib and glade)
pkgver = 4.1.3
- pkgrel = 5
+ pkgrel = 6
url = http://java-gnome.sourceforge.net
arch = i686
arch = x86_64
license = GPL
- makedepends = java-environment
+ makedepends = java-environment<9
makedepends = junit
makedepends = python2
- depends = java-runtime
+ depends = java-runtime<9
depends = gtksourceview3
depends = librsvg
depends = libnotify
@@ -17,8 +17,10 @@ pkgbase = java-gnome
depends = gtkspell3
source = http://ftp.gnome.org/pub/gnome/sources/java-gnome/4.1/java-gnome-4.1.3.tar.xz
source = jdk8-javadoc_disable-doclint.patch
+ source = enchant_2.patch
sha256sums = 060b2b249bad918b91a55a82b8a2ed085bec5734defaf31e6c8c5ad006532373
sha256sums = baee2777041531b6e6ce9e2b176ed27f89afe2c35f5f913ba377d7027d6dc039
+ sha256sums = e00af4688aacdf98116f139c70f8091d06c5b65a38522394081ef4ba7f27c344
pkgname = java-gnome
diff --git a/PKGBUILD b/PKGBUILD
index 0b83d8b26e00..642200c67230 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,58 +7,64 @@
pkgname=java-gnome
pkgver=4.1.3
-pkgrel=5
+pkgrel=6
pkgdesc="Java bindings to the GNOME platform (including gtk, glib and glade)"
arch=('i686' 'x86_64')
url="http://java-gnome.sourceforge.net"
license=('GPL')
-depends=('java-runtime' 'gtksourceview3' 'librsvg' 'libnotify' 'enchant' 'gtkspell3')
-makedepends=('java-environment' 'junit' 'python2')
+depends=('java-runtime<9' 'gtksourceview3' 'librsvg' 'libnotify' 'enchant' 'gtkspell3')
+makedepends=('java-environment<9' 'junit' 'python2')
source=(
- http://ftp.gnome.org/pub/gnome/sources/$pkgname/4.1/$pkgname-$pkgver.tar.xz
- jdk8-javadoc_disable-doclint.patch
- )
+ http://ftp.gnome.org/pub/gnome/sources/$pkgname/4.1/$pkgname-$pkgver.tar.xz
+ jdk8-javadoc_disable-doclint.patch
+ enchant_2.patch
+ )
sha256sums=('060b2b249bad918b91a55a82b8a2ed085bec5734defaf31e6c8c5ad006532373'
- 'baee2777041531b6e6ce9e2b176ed27f89afe2c35f5f913ba377d7027d6dc039')
+ 'baee2777041531b6e6ce9e2b176ed27f89afe2c35f5f913ba377d7027d6dc039'
+ 'e00af4688aacdf98116f139c70f8091d06c5b65a38522394081ef4ba7f27c344')
prepare() {
- # Fix Javadoc 8 doclint annoying behaviour by disabling it
- # Actually, you've to add a line in the script'$srcdir/build/faster'
- # 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
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Patch the detection of enchant
+ patch -Np1 -i "$srcdir/enchant_2.patch"
+
+ # Fix Javadoc 8 doclint annoying behaviour by disabling it
+ # Actually, you've to add a line in the script'$srcdir/build/faster'
+ # 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
+ patch -Np2 -i "$srcdir/jdk8-javadoc_disable-doclint.patch"
+ fi
}
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir/$pkgname-$pkgver"
- # Python2 fix
- sed -i 's@^#!.*python$@#!/usr/bin/python2@' build/faster src/util/demux/demux.py
+ # Python2 fix
+ sed -i 's@^#!.*python$@#!/usr/bin/python2@' build/faster src/util/demux/demux.py
- # Adapt to the new build-system
- unset CLASSPATH
+ # Adapt to the new build-system
+ unset CLASSPATH
- # Ok, this had to be updated
- ./configure jdk="/usr/lib/jvm/default" prefix=/usr
- make
- # Prevent errors running make doc (GLib errors)
- G_ENABLE_DIAGNOSTIC=0 make doc
+ # Ok, this had to be updated
+ ./configure jdk="/usr/lib/jvm/default" prefix=/usr
+ make
+ # Prevent errors running make doc (GLib errors)
+ G_ENABLE_DIAGNOSTIC=0 make doc
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir/$pkgname-$pkgver"
- make -j1 DESTDIR=$pkgdir install
+ make -j1 DESTDIR=$pkgdir install
- install -d "$pkgdir/usr/share/gtk-doc/html/$pkgname"
- cp -R "$srcdir"/$pkgname-$pkgver/doc/api/* "$pkgdir/usr/share/gtk-doc/html/$pkgname"
+ install -d "$pkgdir/usr/share/gtk-doc/html/$pkgname"
+ cp -R "$srcdir"/$pkgname-$pkgver/doc/api/* "$pkgdir/usr/share/gtk-doc/html/$pkgname"
- # Fix permissions
- chmod 644 "$pkgdir/usr/share/java/gtk-4.1.jar"
+ # Fix permissions
+ chmod 644 "$pkgdir/usr/share/java/gtk-4.1.jar"
}
diff --git a/enchant_2.patch b/enchant_2.patch
new file mode 100644
index 000000000000..4634bca9d5d9
--- /dev/null
+++ b/enchant_2.patch
@@ -0,0 +1,23 @@
+diff '--color=auto' -ur java-gnome-4.1.3/build/faster java-gnome-4.1.3_fixed/build/faster
+--- java-gnome-4.1.3/build/faster 2018-04-05 16:27:17.044976400 +0200
++++ java-gnome-4.1.3_fixed/build/faster 2018-04-05 16:28:22.260107000 +0200
+@@ -63,7 +63,7 @@
+ hashFile = "tmp/.hashes"
+ lockFile = "tmp/.build"
+
+-GNOME_MODULES = "gthread-2.0 glib-2.0 gtk+-3.0 gtk+-unix-print-3.0 gtksourceview-3.0 libnotify enchant librsvg-2.0"
++GNOME_MODULES = "gthread-2.0 glib-2.0 gtk+-3.0 gtk+-unix-print-3.0 gtksourceview-3.0 libnotify enchant-2 librsvg-2.0"
+
+ #
+ # Armour against multiple simultaneous invocations.
+diff '--color=auto' -ur java-gnome-4.1.3/configure java-gnome-4.1.3_fixed/configure
+--- java-gnome-4.1.3/configure 2018-04-05 16:27:17.046578200 +0200
++++ java-gnome-4.1.3_fixed/configure 2018-04-05 16:27:52.524593100 +0200
+@@ -937,7 +937,7 @@
+ "gtksourceview3");
+
+ check_system_library(@gnomedev_libs,
+- "enchant",
++ "enchant-2",
+ "Enchant",
+ "enchant");