[gradle] 03/08: patch 23 refreshed

[Eugene Zhukov]

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

eugene-guest pushed a commit to branch 1.8
in repository gradle.

commit 7441d23639dbe217e62a3c55e5f85f073dfc1916
Author: Eugene Zhukov <jevgeni.zh at gmail.com>
Date:   Tue May 13 11:38:33 2014 +0000

    patch 23 refreshed
---
 .../23_replace_jna-posix_with_jnr-posix.diff       | 50 ++++++++++++----------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/debian/patches/23_replace_jna-posix_with_jnr-posix.diff b/debian/patches/23_replace_jna-posix_with_jnr-posix.diff
index b883128..d39973a 100644
--- a/debian/patches/23_replace_jna-posix_with_jnr-posix.diff
+++ b/debian/patches/23_replace_jna-posix_with_jnr-posix.diff
@@ -4,11 +4,11 @@ Bug-vendor: http://issues.gradle.org/browse/GRADLE-2422
 Author: Miguel Landaeta <miguel at miguel.cc>
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Forwarded: no
-Last-Update: 2012-08-18
+Last-Update: 2014-05-13
 
---- a/subprojects/native/native.gradle
-+++ b/subprojects/native/native.gradle
-@@ -9,10 +9,13 @@
+--- gradle-1.8.orig/subprojects/native/native.gradle
++++ gradle-1.8/subprojects/native/native.gradle
+@@ -7,10 +7,13 @@ dependencies {
      compile libraries.slf4j_api
      compile libraries.jna
      compile libraries.nativePlatform
@@ -24,9 +24,9 @@ Last-Update: 2012-08-18
          dependency libraries.jna
      }
      compile libraries.guava
---- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystemServices.java
-+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystemServices.java
-@@ -23,8 +23,6 @@
+--- gradle-1.8.orig/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystemServices.java
++++ gradle-1.8/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystemServices.java
+@@ -23,8 +23,6 @@ import org.gradle.internal.nativeplatfor
  import org.gradle.internal.os.OperatingSystem;
  import org.gradle.internal.service.DefaultServiceRegistry;
  import org.gradle.internal.service.ServiceRegistry;
@@ -35,16 +35,20 @@ Last-Update: 2012-08-18
  import org.jruby.ext.posix.POSIX;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
-@@ -61,7 +59,7 @@
-         if (libC != null && (operatingSystem.isLinux() || operatingSystem.isMacOsX())) {
+@@ -59,10 +57,10 @@ public class FileSystemServices {
+ 
+         // Use libc backed implementations on Linux and Mac, if libc available
+         POSIX posix = PosixUtil.current();
+-        if ((libC != null && (operatingSystem.isLinux() || operatingSystem.isMacOsX())) && posix instanceof BaseNativePOSIX) {
++        if ((libC != null && (operatingSystem.isLinux() || operatingSystem.isMacOsX()))) {
              FilePathEncoder filePathEncoder = createEncoder(libC);
              serviceRegistry.add(Chmod.class, new LibcChmod(libC, filePathEncoder));
--            serviceRegistry.add(Stat.class, new LibCStat(libC, operatingSystem, (BaseNativePOSIX) PosixUtil.current(), filePathEncoder));
-+            serviceRegistry.add(Stat.class, new LibCStat(libC, operatingSystem, PosixUtil.current(), filePathEncoder));
+-            serviceRegistry.add(Stat.class, new LibCStat(libC, operatingSystem, (BaseNativePOSIX) posix, filePathEncoder));
++            serviceRegistry.add(Stat.class, new LibCStat(libC, operatingSystem, posix, filePathEncoder));
              return;
          }
  
-@@ -95,7 +93,7 @@
+@@ -96,7 +94,7 @@ public class FileSystemServices {
  
      private static Stat createStat() {
          POSIX posix = PosixUtil.current();
@@ -53,20 +57,20 @@ Last-Update: 2012-08-18
              return new FallbackStat();
          } else {
              return new PosixStat(posix);
---- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibCStat.java
-+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibCStat.java
-@@ -18,9 +18,8 @@
+--- gradle-1.8.orig/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibCStat.java
++++ gradle-1.8/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibCStat.java
+@@ -18,9 +18,8 @@ package org.gradle.internal.nativeplatfo
  
  import org.gradle.internal.nativeplatform.jna.LibC;
  import org.gradle.internal.os.OperatingSystem;
 -import org.jruby.ext.posix.BaseNativePOSIX;
++import org.jruby.ext.posix.POSIX;
  import org.jruby.ext.posix.FileStat;
 -import org.jruby.ext.posix.Linux64FileStat;
-+import org.jruby.ext.posix.POSIX;
  
  import java.io.File;
  import java.io.IOException;
-@@ -29,9 +28,9 @@
+@@ -29,9 +28,9 @@ class LibCStat implements Stat {
      private final LibC libc;
      private final FilePathEncoder encoder;
      private final OperatingSystem operatingSystem;
@@ -78,7 +82,7 @@ Last-Update: 2012-08-18
          this.libc = libc;
          this.operatingSystem = operatingSystem;
          this.nativePOSIX = nativePOSIX;
-@@ -39,17 +38,7 @@
+@@ -39,17 +38,8 @@ class LibCStat implements Stat {
      }
  
      public int getUnixMode(File f) throws IOException {
@@ -87,7 +91,7 @@ Last-Update: 2012-08-18
 +        FileStat stat = nativePOSIX.stat(new String(encoder.encode(f)));
          return stat.mode() & 0777;
      }
--
+ 
 -    private void initPlatformSpecificStat(FileStat stat, byte[] encodedFilePath) {
 -        if (operatingSystem.isMacOsX()) {
 -            libc.stat(encodedFilePath, stat);
@@ -97,9 +101,9 @@ Last-Update: 2012-08-18
 -        }
 -    }
  }
---- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java
-+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java
-@@ -20,6 +20,8 @@
+--- gradle-1.8.orig/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java
++++ gradle-1.8/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java
+@@ -20,6 +20,8 @@ import org.jruby.ext.posix.POSIX;
  import org.jruby.ext.posix.POSIXFactory;
  import org.jruby.ext.posix.POSIXHandler;
  
@@ -108,7 +112,7 @@ Last-Update: 2012-08-18
  import java.io.File;
  import java.io.InputStream;
  import java.io.PrintStream;
-@@ -32,7 +34,7 @@
+@@ -32,7 +34,7 @@ public class PosixUtil {
      }
  
      private static class POSIXHandlerImpl implements POSIXHandler {

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