[packages/java-jna] - updated to 5.7.0 (still fails two tests)

[qboosh]

commit ab714d2ed612fc7324ebcda2e4cc13c96753f5eb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Feb 4 17:13:28 2023 +0100

    - updated to 5.7.0 (still fails two tests)

 java-jna.spec      |  4 ++--
 jna-no-aar.patch   | 12 ++++++------
 jna-nonative.patch | 11 +++++++----
 3 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/java-jna.spec b/java-jna.spec
index 3518eb3..80326b2 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.6.0
+Version:	5.7.0
 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:	94886628549a2f3ab29ba340dd335f17
+# Source0-md5:	e2484e413fc68f526eeddff8e5637ed2
 # 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
diff --git a/jna-no-aar.patch b/jna-no-aar.patch
index 2e1cdd0..4d986a7 100644
--- a/jna-no-aar.patch
+++ b/jna-no-aar.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- jna-5.7.0/build.xml.orig	2023-02-03 22:16:07.303131276 +0100
++++ jna-5.7.0/build.xml	2023-02-03 22:33:50.867369454 +0100
+@@ -1376,10 +1376,10 @@ cd ..
      </jar>
    </target>
  
@@ -8,8 +8,8 @@
 +  <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="${build}" includes="${jar},${minjar},${aar},${jar-jpms}"/>
++      <fileset dir="${build}" includes="${jar},${minjar},${jar-jpms}"/>
+       <fileset dir="${contrib}/platform/dist" includes="jna-platform.jar,jna-platform-jpms.jar"/>
        <fileset dir="${lib.native}">
          <include name="*.jar"/>
diff --git a/jna-nonative.patch b/jna-nonative.patch
index e7e19d6..20f401a 100644
--- a/jna-nonative.patch
+++ b/jna-nonative.patch
@@ -1,6 +1,6 @@
---- jna-5.5.0/build.xml~	2019-10-30 17:41:18.000000000 +0100
-+++ jna-5.5.0/build.xml	2020-05-01 13:28:12.569529122 +0200
-@@ -506,84 +506,6 @@
+--- jna-5.7.0/build.xml.orig	2021-02-08 19:49:25.000000000 +0100
++++ jna-5.7.0/build.xml	2023-02-03 22:15:38.656619801 +0100
+@@ -564,87 +564,6 @@ osname=macosx;processor=x86;processor=x8
        <fileset dir="${classes}" excludes="${jar.omitted}">
          <patternset refid="jar-compiled"/>
        </fileset>
@@ -79,13 +79,16 @@
 -      <zipfileset src="${lib.native}/win32-x86-64.jar"
 -                  includes="*jnidispatch*"
 -                  prefix="com/sun/jna/win32-x86-64"/>
+-      <zipfileset src="${lib.native}/win32-aarch64.jar"
+-                  includes="*jnidispatch*"
+-                  prefix="com/sun/jna/win32-aarch64"/>
 -      <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"/>
-@@ -618,27 +540,6 @@
+@@ -683,27 +602,6 @@ osname=macosx;processor=x86;processor=x8
            <fileset file="${build}/${minjar}"/>
            <globmapper from="*" to="classes.jar"/>
          </mappedresources>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/java-jna.git/commitdiff/050c755829f59720d1b31208d28f8d00cc935216