aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2017-10-31 20:50:19 +0100
committerJakub Jirutka <jakub@jirutka.cz>2017-10-31 20:51:11 +0100
commit1a49f8b773a084fc97a87b08f3874a7826d71bbb (patch)
treea3160f9bd84c0d5d40b8ea42e285998a399a1679
parent415b8b3f0c01dc311aa8f122ae4d33e947b72a59 (diff)
downloadaports-1a49f8b773a084fc97a87b08f3874a7826d71bbb.tar.gz
aports-1a49f8b773a084fc97a87b08f3874a7826d71bbb.tar.bz2
aports-1a49f8b773a084fc97a87b08f3874a7826d71bbb.tar.xz
community/java-jna: upgrade to 4.5.0
-rw-r--r--community/java-jna/0001-jar-without-natives.patch20
-rw-r--r--community/java-jna/APKBUILD14
2 files changed, 23 insertions, 11 deletions
diff --git a/community/java-jna/0001-jar-without-natives.patch b/community/java-jna/0001-jar-without-natives.patch
index de1d8339c6..c583c1a01d 100644
--- a/community/java-jna/0001-jar-without-natives.patch
+++ b/community/java-jna/0001-jar-without-natives.patch
@@ -1,12 +1,11 @@
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Wed, 13 Apr 2016 20:58:00 +0200
+Last-Updated: Tue, 31 Oct 2017 20:37:04 +0200
Subject: [PATCH] Exclude native libs from jna.jar
-diff --git a/build.xml b/build.xml
-index c74927b..aa461e0 100644
--- a/build.xml
+++ b/build.xml
-@@ -376,140 +376,10 @@
+@@ -411,155 +411,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"/>
@@ -52,12 +51,18 @@ index c74927b..aa461e0 100644
-processor=x86-64;osname=linux,
-com/sun/jna/linux-arm/libjnidispatch.so;
-processor=arm;osname=linux,
+-com/sun/jna/linux-armel/libjnidispatch.so;
+-processor=armel;osname=linux,
-com/sun/jna/linux-aarch64/libjnidispatch.so;
-processor=aarch64;osname=linux,
-com/sun/jna/linux-ia64/libjnidispatch.so;
-processor=ia64;osname=linux,
-com/sun/jna/linux-sparcv9/libjnidispatch.so;
-processor=sparcv9;osname=linux,
+-com/sun/jna/linux-mips64el/libjnidispatch.so;
+-processor=mips64el;osname=linux,
+-com/sun/jna/linux-s390x/libjnidispatch.so;
+-processor=S390x;osname=linux,
-
-com/sun/jna/freebsd-x86/libjnidispatch.so;
-processor=x86;osname=freebsd,
@@ -96,6 +101,9 @@ index c74927b..aa461e0 100644
- <zipfileset src="${lib.native}/linux-arm.jar"
- includes="*jnidispatch*"
- prefix="com/sun/jna/linux-arm"/>
+- <zipfileset src="${lib.native}/linux-armel.jar"
+- includes="*jnidispatch*"
+- prefix="com/sun/jna/linux-armel"/>
- <zipfileset src="${lib.native}/linux-aarch64.jar"
- includes="*jnidispatch*"
- prefix="com/sun/jna/linux-aarch64"/>
@@ -114,6 +122,12 @@ index c74927b..aa461e0 100644
- <zipfileset src="${lib.native}/linux-sparcv9.jar"
- includes="*jnidispatch*"
- prefix="com/sun/jna/linux-sparcv9"/>
+- <zipfileset src="${lib.native}/linux-mips64el.jar"
+- includes="*jnidispatch*"
+- prefix="com/sun/jna/linux-mips64el"/>
+- <zipfileset src="${lib.native}/linux-s390x.jar"
+- includes="*jnidispatch*"
+- prefix="com/sun/jna/linux-s390x"/>
- <zipfileset src="${lib.native}/sunos-x86.jar"
- includes="*jnidispatch*"
- prefix="com/sun/jna/sunos-x86"/>
diff --git a/community/java-jna/APKBUILD b/community/java-jna/APKBUILD
index 955072990f..4363527e90 100644
--- a/community/java-jna/APKBUILD
+++ b/community/java-jna/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=java-jna
_pkgname=${pkgname#java-}
-pkgver=4.3.0
+pkgver=4.5.0
pkgrel=0
pkgdesc="JNA provides Java programs easy access to native shared libraries."
url="https://github.com/java-native-access/jna"
@@ -27,7 +27,9 @@ prepare() {
# Remove bundled libffi sources, we're gonna use headers form libffi-dev.
rm -r native/libffi
- find -name "*.jar" -exec rm {} +
+ # Remove some bundled JARs.
+ rm -r dist
+ find lib/native -name "*.jar" -exec rm {} +
}
build() {
@@ -62,9 +64,5 @@ native() {
ln -sf $soname.$sover "$subpkgdir"/usr/lib/$soname
}
-md5sums="2de8ba99fc91809935e6c2ab02f49a82 java-jna-4.3.0.tar.gz
-2eceb51b9eafbe0a7f162fe6b3297c03 0001-jar-without-natives.patch"
-sha256sums="f7e3ef21051ef7dcc2176db19aca6b759c2809bd93c363c6fe697cdf86908ae8 java-jna-4.3.0.tar.gz
-bad5487a1c8aa4e227b1a27fbac787e9d84a6bf748325708cdf045b625bd1f82 0001-jar-without-natives.patch"
-sha512sums="5e27771c114ead302196f7f99bc4928e12acd72687a481501a4c1753952517b7ed411828f9f4a7ae4631a4473a86720b4eba7bae9e22704c53dfc7a46609fa3d java-jna-4.3.0.tar.gz
-67110a14ef0879c590427c919ec0057aab5902ba1fb3a3a1aa9f9c395aefb31f4b2244d0a2a59fde1a2fae418ee45d666f3fd780784c6194abe533f4f5cbebbc 0001-jar-without-natives.patch"
+sha512sums="70dd106e828643538ce464b077dd6a7fd8b0e1bdce595f5f03d76adbc61c422433ad56b4e2f37794b52bfdbc4753633de0eb6ce4f20061ef2566c7353be89d5d java-jna-4.5.0.tar.gz
+dacfa03e1a957172502dd10007445e844df67288fde07f7ada80a5cbfe3186511aa7a866c8c757a0a94c894829fead9c67ad0993f2105d2fef1f18d22ee01cdb 0001-jar-without-natives.patch"