[libnative-platform-java] 06/13: Refresh patches

[Kai-Chung Yan]

This is an automated email from the git hooks/post-receive script.

seamlik-guest pushed a commit to branch master
in repository libnative-platform-java.

commit 132507188c5f7d35b386149742d8bfa6aae5ecad
Author: Kai-Chung Yan (殷啟聰) <seamlikok at gmail.com>
Date:   Thu Oct 27 16:51:35 2016 +0800

    Refresh patches
---
 debian/patches/libname.diff | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/debian/patches/libname.diff b/debian/patches/libname.diff
index edadbfd..e9dbdff 100644
--- a/debian/patches/libname.diff
+++ b/debian/patches/libname.diff
@@ -6,33 +6,37 @@ Last-Update: 2015-06-05
 Forwarded: not-needed
 --- a/src/main/java/net/rubygrapefruit/platform/internal/Platform.java
 +++ b/src/main/java/net/rubygrapefruit/platform/internal/Platform.java
-@@ -37,12 +37,15 @@
+@@ -37,11 +37,7 @@
                          platform = new Window64Bit();
                      }
                  } else if (osName.contains("linux")) {
-+                    /*
-                     if (arch.equals("amd64")) {
-                         platform = new Linux64Bit();
-                     }
-                     else if (arch.equals("i386") || arch.equals("x86")) {
-                         platform = new Linux32Bit();
-                     }
-+                    */
+-                    if (arch.equals("amd64") || arch.equals("x86_64")) {
+-                        platform = new Linux64Bit();
+-                    } else if (arch.equals("i386") || arch.equals("x86")) {
+-                        platform = new Linux32Bit();
+-                    }
 +                    platform = new Linux();
                  } else if (osName.contains("os x") || osName.contains("darwin")) {
                      if (arch.equals("i386")) {
                          platform = new OsX32Bit();
-@@ -187,6 +190,13 @@
+@@ -225,7 +221,7 @@
          }
      }
  
+-    private abstract static class Linux extends Unix {
 +    private static class Linux extends Unix {
+         @Override
+         public <T extends NativeIntegration> T get(Class<T> type, NativeLibraryLoader nativeLibraryLoader) {
+             return super.get(type, nativeLibraryLoader);
+@@ -235,6 +231,11 @@
+         public boolean isLinux() {
+             return true;
+         }
++
 +        @Override
 +        public String getId() {
 +            return "linux";
 +        }
-+    }
-+
-     private static class Linux32Bit extends Unix {
-         @Override
-         public String getId() {
+     }
+ 
+     private static class Linux32Bit extends Linux {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libnative-platform-java.git