rpms/jna
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to version 5.10.0

Browse Source
This commit is contained in:
Zuzana Miklankova 2022-01-12 10:21:39 +01:00
parent 58e25ca9c5
commit d7eef977ec
4 changed files with 154 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -17,3 +17,4 @@ jna-3.2.7.tar.bz2
/jna-5.4.0-clean.tar.xz
/jna-5.6.0-clean.tar.xz
/jna-5.9.0-clean.tar.xz
/jna-5.10.0-clean.tar.xz

272
0007-Support-openjdk-17.patch
View File

@ -1,116 +1,130 @@
From d47b8f0db649856949a27fac8f2958da8b98b964 Mon Sep 17 00:00:00 2001
From 511d4b372a2ea1e79b850d2790ce29be9280cd75 Mon Sep 17 00:00:00 2001
From: Zuzana Miklankova <zmiklank@redhat.com>
Date: Wed, 1 Dec 2021 15:24:01 +0100
Subject: [PATCH] patch
Date: Mon, 10 Jan 2022 07:46:11 +0100
Subject: [PATCH] Support-openjdk-17
---
contrib/alphamaskdemo/build.xml | 2 +-
contrib/balloonmanagerdemo/build.xml | 2 +-
contrib/balloontips/build.xml | 2 +-
contrib/dnddemo/build.xml | 2 +-
contrib/monitordemo/build.xml | 2 +-
contrib/msoffice/build.xml | 2 +-
contrib/native_window_msg/build.xml | 2 +-
contrib/alphamaskdemo/build.xml | 4 ++--
contrib/balloonmanagerdemo/build.xml | 4 ++--
contrib/balloontips/build.xml | 4 ++--
contrib/dnddemo/build.xml | 4 ++--
contrib/monitordemo/build.xml | 4 ++--
contrib/msoffice/build.xml | 4 ++--
contrib/native_window_msg/build.xml | 4 ++--
contrib/ntservice/nbproject/project.properties | 4 ++--
contrib/platform/nbproject/project.properties | 4 ++--
contrib/shapedwindowdemo/build.xml | 2 +-
contrib/w32printing/build.xml | 2 +-
contrib/w32windowhooks/build.xml | 2 +-
contrib/x11/build.xml | 2 +-
contrib/shapedwindowdemo/build.xml | 4 ++--
contrib/w32printing/build.xml | 4 ++--
contrib/w32windowhooks/build.xml | 4 ++--
contrib/x11/build.xml | 4 ++--
nbproject/project.xml | 4 ++--
14 files changed, 17 insertions(+), 17 deletions(-)
14 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/contrib/alphamaskdemo/build.xml b/contrib/alphamaskdemo/build.xml
index a9bead9ea..8f119be82 100644
index 2186daadd..9e4a2072e 100644
--- a/contrib/alphamaskdemo/build.xml
+++ b/contrib/alphamaskdemo/build.xml
@@ -37,7 +37,7 @@
<target name="compile">
<mkdir dir="${classes}"/>
<!-- Compile the project. -->
- <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+ <javac srcdir="${src}" destdir="${classes}" target="1.8" source="1.8"
encoding="UTF-8" debug="on" includeantruntime="false">
<classpath>
<path refid="classpath"/>
@@ -9,8 +9,8 @@
<property name="jar" location="${build}/demo-alphamask.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
<property name="main-class" value="com.sun.jna.contrib.demo.AlphaMaskDemo" />
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/contrib/balloonmanagerdemo/build.xml b/contrib/balloonmanagerdemo/build.xml
index 7f53f329e..11c8c5d4f 100644
index e9cba2c7b..37d0d0e7a 100644
--- a/contrib/balloonmanagerdemo/build.xml
+++ b/contrib/balloonmanagerdemo/build.xml
@@ -37,7 +37,7 @@
<target name="compile">
<mkdir dir="${classes}"/>
<!-- Compile the project. -->
- <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+ <javac srcdir="${src}" destdir="${classes}" target="1.8" source="1.8"
encoding="UTF-8" debug="on" includeantruntime="false">
<classpath>
<path refid="classpath"/>
@@ -9,8 +9,8 @@
<property name="jar" location="${build}/demo-balloonmanager.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
<property name="main-class" value="com.sun.jna.contrib.demo.BalloonManagerDemo" />
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/contrib/balloontips/build.xml b/contrib/balloontips/build.xml
index 594b65f95..34b117f2c 100644
index e5b64b11d..8fa15d576 100644
--- a/contrib/balloontips/build.xml
+++ b/contrib/balloontips/build.xml
@@ -37,7 +37,7 @@
<target name="compile">
<mkdir dir="${classes}"/>
<!-- Compile the project. -->
- <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+ <javac srcdir="${src}" destdir="${classes}" target="1.8" source="1.8"
encoding="UTF-8" debug="on" includeantruntime="false">
<classpath>
<path refid="classpath"/>
@@ -9,8 +9,8 @@
<property name="jar" location="${build}/demo-balloontips.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
<property name="main-class" value="com.sun.jna.contrib.demo.FilteredTextField" />
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/contrib/dnddemo/build.xml b/contrib/dnddemo/build.xml
index 4fab70a83..ae84b615a 100644
index 1feacb3a9..151194fcd 100644
--- a/contrib/dnddemo/build.xml
+++ b/contrib/dnddemo/build.xml
@@ -37,7 +37,7 @@
<target name="compile">
<mkdir dir="${classes}"/>
<!-- Compile the project. -->
- <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+ <javac srcdir="${src}" destdir="${classes}" target="1.8" source="1.8"
encoding="UTF-8" debug="on" includeantruntime="false">
<classpath>
<path refid="classpath"/>
@@ -9,8 +9,8 @@
<property name="jar" location="${build}/demo-dnd.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
<property name="main-class" value="com.sun.jna.contrib.demo.GhostedDragImageDemo" />
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/contrib/monitordemo/build.xml b/contrib/monitordemo/build.xml
index cb5ad9e77..2ad6a9de6 100644
index 6e7a5c1b5..f7228c7c9 100644
--- a/contrib/monitordemo/build.xml
+++ b/contrib/monitordemo/build.xml
@@ -37,7 +37,7 @@
<target name="compile">
<mkdir dir="${classes}"/>
<!-- Compile the project. -->
- <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+ <javac srcdir="${src}" destdir="${classes}" target="1.8" source="1.8"
encoding="UTF-8" debug="on" includeantruntime="false">
<classpath>
<path refid="classpath"/>
@@ -9,8 +9,8 @@
<property name="jar" location="${build}/demo-monitordemo.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
<property name="main-class" value="com.sun.jna.contrib.demo.MonitorInfoDemo" />
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/contrib/msoffice/build.xml b/contrib/msoffice/build.xml
index 50452b084..c65c3f241 100644
index fa0387b61..06627c1cf 100644
--- a/contrib/msoffice/build.xml
+++ b/contrib/msoffice/build.xml
@@ -37,7 +37,7 @@
<target name="compile">
<mkdir dir="${classes}"/>
<!-- Compile the project. -->
- <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+ <javac srcdir="${src}" destdir="${classes}" target="1.8" source="1.8"
encoding="UTF-8" debug="on" includeantruntime="false">
<classpath>
<path refid="classpath"/>
@@ -9,8 +9,8 @@
<property name="jar" location="${build}/demo-msoffice.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
<property name="main-class" value="" />
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/contrib/native_window_msg/build.xml b/contrib/native_window_msg/build.xml
index 15bdb95b6..a35cdbd82 100644
index 19e99db68..066da4065 100644
--- a/contrib/native_window_msg/build.xml
+++ b/contrib/native_window_msg/build.xml
@@ -36,7 +36,7 @@
<target name="compile">
<mkdir dir="${classes}"/>
<!-- Compile the project. -->
- <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+ <javac srcdir="${src}" destdir="${classes}" target="1.8" source="1.8"
encoding="UTF-8" debug="on" includeantruntime="false">
<classpath>
<path refid="classpath"/>
@@ -9,8 +9,8 @@
<property name="jar" location="${build}/demo-nativewindowmsg.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
<property name="main-class" value="com.sun.jna.platform.win32.Win32WindowDemo" />
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/contrib/ntservice/nbproject/project.properties b/contrib/ntservice/nbproject/project.properties
index 587ae2b4d..d30a26c83 100644
--- a/contrib/ntservice/nbproject/project.properties
@ -149,57 +163,65 @@ index fe6ceb756..da40cd9a9 100644
${javac.classpath}:\
${file.reference.jna-test.jar}:\
diff --git a/contrib/shapedwindowdemo/build.xml b/contrib/shapedwindowdemo/build.xml
index cbcb1eea5..7fe70185a 100644
index 24c25b5cc..b4f8c995d 100644
--- a/contrib/shapedwindowdemo/build.xml
+++ b/contrib/shapedwindowdemo/build.xml
@@ -37,7 +37,7 @@
<target name="compile">
<mkdir dir="${classes}"/>
<!-- Compile the project. -->
- <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+ <javac srcdir="${src}" destdir="${classes}" target="1.8" source="1.8"
encoding="UTF-8" debug="on" includeantruntime="false">
<classpath>
<path refid="classpath"/>
@@ -9,8 +9,8 @@
<property name="jar" location="${build}/demo-shapedwindow.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
<property name="main-class" value="com.sun.jna.contrib.demo.ShapedWindowDemo" />
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/contrib/w32printing/build.xml b/contrib/w32printing/build.xml
index 5ac1fca8a..aa1310644 100644
index 0af971a82..b76e00709 100644
--- a/contrib/w32printing/build.xml
+++ b/contrib/w32printing/build.xml
@@ -27,7 +27,7 @@
<target name="compile">
<mkdir dir="${classes}"/>
<!-- Compile the project. -->
- <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+ <javac srcdir="${src}" destdir="${classes}" target="1.8" source="1.8"
encoding="UTF-8" debug="on" includeantruntime="false">
<classpath>
<path refid="classpath"/>
@@ -9,8 +9,8 @@
<property name="jar" location="${build}/demo-w32printing.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
<property name="main-class" value="com.sun.jna.platform.win32.Win32SpoolMonitor" />
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/contrib/w32windowhooks/build.xml b/contrib/w32windowhooks/build.xml
index cc77d70eb..c8d983805 100644
index 668d22daa..992ae4d7e 100644
--- a/contrib/w32windowhooks/build.xml
+++ b/contrib/w32windowhooks/build.xml
@@ -37,7 +37,7 @@
<target name="compile">
<mkdir dir="${classes}"/>
<!-- Compile the project. -->
- <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+ <javac srcdir="${src}" destdir="${classes}" target="1.8" source="1.8"
encoding="UTF-8" debug="on" includeantruntime="false">
<classpath>
<path refid="classpath"/>
@@ -9,8 +9,8 @@
<property name="jar" location="${build}/demo-w32windowhooks.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
<property name="main-class" value="com.sun.jna.contrib.demo.WindowHooks" />
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/contrib/x11/build.xml b/contrib/x11/build.xml
index 6f9318681..f080928af 100644
index ecf2ae5f9..95f5e8a88 100644
--- a/contrib/x11/build.xml
+++ b/contrib/x11/build.xml
@@ -46,7 +46,7 @@
<target name="compile">
<mkdir dir="${classes}"/>
<!-- Compile the project. -->
- <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+ <javac srcdir="${src}" destdir="${classes}" target="1.8" source="1.8"
encoding="UTF-8" debug="on" includeantruntime="false">
<classpath>
<path refid="classpath"/>
@@ -9,8 +9,8 @@
<property name="classes" location="${build}/classes"/>
<property name="jar" location="${build}/demo-x11.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/nbproject/project.xml b/nbproject/project.xml
index c05eefc13..9cd22da94 100644
--- a/nbproject/project.xml

