diff options
Diffstat (limited to 'community/java-jna/0001-jar-without-natives.patch')
-rw-r--r-- | community/java-jna/0001-jar-without-natives.patch | 64 |
1 files changed, 48 insertions, 16 deletions
diff --git a/community/java-jna/0001-jar-without-natives.patch b/community/java-jna/0001-jar-without-natives.patch index 0bfbfe5f906..e5d226b4022 100644 --- a/community/java-jna/0001-jar-without-natives.patch +++ b/community/java-jna/0001-jar-without-natives.patch @@ -1,19 +1,19 @@ 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 +Last-Updated: Sun, 20 Feb 2022 15:27:05 +0100 +Subject: [PATCH] Exclude native libs from jna.jar\ --- a/build.xml +++ b/build.xml -@@ -433,160 +433,10 @@ - <attribute name="Bundle-Vendor" value="${vendor}"/> - <attribute name="Bundle-ActivationPolicy" value="lazy"/> - <attribute name="Export-Package" value="com.sun.jna;version=${jna.major}.${jna.minor}.${jna.revision}, com.sun.jna.ptr;version=${jna.major}.${jna.minor}.${jna.revision}, com.sun.jna.win32;version=${jna.major}.${jna.minor}.${jna.revision}"/> -- <!-- Note that no terminal "*" is included in this list, -- which will force failure on unsupported platforms. -- --> -- <attribute name="Bundle-NativeCode" -- value=" +@@ -471,86 +471,6 @@ + <attribute name="Bundle-Vendor" value="${vendor}"/> + <attribute name="Bundle-ActivationPolicy" value="lazy"/> + <attribute name="Export-Package" value="com.sun.jna;version=${jna.major}.${jna.minor}.${jna.revision}, com.sun.jna.ptr;version=${jna.major}.${jna.minor}.${jna.revision}, com.sun.jna.win32;version=${jna.major}.${jna.minor}.${jna.revision}"/> +- <!-- Note that no terminal "*" is included in this list, +- which will force failure on unsupported platforms. +- --> +- <attribute name="Bundle-NativeCode" +- value=" -com/sun/jna/win32-x86/jnidispatch.dll; -processor=x86;osname=win32, -com/sun/jna/win32-x86-64/jnidispatch.dll; @@ -22,6 +22,8 @@ Subject: [PATCH] Exclude native libs from jna.jar -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, - @@ -70,15 +72,27 @@ Subject: [PATCH] Exclude native libs from jna.jar -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> + <manifest file="@{target}" mode="update" if:true="@{module-info}"> + <attribute name="Multi-Release" value="true"/> +@@ -581,105 +501,6 @@ <fileset dir="${classes}" excludes="${jar.omitted}"> <patternset refid="jar-compiled"/> </fileset> @@ -91,9 +105,21 @@ Subject: [PATCH] Exclude native libs from jna.jar - <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-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"/> +- 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"/> @@ -130,6 +156,9 @@ Subject: [PATCH] Exclude native libs from jna.jar - <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"/> @@ -157,6 +186,9 @@ Subject: [PATCH] Exclude native libs from jna.jar - <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"/> |