diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2019-12-26 19:23:18 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2019-12-26 19:24:03 +0100 |
| commit | ad39a2fe1c0ee0db2f817e3a38c3f09c279adab5 (patch) | |
| tree | 161241bf8d9e8aaa6e866c1cd1bab6ec593e5420 /community/java-jna | |
| parent | 597f5f192a27bc958f64521550395ee57c76126b (diff) | |
| download | aports-ad39a2fe1c0ee0db2f817e3a38c3f09c279adab5.tar.bz2 aports-ad39a2fe1c0ee0db2f817e3a38c3f09c279adab5.tar.xz | |
community/java-jna: upgrade to 5.5.0
Diffstat (limited to 'community/java-jna')
| -rw-r--r-- | community/java-jna/0001-jar-without-natives.patch | 9 | ||||
| -rw-r--r-- | community/java-jna/APKBUILD | 10 | ||||
| -rw-r--r-- | community/java-jna/disable-Werror.patch | 11 |
3 files changed, 11 insertions, 19 deletions
diff --git a/community/java-jna/0001-jar-without-natives.patch b/community/java-jna/0001-jar-without-natives.patch index c583c1a01d..0bfbfe5f90 100644 --- a/community/java-jna/0001-jar-without-natives.patch +++ b/community/java-jna/0001-jar-without-natives.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Exclude native libs from jna.jar --- a/build.xml +++ b/build.xml -@@ -411,155 +411,10 @@ +@@ -433,160 +433,10 @@ <attribute name="Bundle-Vendor" value="${vendor}"/> <attribute name="Bundle-ActivationPolicy" value="lazy"/> - <attribute name="Export-Package" value="com.sun.jna,com.sun.jna.ptr,com.sun.jna.win32"/> + <attribute name="Export-Package" value="com.sun.jna;version=${jna.major}.${jna.minor}.${jna.revision}, com.sun.jna.ptr;version=${jna.major}.${jna.minor}.${jna.revision}, com.sun.jna.win32;version=${jna.major}.${jna.minor}.${jna.revision}"/> - <!-- Note that no terminal "*" is included in this list, - which will force failure on unsupported platforms. - --> @@ -51,6 +51,8 @@ Subject: [PATCH] Exclude native libs from jna.jar -processor=x86-64;osname=linux, -com/sun/jna/linux-arm/libjnidispatch.so; -processor=arm;osname=linux, +-com/sun/jna/linux-arm/libjnidispatch.so; +-processor=arm_le;osname=linux, -com/sun/jna/linux-armel/libjnidispatch.so; -processor=armel;osname=linux, -com/sun/jna/linux-aarch64/libjnidispatch.so; @@ -158,6 +160,9 @@ Subject: [PATCH] Exclude native libs from jna.jar - <zipfileset src="${lib.native}/w32ce-arm.jar" - includes="*jnidispatch*" - prefix="com/sun/jna/w32ce-arm"/> +- <zipfileset dir="." +- includes="LICENSE,LGPL2.1,AL2.0" +- prefix="META-INF"/> </jar> <zip zipfile="${build}/${minjar}"> <zipfileset src="${build}/${jar}" excludes="**/*jnidispatch*"/> diff --git a/community/java-jna/APKBUILD b/community/java-jna/APKBUILD index 0bce0d8971..098748cebf 100644 --- a/community/java-jna/APKBUILD +++ b/community/java-jna/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=java-jna _pkgname=${pkgname#java-} -pkgver=4.5.2 -pkgrel=1 +pkgver=5.5.0 +pkgrel=0 pkgdesc="JNA provides Java programs easy access to native shared libraries." url="https://github.com/java-native-access/jna" arch="all" @@ -12,7 +12,6 @@ depends="openjdk8-jre-base" makedepends="apache-ant autoconf automake libffi-dev>=3.2 libtool openjdk8" subpackages="$pkgname-native" source="$pkgname-$pkgver.tar.gz::https://github.com/java-native-access/$_pkgname/archive/$pkgver.tar.gz - disable-Werror.patch 0001-jar-without-natives.patch " builddir="$srcdir/$_pkgname-$pkgver" @@ -65,6 +64,5 @@ native() { ln -sf $soname.$sover "$subpkgdir"/usr/lib/$soname } -sha512sums="c740b5655725d01a1bdb0e86ca9640d70bd416591b36f82976429455bc728f2872a19c78cddbc271657146e8926fa22f8bb2ec48b56d3483379488cff576dac8 java-jna-4.5.2.tar.gz -2420c6fbf9f9375f6fc8fbe004fa2831ac13799b1a16608da27c2ce09388b023742336b2e4a81e7524a9df4ed6f421864042b82dbb2dbc17fb54b5bc6091d1b6 disable-Werror.patch -dacfa03e1a957172502dd10007445e844df67288fde07f7ada80a5cbfe3186511aa7a866c8c757a0a94c894829fead9c67ad0993f2105d2fef1f18d22ee01cdb 0001-jar-without-natives.patch" +sha512sums="a90ed6c0b228f8d54e20f03f8163f58cbe095d19df91f51198dad38bfd6cab4e25685bd48cb6005aff6b4dbbe70e1cd0ebb8d382d804239b9f6bf480f25be3c0 java-jna-5.5.0.tar.gz +600dbd3fdc2b8413599e93650654acdbe43fb49a271e718cb043836231b628914eb141100665c456464fb5260caea6db960a3810691c97d868290340d5524ec3 0001-jar-without-natives.patch" diff --git a/community/java-jna/disable-Werror.patch b/community/java-jna/disable-Werror.patch deleted file mode 100644 index 70f42bc5ff..0000000000 --- a/community/java-jna/disable-Werror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/native/Makefile -+++ b/native/Makefile -@@ -336,7 +336,7 @@ - ifeq ($(CC),gcc) - GCC_MAJOR_VERSION = $(shell gcc -dumpversion | cut -f 1 -d '.') - ifneq ($(GCC_MAJOR_VERSION),4) -- LOC_CC_OPTS=-Wno-unknown-warning-option -Werror -Wno-clobbered -Wno-unused-variable -+ LOC_CC_OPTS=-Wno-unknown-warning-option -Wno-clobbered -Wno-unused-variable - endif - else - LOC_CC_OPTS=-Wno-unknown-warning-option -Werror -Wno-clobbered -Wno-unused-variable |