7
jna.spec
View File

@ -2,8 +2,8 @@
%bcond_without reflections
Name: jna
Version: 5.9.0
Release: 4%{?dist}
Version: 5.10.0
Release: 1%{?dist}
Summary: Pure Java access to native libraries
# Most of code is dual-licensed under either LGPL 2.1+ only or Apache
# License 2.0. WeakIdentityHashMap.java was taken from Apache CXF,
@ -156,6 +156,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/
%changelog
* Mon Jan 10 2022 Zuzana Miklankova <zmiklank@redhat.com> - 5.10.0-1
- Rebase to version 5.10.0
* Sat Jan 08 2022 Miro Hrončok <mhroncok@redhat.com> - 5.9.0-4
- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34

2
sources
View File

@ -1 +1 @@
SHA512 (jna-5.9.0-clean.tar.xz) = dddd61404e53d6bb20e471a2f205aaf7443f103b409f91594dd16188932c08e2c0305f72e133a1c2bbdbbbf63a8dc7c13f249982d7bce8eb3445c6222cc2589a
SHA512 (jna-5.10.0-clean.tar.xz) = 47743e2e714f3bc9ef8a8ebfbe4abb3a926095979cf5c7b155a245bd896e0206656a6358d0c9f6bd7886c345ab2aa002d8102870ce7520a2c326ce720b935f75