This commit is contained in:
parent
43bb9aa165
commit
dad548ded6
BIN
5.13.0.tar.gz
(Stored with Git LFS)
Normal file
BIN
5.13.0.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b684792ff099afba639288da75bc6ae4a2641f46a6429b5a481b7749630c56f7
|
||||
size 93781100
|
@ -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-06-04 08:56:23.649941131 +0200
|
||||
@@ -357,7 +357,7 @@
|
||||
--- jna-5.13.0/build.xml 2023-05-30 11:38:06.363232087 +0200
|
||||
+++ jna-5.13.0/build.xml 2023-05-30 15:27:50.875085921 +0200
|
||||
@@ -370,7 +370,7 @@
|
||||
<target name="-setup" depends="-dynamic-properties">
|
||||
<path id="compile-test.path">
|
||||
<path id="test.libs">
|
||||
@ -9,7 +9,7 @@
|
||||
<include name="junit.jar"/>
|
||||
<include name="hamcrest-core-1.3.jar"/>
|
||||
</fileset>
|
||||
@@ -403,7 +403,7 @@
|
||||
@@ -440,7 +440,7 @@
|
||||
</srcfiles>
|
||||
</uptodate>
|
||||
</target>
|
||||
@ -18,7 +18,7 @@
|
||||
description="Build primary jar">
|
||||
<!-- Bundle native components with primary jar to facilitate
|
||||
easy distribution to common platforms.
|
||||
@@ -436,157 +436,10 @@
|
||||
@@ -485,87 +485,6 @@
|
||||
<!-- Note that no terminal "*" is included in this list,
|
||||
which will force failure on unsupported platforms.
|
||||
-->
|
||||
@ -28,10 +28,14 @@
|
||||
-processor=x86;osname=win32,
|
||||
-com/sun/jna/win32-x86-64/jnidispatch.dll;
|
||||
-processor=x86-64;osname=win32,
|
||||
-com/sun/jna/win32-aarch64/jnidispatch.dll;
|
||||
-processor=aarch64;osname=win32,
|
||||
-com/sun/jna/win32-x86/jnidispatch.dll;
|
||||
-processor=x86;osname=win,
|
||||
-com/sun/jna/win32-x86-64/jnidispatch.dll;
|
||||
-processor=x86-64;osname=win,
|
||||
-com/sun/jna/win32-aarch64/jnidispatch.dll;
|
||||
-processor=aarch64;osname=win,
|
||||
-com/sun/jna/w32ce-arm/jnidispatch.dll;
|
||||
-processor=arm;osname=wince,
|
||||
-
|
||||
@ -75,20 +79,34 @@
|
||||
-processor=mips64el;osname=linux,
|
||||
-com/sun/jna/linux-s390x/libjnidispatch.so;
|
||||
-processor=S390x;osname=linux,
|
||||
-com/sun/jna/linux-loongarch64/libjnidispatch.so;
|
||||
-processor=loongarch64;osname=linux,
|
||||
-
|
||||
-com/sun/jna/freebsd-x86/libjnidispatch.so;
|
||||
-processor=x86;osname=freebsd,
|
||||
-com/sun/jna/freebsd-x86-64/libjnidispatch.so;
|
||||
-processor=x86-64;osname=freebsd,
|
||||
-
|
||||
-com/sun/jna/openbsd-x86/libjnidispatch.so;
|
||||
-processor=x86;osname=openbsd,
|
||||
-com/sun/jna/openbsd-x86-64/libjnidispatch.so;
|
||||
-processor=x86-64;osname=openbsd,
|
||||
-
|
||||
-com/sun/jna/darwin/libjnidispatch.jnilib;
|
||||
-osname=macosx;processor=x86;processor=x86-64;processor=ppc
|
||||
-com/sun/jna/darwin-ppc/libjnidispatch.jnilib;
|
||||
-osname=macosx;processor=ppc,
|
||||
-com/sun/jna/darwin-ppc64/libjnidispatch.jnilib;
|
||||
-osname=macosx;processor=ppc64,
|
||||
-com/sun/jna/darwin-x86/libjnidispatch.jnilib;
|
||||
-osname=macosx;processor=x86,
|
||||
-com/sun/jna/darwin-x86-64/libjnidispatch.jnilib;
|
||||
-osname=macosx;processor=x86-64,
|
||||
-com/sun/jna/darwin-aarch64/libjnidispatch.jnilib;
|
||||
-osname=macosx;processor=aarch64
|
||||
-"/>
|
||||
</manifest>
|
||||
<manifest file="@{target}" mode="update" if:true="@{module-info}">
|
||||
<attribute name="Multi-Release" value="true"/>
|
||||
@@ -596,108 +515,6 @@
|
||||
<fileset dir="${classes}" excludes="${jar.omitted}">
|
||||
<patternset refid="jar-compiled"/>
|
||||
</fileset>
|
||||
@ -101,9 +119,21 @@
|
||||
- <zipfileset src="${lib.native}/aix-ppc64.jar"
|
||||
- includes="*jnidispatch*"
|
||||
- prefix="com/sun/jna/aix-ppc64"/>
|
||||
- <zipfileset src="${lib.native}/darwin.jar"
|
||||
- <zipfileset src="${lib.native}/darwin-ppc.jar"
|
||||
- includes="*jnidispatch*"
|
||||
- prefix="com/sun/jna/darwin"/>
|
||||
- prefix="com/sun/jna/darwin-ppc"/>
|
||||
- <zipfileset src="${lib.native}/darwin-ppc64.jar"
|
||||
- includes="*jnidispatch*"
|
||||
- prefix="com/sun/jna/darwin-ppc64"/>
|
||||
- <zipfileset src="${lib.native}/darwin-x86.jar"
|
||||
- includes="*jnidispatch*"
|
||||
- prefix="com/sun/jna/darwin-x86"/>
|
||||
- <zipfileset src="${lib.native}/darwin-x86-64.jar"
|
||||
- includes="*jnidispatch*"
|
||||
- prefix="com/sun/jna/darwin-x86-64"/>
|
||||
- <zipfileset src="${lib.native}/darwin-aarch64.jar"
|
||||
- includes="*jnidispatch*"
|
||||
- prefix="com/sun/jna/darwin-aarch64"/>
|
||||
- <zipfileset src="${lib.native}/linux-x86.jar"
|
||||
- includes="*jnidispatch*"
|
||||
- prefix="com/sun/jna/linux-x86"/>
|
||||
@ -137,9 +167,15 @@
|
||||
- <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"/>
|
||||
- <zipfileset src="${lib.native}/linux-riscv64.jar"
|
||||
- includes="*jnidispatch*"
|
||||
- prefix="com/sun/jna/linux-riscv64"/>
|
||||
- <zipfileset src="${lib.native}/sunos-x86.jar"
|
||||
- includes="*jnidispatch*"
|
||||
- prefix="com/sun/jna/sunos-x86"/>
|
||||
@ -167,6 +203,9 @@
|
||||
- <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"/>
|
||||
@ -176,7 +215,16 @@
|
||||
</jar>
|
||||
<zip zipfile="${build}/${minjar}">
|
||||
<zipfileset src="${build}/${jar}" excludes="**/*jnidispatch*"/>
|
||||
@@ -1059,7 +912,7 @@
|
||||
@@ -781,7 +598,7 @@
|
||||
</zip>
|
||||
</target>
|
||||
|
||||
- <target name="contrib-jars" depends="platform-jar" description="Build contrib jars">
|
||||
+ <target name="contrib-jars" description="Build contrib jars">
|
||||
<subant target="jar" failonerror="true">
|
||||
<property name="file.reference.jna.build" location="${build}"/>
|
||||
<property name="file.reference.jna.jar" location="${build}/${jar}"/>
|
||||
@@ -1196,7 +1013,7 @@
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
@ -185,7 +233,7 @@
|
||||
description="Compile all test code">
|
||||
<javac classpathref="compile-test.path"
|
||||
source="${test.compatibility}"
|
||||
@@ -1111,8 +964,6 @@
|
||||
@@ -1284,8 +1101,6 @@
|
||||
<mkdir dir="${build}/jws"/>
|
||||
<copy todir="${build}/jws" file="${build}/${jar}"/>
|
||||
<copy todir="${build}/jws" file="${build}/${testjar}"/>
|
||||
@ -194,7 +242,7 @@
|
||||
<jar jarfile="${build}/jws/jnidispatch.jar" createUnicodeExtraFields="never" encoding="UTF-8">
|
||||
<fileset dir="${build.native}" includes="*jnidispatch.*"/>
|
||||
</jar>
|
||||
@@ -1313,7 +1164,6 @@
|
||||
@@ -1486,7 +1301,6 @@
|
||||
<doctitle>JNA API Documentation</doctitle>
|
||||
<header>${header}</header>
|
||||
<bottom>${footer}</bottom>
|
||||
@ -202,7 +250,7 @@
|
||||
|
||||
<packageset dir="${src}" defaultexcludes="yes">
|
||||
<patternset>
|
||||
@@ -1331,13 +1181,14 @@
|
||||
@@ -1504,13 +1318,14 @@
|
||||
<group title="Platform Specific" packages="com.sun.jna.platform.*"/>
|
||||
|
||||
<arg value="-notimestamp"/>
|
||||
@ -217,10 +265,9 @@
|
||||
+ <target name="dist" depends="jar,aar,javadoc,contrib-jars,compile-tests"
|
||||
description="Build distribution files">
|
||||
<copy todir="${dist}" force="true" overwrite="true">
|
||||
<fileset dir="${build}" includes="${jar},${minjar},${aar}"/>
|
||||
Only in jna-5.5.0/native/libffi/src/powerpc: linux64_closure.S.orig
|
||||
--- jna-5.5.0/native/Makefile 2019-10-30 17:41:18.000000000 +0100
|
||||
+++ jna-5.5.0/native/Makefile 2020-06-04 08:53:07.896789270 +0200
|
||||
<fileset dir="${build}" includes="${jar},${minjar},${aar},${jar-jpms}"/>
|
||||
--- jna-5.13.0/native/Makefile 2023-05-30 11:38:06.515233135 +0200
|
||||
+++ jna-5.13.0/native/Makefile 2023-05-30 12:04:00.394037184 +0200
|
||||
@@ -97,7 +97,7 @@
|
||||
PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses
|
||||
CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
|
||||
@ -230,12 +277,12 @@ Only in jna-5.5.0/native/libffi/src/powerpc: linux64_closure.S.orig
|
||||
ifeq ($(DYNAMIC_LIBFFI),true)
|
||||
CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo)
|
||||
LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi)
|
||||
@@ -337,11 +337,11 @@
|
||||
@@ -356,11 +356,11 @@
|
||||
GCC_MAJOR_VERSION = $(shell gcc -dumpversion | cut -f 1 -d '.')
|
||||
ifneq ($(GCC_MAJOR_VERSION),4)
|
||||
ifneq ($(GCC_MAJOR_VERSION),3)
|
||||
- LOC_CC_OPTS=-Wno-unknown-warning-option -Werror -Wno-clobbered -Wno-unused-variable
|
||||
+ LOC_CC_OPTS=-Wno-error -Wno-clobbered -Wno-unused-variable
|
||||
- LOC_CC_OPTS=-Wno-unknown-warning-option -Werror -Wno-clobbered -Wno-unused-variable -Wno-alloca-larger-than
|
||||
+ LOC_CC_OPTS=-Wno-error -Wno-clobbered -Wno-unused-variable -Wno-alloca-larger-than
|
||||
endif
|
||||
endif
|
||||
else
|
||||
@ -244,7 +291,7 @@ Only in jna-5.5.0/native/libffi/src/powerpc: linux64_closure.S.orig
|
||||
endif
|
||||
|
||||
# Enable 64-bit builds if the arch demands it
|
||||
@@ -457,7 +457,6 @@
|
||||
@@ -486,7 +486,6 @@
|
||||
|
||||
$(LIBRARY): $(JNIDISPATCH_OBJS) $(FFI_LIB)
|
||||
$(LD) $(LDFLAGS) $(JNIDISPATCH_OBJS) $(FFI_LIB) $(LIBS)
|
||||
|
@ -1,22 +1,21 @@
|
||||
diff -urEbwB jna-5.4.0/build.xml jna-5.4.0.new/build.xml
|
||||
--- jna-5.4.0/build.xml 2019-07-19 21:22:03.000000000 +0200
|
||||
+++ jna-5.4.0.new/build.xml 2019-10-10 21:47:22.950356404 +0200
|
||||
@@ -102,7 +102,12 @@
|
||||
--- jna-5.13.0/build.xml 2023-05-30 15:30:31.116195853 +0200
|
||||
+++ jna-5.13.0/build.xml 2023-05-30 15:31:56.400786710 +0200
|
||||
@@ -106,8 +106,12 @@
|
||||
JDK 11 is the last JDK, that supports creation of Java 6 compatible class
|
||||
files.
|
||||
-->
|
||||
<condition property="compatibility" value="1.6" else="9">
|
||||
- <condition property="compatibility" value="1.6" else="9">
|
||||
+ <condition property="compatibility" value="1.8" else="9">
|
||||
+ <or>
|
||||
<matches pattern="^1\.\d+$" string="${ant.java.version}"/>
|
||||
+ <matches pattern="^9.*$" string="${ant.java.version}"/>
|
||||
+ <matches pattern="^10.*$$" string="${ant.java.version}"/>
|
||||
+ <matches pattern="^11.*$$" string="${ant.java.version}"/>
|
||||
+ <matches pattern="^1.*$$" string="${ant.java.version}"/>
|
||||
+ </or>
|
||||
</condition>
|
||||
|
||||
<condition property="compatibility-check" value="true">
|
||||
diff -urEbwB jna-5.4.0/contrib/platform/src/com/sun/jna/platform/mac/XAttrUtil.java jna-5.4.0.new/contrib/platform/src/com/sun/jna/platform/mac/XAttrUtil.java
|
||||
--- jna-5.4.0/contrib/platform/src/com/sun/jna/platform/mac/XAttrUtil.java 2019-07-19 21:22:03.000000000 +0200
|
||||
+++ jna-5.4.0.new/contrib/platform/src/com/sun/jna/platform/mac/XAttrUtil.java 2019-10-10 21:37:54.962613364 +0200
|
||||
--- jna-5.13.0/contrib/platform/src/com/sun/jna/platform/mac/XAttrUtil.java 2023-05-30 15:30:31.140196020 +0200
|
||||
+++ jna-5.13.0/contrib/platform/src/com/sun/jna/platform/mac/XAttrUtil.java 2023-05-30 15:30:47.452309013 +0200
|
||||
@@ -23,6 +23,7 @@
|
||||
*/
|
||||
package com.sun.jna.platform.mac;
|
||||
@ -39,9 +38,8 @@ diff -urEbwB jna-5.4.0/contrib/platform/src/com/sun/jna/platform/mac/XAttrUtil.j
|
||||
}
|
||||
}
|
||||
|
||||
diff -urEbwB jna-5.4.0/test/com/sun/jna/BufferArgumentsMarshalTest.java jna-5.4.0.new/test/com/sun/jna/BufferArgumentsMarshalTest.java
|
||||
--- jna-5.4.0/test/com/sun/jna/BufferArgumentsMarshalTest.java 2019-07-19 21:22:03.000000000 +0200
|
||||
+++ jna-5.4.0.new/test/com/sun/jna/BufferArgumentsMarshalTest.java 2019-10-10 21:28:39.574890668 +0200
|
||||
--- jna-5.13.0/test/com/sun/jna/BufferArgumentsMarshalTest.java 2023-05-30 15:30:31.288197044 +0200
|
||||
+++ jna-5.13.0/test/com/sun/jna/BufferArgumentsMarshalTest.java 2023-05-30 15:30:47.452309013 +0200
|
||||
@@ -23,6 +23,7 @@
|
||||
*/
|
||||
package com.sun.jna;
|
||||
@ -59,9 +57,8 @@ diff -urEbwB jna-5.4.0/test/com/sun/jna/BufferArgumentsMarshalTest.java jna-5.4.
|
||||
lib.fillInt8Buffer(buf, 512, (byte)0);
|
||||
for (int i=0;i < buf.capacity();i++) {
|
||||
assertEquals("Bad value at index " + i,
|
||||
diff -urEbwB jna-5.4.0/test/com/sun/jna/PerformanceTest.java jna-5.4.0.new/test/com/sun/jna/PerformanceTest.java
|
||||
--- jna-5.4.0/test/com/sun/jna/PerformanceTest.java 2019-07-19 21:22:03.000000000 +0200
|
||||
+++ jna-5.4.0.new/test/com/sun/jna/PerformanceTest.java 2019-10-10 21:26:21.041920761 +0200
|
||||
--- jna-5.13.0/test/com/sun/jna/PerformanceTest.java 2023-05-30 15:30:31.288197044 +0200
|
||||
+++ jna-5.13.0/test/com/sun/jna/PerformanceTest.java 2023-05-30 15:30:47.452309013 +0200
|
||||
@@ -396,7 +396,7 @@
|
||||
start = System.currentTimeMillis();
|
||||
for (int i=0;i < COUNT;i++) {
|
||||
@ -89,9 +86,8 @@ diff -urEbwB jna-5.4.0/test/com/sun/jna/PerformanceTest.java jna-5.4.0.new/test/
|
||||
b.put(bulk);
|
||||
}
|
||||
delta = System.currentTimeMillis() - start;
|
||||
diff -urEbwB jna-5.4.0/test/com/sun/jna/PointerBufferTest.java jna-5.4.0.new/test/com/sun/jna/PointerBufferTest.java
|
||||
--- jna-5.4.0/test/com/sun/jna/PointerBufferTest.java 2019-07-19 21:22:03.000000000 +0200
|
||||
+++ jna-5.4.0.new/test/com/sun/jna/PointerBufferTest.java 2019-10-10 21:21:33.152310989 +0200
|
||||
--- jna-5.13.0/test/com/sun/jna/PointerBufferTest.java 2023-05-30 15:30:31.288197044 +0200
|
||||
+++ jna-5.13.0/test/com/sun/jna/PointerBufferTest.java 2023-05-30 15:30:47.452309013 +0200
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
package com.sun.jna;
|
||||
|
18
jna.spec
18
jna.spec
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
Name: jna
|
||||
Version: 5.5.0
|
||||
Version: 5.13.0
|
||||
Release: 0
|
||||
Summary: Pure Java access to native libraries
|
||||
License: Apache-2.0 OR LGPL-2.1-or-later
|
||||
@ -32,11 +32,12 @@ Patch3: jna-java8compat.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: dos2unix
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: java-devel >= 9
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: libXt-devel
|
||||
BuildRequires: libffi-devel
|
||||
BuildRequires: objectweb-asm
|
||||
Requires: java >= 1.8
|
||||
Provides: jna-native = %{version}-%{release}
|
||||
Obsoletes: jna-native < %{version}-%{release}
|
||||
@ -82,6 +83,7 @@ sed -i 's|@LIBDIR@|%{_libdir}/%{name}|' src/com/sun/jna/Native.java
|
||||
|
||||
%build
|
||||
build-jar-repository -s -p lib ant
|
||||
ln -s $(find-jar objectweb-asm/asm) lib/asm-8.0.1.jar
|
||||
%{ant} \
|
||||
jar \
|
||||
native \
|
||||
@ -104,17 +106,17 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/
|
||||
|
||||
install -d -m 755 %{buildroot}%{_jnidir}/%{name}
|
||||
install -d -m 755 %{buildroot}%{_javadir}/%{name}
|
||||
install -p -m 644 build/jna-min.jar %{buildroot}%{_jnidir}/%{name}.jar
|
||||
install -p -m 644 build/jna-jpms.jar %{buildroot}%{_jnidir}/%{name}.jar
|
||||
ln -sf ../%{name}.jar %{buildroot}%{_jnidir}/%{name}/%{name}.jar
|
||||
ln -sf %{_jnidir}/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
install -p -m 644 ./contrib/platform/dist/jna-platform.jar %{buildroot}%{_javadir}/%{name}-platform.jar
|
||||
install -p -m 644 ./contrib/platform/dist/jna-platform-jpms.jar %{buildroot}%{_javadir}/%{name}-platform.jar
|
||||
ln -sf ../%{name}-platform.jar %{buildroot}%{_javadir}/%{name}/%{name}-platform.jar
|
||||
|
||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||
install -p -m 644 pom-jna.xml %{buildroot}/%{_mavenpomdir}/%{name}.pom
|
||||
install -p -m 644 pom-jna-platform.xml %{buildroot}/%{_mavenpomdir}/%{name}-platform.pom
|
||||
%add_maven_depmap %{name}.pom %{name}.jar
|
||||
%add_maven_depmap %{name}-platform.pom %{name}-platform.jar -a net.java.dev.jna:platform -f contrib
|
||||
install -p -m 644 build/pom-jna.xml %{buildroot}/%{_mavenpomdir}/%{name}.pom
|
||||
install -p -m 644 build/pom-jna-platform.xml %{buildroot}/%{_mavenpomdir}/%{name}-platform.pom
|
||||
%add_maven_depmap %{name}.pom %{name}.jar -a net.java.dev.jna:jna-jpms
|
||||
%add_maven_depmap %{name}-platform.pom %{name}-platform.jar -a net.java.dev.jna:platform,net.java.dev.jna:jna-platform-jpms -f contrib
|
||||
|
||||
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
||||
cp -pr doc/javadoc/* %{buildroot}%{_javadocdir}/%{name}
|
||||
|
Loading…
Reference in New Issue
Block a user