diff --git a/.fmf/version b/.fmf/version
deleted file mode 100644
index d00491f..0000000
--- a/.fmf/version
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/.gitignore b/.gitignore
index 9d587c1..32e836f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,14 +13,3 @@ jna-3.2.7.tar.bz2
/jna-4.4.0-clean.tar.xz
/jna-4.5.0-clean.tar.xz
/jna-4.5.1-clean.tar.xz
-/jna-5.2.0-clean.tar.xz
-/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
-/jna-5.11.0-clean.tar.xz
-/jna-5.12.1-clean.tar.xz
-/jna-5.13.0-clean.tar.xz
-/jna-5.14.0-clean.tar.xz
-/jna-5.15.0-clean.tar.xz
-/jna-5.17.0.tar.zst
diff --git a/0001-Adapt-build.patch b/0001-Adapt-build.patch
index 36ad5d1..003d5db 100644
--- a/0001-Adapt-build.patch
+++ b/0001-Adapt-build.patch
@@ -8,7 +8,7 @@ Subject: [PATCH 1/6] Adapt build
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/native/Makefile b/native/Makefile
-index 1bea2dc..cb3afed 100644
+index 6f9ad25..3712a9e 100644
--- a/native/Makefile
+++ b/native/Makefile
@@ -97,7 +97,7 @@ CDEFINES=-D_REENTRANT
@@ -20,7 +20,7 @@ index 1bea2dc..cb3afed 100644
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)
-@@ -457,7 +457,6 @@ $(BUILD)/$(JNA_JNI_VERSION).stamp:
+@@ -455,7 +455,6 @@ $(BUILD)/$(JNA_JNI_VERSION).stamp:
$(LIBRARY): $(JNIDISPATCH_OBJS) $(FFI_LIB)
$(LD) $(LDFLAGS) $(JNIDISPATCH_OBJS) $(FFI_LIB) $(LIBS)
@@ -29,5 +29,5 @@ index 1bea2dc..cb3afed 100644
$(TESTLIB): $(BUILD)/testlib.o
$(LD) $(LDFLAGS) $< $(LIBS)
--
-2.20.1
+2.14.3
diff --git a/0002-Load-system-library.patch b/0002-Load-system-library.patch
index b8785b0..717300c 100644
--- a/0002-Load-system-library.patch
+++ b/0002-Load-system-library.patch
@@ -4,19 +4,21 @@ Date: Mon, 16 Jan 2017 11:31:32 +0100
Subject: [PATCH 2/6] Load system library
---
- src/com/sun/jna/Native.java | 80 ++-----------------------------------
- 1 file changed, 4 insertions(+), 76 deletions(-)
+ src/com/sun/jna/Native.java | 97 ++-------------------------------------------
+ 1 file changed, 4 insertions(+), 93 deletions(-)
diff --git a/src/com/sun/jna/Native.java b/src/com/sun/jna/Native.java
-index eae060f..11bcc5b 100644
+index 91b195f..9ac3815 100644
--- a/src/com/sun/jna/Native.java
+++ b/src/com/sun/jna/Native.java
-@@ -912,84 +912,12 @@ public final class Native implements Version {
+@@ -829,101 +829,12 @@ public final class Native implements Version {
+
+ /**
* Loads the JNA stub library.
- * First tries jna.boot.library.path, then the system path, then from the
- * jar file.
-+ * MODIFIED FROM UPSTREAM - we rip out all sorts of gunk here that is
-+ * unnecessary when JNA is properly installed with the OS.
+- * First tries jna.boot.library.path, then the system path, then from the
+- * jar file.
++ * MODIFIED FROM UPSTREAM - we rip out all sorts of gunk here that is
++ * unnecessary when JNA is properly installed with the OS.
*/
private static void loadNativeDispatchLibrary() {
- if (!Boolean.getBoolean("jna.nounpack")) {
@@ -24,7 +26,7 @@ index eae060f..11bcc5b 100644
- removeTemporaryFiles();
- }
- catch(IOException e) {
-- LOG.log(Level.WARNING, "JNA Warning: IOException removing temporary files", e);
+- System.err.println("JNA Warning: IOException removing temporary files: " + e.getMessage());
- }
- }
-
@@ -37,14 +39,20 @@ index eae060f..11bcc5b 100644
- String dir = dirs.nextToken();
- File file = new File(new File(dir), System.mapLibraryName(libName).replace(".dylib", ".jnilib"));
- String path = file.getAbsolutePath();
-- LOG.log(DEBUG_JNA_LOAD_LEVEL, "Looking in {0}", path);
+- if (DEBUG_JNA_LOAD) {
+- System.out.println("Looking in " + path);
+- }
- if (file.exists()) {
- try {
-- LOG.log(DEBUG_JNA_LOAD_LEVEL, "Trying {0}", path);
+- if (DEBUG_JNA_LOAD) {
+- System.out.println("Trying " + path);
+- }
- System.setProperty("jnidispatch.path", path);
- System.load(path);
- jnidispatchPath = path;
-- LOG.log(DEBUG_JNA_LOAD_LEVEL, "Found jnidispatch at {0}", path);
+- if (DEBUG_JNA_LOAD) {
+- System.out.println("Found jnidispatch at " + path);
+- }
- return;
- } catch (UnsatisfiedLinkError ex) {
- // Not a problem if already loaded in anoteher class loader
@@ -62,28 +70,37 @@ index eae060f..11bcc5b 100644
- ext = "dylib";
- }
- path = path.substring(0, path.lastIndexOf(orig)) + ext;
-- LOG.log(DEBUG_JNA_LOAD_LEVEL, "Looking in {0}", path);
+- if (DEBUG_JNA_LOAD) {
+- System.out.println("Looking in " + path);
+- }
- if (new File(path).exists()) {
- try {
-- LOG.log(DEBUG_JNA_LOAD_LEVEL, "Trying {0}", path);
+- if (DEBUG_JNA_LOAD) {
+- System.out.println("Trying " + path);
+- }
- System.setProperty("jnidispatch.path", path);
- System.load(path);
- jnidispatchPath = path;
-- LOG.log(DEBUG_JNA_LOAD_LEVEL, "Found jnidispatch at {0}", path);
+- if (DEBUG_JNA_LOAD) {
+- System.out.println("Found jnidispatch at " + path);
+- }
- return;
- } catch (UnsatisfiedLinkError ex) {
-- LOG.log(Level.WARNING, "File found at " + path + " but not loadable: " + ex.getMessage(), ex);
+- System.err.println("File found at " + path + " but not loadable: " + ex.getMessage());
- }
- }
- }
- }
- }
-- String jnaNosys = System.getProperty("jna.nosys", "true");
-- if ((!Boolean.parseBoolean(jnaNosys)) || Platform.isAndroid()) {
+- if (!Boolean.getBoolean("jna.nosys")) {
- try {
-- LOG.log(DEBUG_JNA_LOAD_LEVEL, "Trying (via loadLibrary) {0}", libName);
+- if (DEBUG_JNA_LOAD) {
+- System.out.println("Trying (via loadLibrary) " + libName);
+- }
- System.loadLibrary(libName);
-- LOG.log(DEBUG_JNA_LOAD_LEVEL, "Found jnidispatch on system path");
+- if (DEBUG_JNA_LOAD) {
+- System.out.println("Found jnidispatch on system path");
+- }
- return;
- }
- catch(UnsatisfiedLinkError e) {
@@ -96,10 +113,10 @@ index eae060f..11bcc5b 100644
- throw new UnsatisfiedLinkError("Unable to locate JNA native support library");
- }
+ jnidispatchPath = "@LIBDIR@/" + System.mapLibraryName("jnidispatch");
-+ System.load(jnidispatchPath);
++ System.load(jnidispatchPath);
}
static final String JNA_TMPLIB_PREFIX = "jna";
--
-2.20.1
+2.14.3
diff --git a/0003-Tests-headless.patch b/0003-Tests-headless.patch
index 9a4645d..f879f9d 100644
--- a/0003-Tests-headless.patch
+++ b/0003-Tests-headless.patch
@@ -8,17 +8,17 @@ Subject: [PATCH 3/6] Tests headless
1 file changed, 1 insertion(+)
diff --git a/build.xml b/build.xml
-index d5c2bbc..835c02b 100644
+index 63a9cc7..ab9cf52 100644
--- a/build.xml
+++ b/build.xml
-@@ -1202,6 +1202,7 @@ cd ..
-
+@@ -1128,6 +1128,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
+
+
--
-2.20.1
+2.14.3
diff --git a/0004-Fix-javadoc-build.patch b/0004-Fix-javadoc-build.patch
index b2bc537..f68b0be 100644
--- a/0004-Fix-javadoc-build.patch
+++ b/0004-Fix-javadoc-build.patch
@@ -8,17 +8,17 @@ Subject: [PATCH 4/6] Fix javadoc build
1 file changed, 1 insertion(+)
diff --git a/build.xml b/build.xml
-index 8f5733a..fb8d544 100644
+index ab9cf52..d1fe4aa 100644
--- a/build.xml
+++ b/build.xml
-@@ -1343,6 +1343,7 @@ cd ..
+@@ -1233,6 +1233,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
+
-