Date: Sunday, August 27, 2017 @ 12:30:40 Author: guillaume Revision: 254628
Upstream release 0.33.3 and split Java packages Added: java-atk-wrapper/trunk/no-werror.patch Modified: java-atk-wrapper/trunk/PKGBUILD Deleted: java-atk-wrapper/trunk/removeNotExistingManifestInclusion.patch ------------------------------------------+ PKGBUILD | 85 +++++++++++++++++++++-------- no-werror.patch | 25 ++++++++ removeNotExistingManifestInclusion.patch | 22 ------- 3 files changed, 89 insertions(+), 43 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-08-27 10:35:16 UTC (rev 254627) +++ PKGBUILD 2017-08-27 12:30:40 UTC (rev 254628) @@ -1,36 +1,79 @@ # $Id$ -# Maintainer: Martin Wimpress <c...@flexion.org> +# Contributor: Guillaume ALAUX <guilla...@archlinux.org> +# Contributor: Martin Wimpress <c...@flexion.org> # Contributor: Kyle <k...@gmx.ca> -pkgname=java-atk-wrapper -pkgver=0.33.2 +pkgbase=java-atk-wrapper +pkgname=('java-atk-wrapper-common' 'java-atk-wrapper-openjdk7' 'java-atk-wrapper-openjdk8') +pkgver=0.33.3 pkgrel=1 -pkgdesc="ATK wrapper for screen reader access to Java Swing applications" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="https://git.gnome.org/browse/java-atk-wrapper/" license=('LGPL') -depends=('gtk2' 'java-runtime' 'xorg-xprop' 'gtk3') -makedepends=('java-environment') -source=("http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" removeNotExistingManifestInclusion.patch) -md5sums=('a1884b4e1a00730088f9a83d56be4b95' - '0bab0ce964961111b3abe5f1b4ecb392') +makedepends=('java-environment' 'gobject-introspection' + 'gnome-common' 'gtk2' 'gtk3' + 'xorg-xprop') +_pkgbase=$(echo $pkgbase | awk '{print toupper($0)}' | tr '-' '_') +_pkgver=$(echo $pkgver | tr '.' '_') +_altnamever="${_pkgbase}_${_pkgver}" +source=(https://git.gnome.org/browse/$pkgname/snapshot/$_altnamever.tar.xz + no-werror.patch) +sha256sums=('11d4a1c5491b2ba5a24b710d695c3c5fea5047d06eee07171f23ac5707fef4c5' + 'ee22d01cc6282e005cef89456208193d0c9b329a65fc5e1c38304ebb22b95842') prepare() { - cd $pkgname-$pkgver - patch -p0 -i ../removeNotExistingManifestInclusion.patch # Fedora patch + cd $_altnamever + # https://anonscm.debian.org/cgit/pkg-a11y/java-atk-wrapper.git/tree/debian/patches/no-werror + patch -p1 -i ../no-werror.patch } build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make + cd $_altnamever + ./autogen.sh --prefix=/usr + make + # make install is broken + mkdir "build" + make DESTDIR="$(pwd)/build" install } -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install +package_java-atk-wrapper-common() { + pkgdesc='ATK wrapper for screen reader access to Java Swing applications - common files' + depends=('xorg-xprop' 'atk') + conflicts=('java-atk-wrapper') -# make install is broken - mv "$pkgdir"/build/.local/share/java-atk-wrapper/usr/lib/jvm "$pkgdir"/usr/lib - rm -r "$pkgdir"/build + cd $_altnamever/build + + mkdir -p $pkgdir/usr/share/java + cp build/usr/lib/jvm/java-7-openjdk/jre/lib/ext/java-atk-wrapper.jar \ + $pkgdir/usr/share/java + cp -r usr $pkgdir } + +package_java-atk-wrapper-openjdk7() { + pkgdesc='ATK wrapper for screen reader access to Java Swing applications - OpenJDK 7' + depends=('java-atk-wrapper-common' 'java-runtime-headless-openjdk=7') + replaces=('java-atk-wrapper') + provides=('java-atk-wrapper-openjdk=7') + + cd $_altnamever/build + + mkdir -p $pkgdir/usr/lib/jvm/java-7-openjdk/jre/lib/ext + ln -s /usr/share/java/java-atk-wrapper.jar \ + $pkgdir/usr/lib/jvm/java-7-openjdk/jre/lib/ext + cp build/usr/lib/jvm/java-7-openjdk/jre/lib/accessibility.properties \ + $pkgdir/usr/lib/jvm/java-7-openjdk/jre/lib +} + +package_java-atk-wrapper-openjdk8() { + pkgdesc='ATK wrapper for screen reader access to Java Swing applications - OpenJDK 8' + depends=('java-atk-wrapper-common' 'java-runtime-headless-openjdk=8') + provides=('java-atk-wrapper-openjdk=8') + + cd $_altnamever/build + + mkdir -p $pkgdir/usr/lib/jvm/java-8-openjdk/jre/lib/ext + ln -s /usr/share/java/java-atk-wrapper.jar \ + $pkgdir/usr/lib/jvm/java-8-openjdk/jre/lib/ext + cp build/usr/lib/jvm/java-7-openjdk/jre/lib/accessibility.properties \ + $pkgdir/usr/lib/jvm/java-8-openjdk/jre/lib +} Added: no-werror.patch =================================================================== --- no-werror.patch (rev 0) +++ no-werror.patch 2017-08-27 12:30:40 UTC (rev 254628) @@ -0,0 +1,25 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -129,14 +129,14 @@ else + fi + AC_SUBST(JAW_CFLAGS) + +-GNOME_COMPILE_WARNINGS([error]) +-case "$WARN_CFLAGS" in +- *-Werror*) +- WARN_CFLAGS="$WARN_CFLAGS -Wno-error=deprecated-declarations" +- ;; +-esac +-AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS" +-AC_SUBST(AM_CFLAGS) ++#GNOME_COMPILE_WARNINGS([error]) ++#case "$WARN_CFLAGS" in ++# *-Werror*) ++# WARN_CFLAGS="$WARN_CFLAGS -Wno-error=deprecated-declarations" ++# ;; ++#esac ++#AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS" ++#AC_SUBST(AM_CFLAGS) + + CHECK_JNI + Deleted: removeNotExistingManifestInclusion.patch =================================================================== --- removeNotExistingManifestInclusion.patch 2017-08-27 10:35:16 UTC (rev 254627) +++ removeNotExistingManifestInclusion.patch 2017-08-27 12:30:40 UTC (rev 254628) @@ -1,22 +0,0 @@ ---- wrapper/Makefile.am -+++ wrapper/Makefile.am -@@ -16,7 +16,7 @@ - EXTRA_DIST = $(properties_DATA) - - $(JARFILES) : $(DEP_CLASSES) -- $(JAR) cfm $(JARFILES) manifest.txt org/GNOME/Accessibility/*.class -+ $(JAR) cf $(JARFILES) org/GNOME/Accessibility/*.class - - all-local : $(DATA) $(JARFILES) - ---- wrapper/Makefile.in -+++ wrapper/Makefile.in -@@ -717,7 +717,7 @@ - - - $(JARFILES) : $(DEP_CLASSES) -- $(JAR) cfm $(JARFILES) manifest.txt org/GNOME/Accessibility/*.class -+ $(JAR) cf $(JARFILES) org/GNOME/Accessibility/*.class - - all-local : $(DATA) $(JARFILES) -