[packages/java-jna] - updated to 5.12.1
qboosh
qboosh at pld-linux.org
Sun Feb 5 15:12:05 CET 2023
commit 5a7e35efe16ce6c38c0897ae26a03589ec4cd9e9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Feb 5 14:58:33 2023 +0100
- updated to 5.12.1
java-jna.spec | 8 +++-----
jna-nonative.patch | 11 +++++++----
jna-x32.patch | 18 +++++++++---------
3 files changed, 19 insertions(+), 18 deletions(-)
---
diff --git a/java-jna.spec b/java-jna.spec
index 69123e5..5407b0a 100644
--- a/java-jna.spec
+++ b/java-jna.spec
@@ -6,13 +6,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: 5.11.0
+Version: 5.12.1
Release: 1
License: LGPL v2.1 or Apache v2.0
Group: Libraries/Java
#Source0Download: https://github.com/java-native-access/jna/tags
Source0: https://github.com/java-native-access/jna/archive/%{version}/jna-%{version}.tar.gz
-# Source0-md5: b2e8d2f389ea1ba34b4140f9aece4d73
+# Source0-md5: 2f68db6a2ccf6bc0db0d86cb444d3c57
# 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
@@ -33,9 +33,7 @@ BuildRequires: sed >= 4.0
BuildRequires: unzip
%if %{with system_libffi}
# upstream version
-BuildRequires: libffi-devel >= 3.0.12
-# gcc version (gcc 4.7.3 is not sufficient - missing ffi_prep_cif_var added in libffi 3.0.12)
-BuildRequires: libffi-devel >= 6:4.8
+BuildRequires: libffi-devel >= 7:3.4.2
BuildRequires: pkgconfig
%endif
%if %{with tests}
diff --git a/jna-nonative.patch b/jna-nonative.patch
index 54dc9ff..ab61785 100644
--- a/jna-nonative.patch
+++ b/jna-nonative.patch
@@ -1,6 +1,6 @@
---- jna-5.8.0/build.xml.orig 2021-03-22 18:09:22.000000000 +0100
-+++ jna-5.8.0/build.xml 2023-02-04 17:36:28.489294268 +0100
-@@ -581,102 +581,6 @@ osname=macosx;processor=aarch64
+--- jna-5.12.1/build.xml.orig 2022-06-29 19:29:06.000000000 +0200
++++ jna-5.12.1/build.xml 2023-02-05 14:28:45.455575716 +0100
+@@ -583,105 +583,6 @@ osname=macosx;processor=aarch64
<fileset dir="${classes}" excludes="${jar.omitted}">
<patternset refid="jar-compiled"/>
</fileset>
@@ -61,6 +61,9 @@
- <zipfileset src="${lib.native}/linux-mips64el.jar"
- includes="*jnidispatch*"
- prefix="com/sun/jna/linux-mips64el"/>
+- <zipfileset src="${lib.native}/linux-loongarch64.jar"
+- includes="*jnidispatch*"
+- prefix="com/sun/jna/linux-loongarch64"/>
- <zipfileset src="${lib.native}/linux-s390x.jar"
- includes="*jnidispatch*"
- prefix="com/sun/jna/linux-s390x"/>
@@ -103,7 +106,7 @@
<zipfileset dir="."
includes="LICENSE,LGPL2.1,AL2.0"
prefix="META-INF"/>
-@@ -715,27 +619,6 @@ osname=macosx;processor=aarch64
+@@ -720,27 +621,6 @@ osname=macosx;processor=aarch64
<fileset file="${build}/${minjar}"/>
<globmapper from="*" to="classes.jar"/>
</mappedresources>
diff --git a/jna-x32.patch b/jna-x32.patch
index 3101c45..0382b5f 100644
--- a/jna-x32.patch
+++ b/jna-x32.patch
@@ -10,10 +10,10 @@
// Linux & FreeBSD use /usr/lib32, solaris uses /usr/lib/32
archPath = (Platform.isSolaris() ? "/" : "") + Native.POINTER_SIZE * 8;
}
---- jna-5.6.0/src/com/sun/jna/Platform.java.orig 2023-02-03 16:12:04.262811012 +0100
-+++ jna-5.6.0/src/com/sun/jna/Platform.java 2023-02-03 16:19:26.593247233 +0100
-@@ -233,6 +233,10 @@ public final class Platform {
- return false;
+--- jna-5.12.1/src/com/sun/jna/Platform.java.orig 2023-02-05 14:29:16.165409347 +0100
++++ jna-5.12.1/src/com/sun/jna/Platform.java 2023-02-05 14:31:05.321484664 +0100
+@@ -239,6 +239,10 @@ public final class Platform {
+ return ARCH.startsWith("loongarch");
}
+ public static final boolean isX32() {
@@ -23,14 +23,14 @@
static String getCanonicalArchitecture(String arch, int platform) {
arch = arch.toLowerCase().trim();
if ("powerpc".equals(arch)) {
---- jna-5.6.0/src/com/sun/jna/Native.java.orig 2023-02-03 16:12:04.266143327 +0100
-+++ jna-5.6.0/src/com/sun/jna/Native.java 2023-02-03 16:21:28.159753425 +0100
-@@ -224,7 +224,7 @@ public final class Native implements Ver
+--- jna-5.12.1/src/com/sun/jna/Native.java.orig 2023-02-05 14:29:16.165409347 +0100
++++ jna-5.12.1/src/com/sun/jna/Native.java 2023-02-05 14:31:49.067914336 +0100
+@@ -250,7 +250,7 @@ public final class Native implements Ver
setProtected(true);
}
MAX_ALIGNMENT = Platform.isSPARC() || Platform.isWindows()
-- || (Platform.isLinux() && (Platform.isARM() || Platform.isPPC() || Platform.isMIPS()))
-+ || (Platform.isLinux() && (Platform.isARM() || Platform.isPPC() || Platform.isMIPS()) || Platform.isX32())
+- || (Platform.isLinux() && (Platform.isARM() || Platform.isPPC() || Platform.isMIPS() || Platform.isLoongArch()))
++ || (Platform.isLinux() && (Platform.isARM() || Platform.isPPC() || Platform.isMIPS() || Platform.isLoongArch()) || Platform.isX32())
|| Platform.isAIX()
|| (Platform.isAndroid() && !Platform.isIntel())
? 8 : LONG_SIZE;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/java-jna.git/commitdiff/050c755829f59720d1b31208d28f8d00cc935216
More information about the pld-cvs-commit
mailing list