[packages/java-jna] - updated to 4.5.1 - updated nonative,x32 patches - added no-aar patch (skip building .aar archive)
qboosh
qboosh at pld-linux.org
Fri Jun 29 20:58:59 CEST 2018
commit e11dd113b6f155b7462f4b950548672e3a55098c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Jun 29 21:00:27 2018 +0200
- updated to 4.5.1
- updated nonative,x32 patches
- added no-aar patch (skip building .aar archive)
java-jna.spec | 16 +++++++++++-----
jna-no-aar.patch | 15 +++++++++++++++
jna-nonative.patch | 44 ++++++++++++++++++++++++++++++++++++++++----
jna-x32.patch | 22 +++++++++++-----------
4 files changed, 77 insertions(+), 20 deletions(-)
---
diff --git a/java-jna.spec b/java-jna.spec
index 2c7f08c..e764dc5 100644
--- a/java-jna.spec
+++ b/java-jna.spec
@@ -7,12 +7,13 @@
Summary: Easy access to native shared libraries from Java
Summary(pl.UTF-8): Prosty dostęp do natywnych bibliotek współdzielonych z poziomu Javy
Name: java-jna
-Version: 4.2.1
-Release: 2
+Version: 4.5.1
+Release: 1
License: LGPL v2.1 or Apache v2.0
Group: Libraries/Java
+#Source0Download: https://github.com/java-native-access/jna/releases
Source0: https://github.com/java-native-access/jna/archive/%{version}/jna-%{version}.tar.gz
-# Source0-md5: 899675953b365fc4e0da6b7eb7802a8e
+# Source0-md5: 3cf5c206ba2246386af2e9248fa6f035
# Note: by default jna.jar contains versions of native libjnidispatch
# for many systems/architectures; this patch disables such packaging;
# we package libjnidispatch.so as normal native library instead
@@ -20,8 +21,9 @@ Patch0: jna-nonative.patch
Patch1: jna-soname.patch
Patch2: jna-tmpdir.patch
Patch3: jna-x32.patch
+Patch4: jna-no-aar.patch
URL: https://github.com/java-native-access/jna/
-%if %(locale -a | grep -q '^en_US$'; echo $?)%(locale -a | grep -q '^en_US\.UTF-8$'; echo $?)
+%if %(locale -a | grep -q '^en_US$'; echo $?)%(locale -a | grep -q '^en_US\.utf8$'; echo $?)
BuildRequires: glibc-localedb-all
%endif
BuildRequires: ant >= 1.9.0
@@ -60,6 +62,7 @@ ani kod natywny.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%{__rm} -r dist/* lib/native/*.jar
@@ -70,10 +73,13 @@ ani kod natywny.
# optflags
%{__sed} -i -e '/property name="cflags_extra\.native"/s at value=""@value="%{rpmcflags}"@' build.xml
+# ELFAnalyserTest fails when foreign native libraries are not present
+%{__rm} test/com/sun/jna/ELFAnalyserTest.java
+
%build
# build seems to need iso-8859-1 locale (there are some 8bit-encoded characters in win32 sources)
export LC_ALL=en_US
-%ant -DCC="%{__cc}" -Drelease=1 -Ddynlink.native=true dist
+%ant -DCC="%{__cc}" -Drelease=1 -Dbuild-native=true -Ddynlink.native=true dist
%if %{with tests}
# but tests require UTF-8
diff --git a/jna-no-aar.patch b/jna-no-aar.patch
new file mode 100644
index 0000000..2e1cdd0
--- /dev/null
+++ b/jna-no-aar.patch
@@ -0,0 +1,15 @@
+--- jna-4.5.1/build.xml.orig 2018-06-28 20:56:55.014778513 +0200
++++ jna-4.5.1/build.xml 2018-06-28 21:10:27.268102570 +0200
+@@ -1141,10 +1141,10 @@
+ </jar>
+ </target>
+
+- <target name="dist" depends="jar,aar,javadoc,contrib-jars,compile-tests,native"
++ <target name="dist" depends="jar,javadoc,contrib-jars,compile-tests,native"
+ description="Build distribution files">
+ <copy todir="${dist}" force="true" overwrite="true">
+- <fileset dir="${build}" includes="${jar},${minjar},${aar}"/>
++ <fileset dir="${build}" includes="${jar},${minjar}"/>
+ <fileset dir="${contrib}/platform/dist" includes="jna-platform.jar"/>
+ <fileset dir="${lib.native}">
+ <include name="*.jar"/>
diff --git a/jna-nonative.patch b/jna-nonative.patch
index 1b1112e..e340828 100644
--- a/jna-nonative.patch
+++ b/jna-nonative.patch
@@ -1,7 +1,6 @@
-diff -dur jna-4.2.1.orig/build.xml jna-4.2.1/build.xml
---- jna-4.2.1.orig/build.xml 2015-10-18 14:40:13.000000000 +0200
-+++ jna-4.2.1/build.xml 2015-10-27 12:15:47.000000000 +0100
-@@ -441,75 +441,6 @@
+--- jna-4.5.1/build.xml.orig 2018-06-28 19:41:44.691496684 +0200
++++ jna-4.5.1/build.xml 2018-06-28 19:45:43.404827190 +0200
+@@ -492,84 +492,6 @@
<fileset dir="${classes}" excludes="${jar.omitted}">
<patternset refid="jar-compiled"/>
</fileset>
@@ -26,6 +25,9 @@ diff -dur jna-4.2.1.orig/build.xml jna-4.2.1/build.xml
- <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"/>
@@ -44,6 +46,12 @@ diff -dur jna-4.2.1.orig/build.xml jna-4.2.1/build.xml
- <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"/>
@@ -77,3 +85,31 @@ diff -dur jna-4.2.1.orig/build.xml jna-4.2.1/build.xml
</jar>
<zip zipfile="${build}/${minjar}">
<zipfileset src="${build}/${jar}" excludes="**/*jnidispatch*"/>
+@@ -523,27 +523,6 @@
+ <fileset file="${build}/${minjar}"/>
+ <globmapper from="*" to="classes.jar"/>
+ </mappedresources>
+- <zipfileset src="${lib.native}/android-aarch64.jar"
+- includes="*jnidispatch*"
+- prefix="jni/arm64-v8a"/>
+- <zipfileset src="${lib.native}/android-arm.jar"
+- includes="*jnidispatch*"
+- prefix="jni/armeabi"/>
+- <zipfileset src="${lib.native}/android-armv7.jar"
+- includes="*jnidispatch*"
+- prefix="jni/armeabi-v7a"/>
+- <zipfileset src="${lib.native}/android-mips.jar"
+- includes="*jnidispatch*"
+- prefix="jni/mips"/>
+- <zipfileset src="${lib.native}/android-mips64.jar"
+- includes="*jnidispatch*"
+- prefix="jni/mips64"/>
+- <zipfileset src="${lib.native}/android-x86-64.jar"
+- includes="*jnidispatch*"
+- prefix="jni/x86_64"/>
+- <zipfileset src="${lib.native}/android-x86.jar"
+- includes="*jnidispatch*"
+- prefix="jni/x86"/>
+ <fileset dir="${build.aar}"/>
+ </zip>
+ </target>
diff --git a/jna-x32.patch b/jna-x32.patch
index 7c5d8c4..fed69d3 100644
--- a/jna-x32.patch
+++ b/jna-x32.patch
@@ -10,27 +10,27 @@
// Linux & FreeBSD use /usr/lib32, solaris uses /usr/lib/32
archPath = (Platform.isSolaris() ? "/" : "") + Pointer.SIZE * 8;
}
---- jna-4.2.1/src/com/sun/jna/Platform.java.orig 2015-10-18 14:40:13.000000000 +0200
-+++ jna-4.2.1/src/com/sun/jna/Platform.java 2015-12-14 21:43:02.901129494 +0100
-@@ -207,6 +207,10 @@
- return ARCH.startsWith("sparc");
+--- jna-4.5.1/src/com/sun/jna/Platform.java.orig 2018-06-28 19:46:05.611493700 +0200
++++ jna-4.5.1/src/com/sun/jna/Platform.java 2018-06-28 19:49:30.964824730 +0200
+@@ -236,6 +236,10 @@
+ return false;
}
+ public static final boolean isX32() {
+ return ARCH.startsWith("x32");
+ }
+
- static String getCanonicalArchitecture(String arch) {
+ static String getCanonicalArchitecture(String arch, int platform) {
arch = arch.toLowerCase().trim();
if ("powerpc".equals(arch)) {
---- jna-4.2.1/src/com/sun/jna/Native.java.orig 2015-10-18 14:40:13.000000000 +0200
-+++ jna-4.2.1/src/com/sun/jna/Native.java 2015-12-14 21:43:48.103450946 +0100
-@@ -164,7 +164,7 @@
- + " jnidispatch library included with the JNA jar file you are using" + LS);
+--- jna-4.5.1/src/com/sun/jna/Native.java.orig 2018-06-28 19:46:05.611493700 +0200
++++ jna-4.5.1/src/com/sun/jna/Native.java 2018-06-28 19:50:19.764824118 +0200
+@@ -218,7 +218,7 @@
+ setProtected(true);
}
MAX_ALIGNMENT = Platform.isSPARC() || Platform.isWindows()
-- || (Platform.isLinux() && (Platform.isARM() || Platform.isPPC()))
-+ || (Platform.isLinux() && (Platform.isARM() || Platform.isPPC() || Platform.isX32()))
+- || (Platform.isLinux() && (Platform.isARM() || Platform.isPPC() || Platform.isMIPS()))
++ || (Platform.isLinux() && (Platform.isARM() || Platform.isPPC() || Platform.isMIPS()) || Platform.isX32())
|| Platform.isAIX()
|| Platform.isAndroid()
? 8 : LONG_SIZE;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/java-jna.git/commitdiff/e11dd113b6f155b7462f4b950548672e3a55098c
More information about the pld-cvs-commit
mailing list