[Pkg-javascript-commits] [node-iconv] 03/05: Refresh patch

[Jérémy Lal]

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

kapouer pushed a commit to branch master
in repository node-iconv.

commit 8d504567bb076569f76a32880fd3481fa2517af0
Author: Jérémy Lal <kapouer at melix.org>
Date:   Wed Sep 9 13:06:43 2015 +0200

    Refresh patch
---
 debian/patches/use-glibc-iconv.patch | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/debian/patches/use-glibc-iconv.patch b/debian/patches/use-glibc-iconv.patch
index ab7830f..8b24c47 100644
--- a/debian/patches/use-glibc-iconv.patch
+++ b/debian/patches/use-glibc-iconv.patch
@@ -9,7 +9,7 @@ Description: use system iconv from glibc
   * codepages CP858 CP853 CP943 are not available
 Forwarded: not-needed
 Author: Jérémy Lal <kapouer at melix.org>
-Last-Update: 2015-06-14
+Last-Update: 2015-09-09
 --- a/binding.gyp
 +++ b/binding.gyp
 @@ -2,7 +2,6 @@
@@ -69,13 +69,16 @@ Last-Update: 2015-06-14
  }
 --- a/src/binding.cc
 +++ b/src/binding.cc
-@@ -14,12 +14,13 @@
+@@ -14,13 +14,14 @@
   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
  
 -#include "iconv.h"
+-#include "nan.h"
+-#include "node_buffer.h"
 +#include <iconv.h>
- #include "nan.h"
++#include <nan.h>
++#include <node_buffer.h>
  
  #include <errno.h>
  #include <assert.h>
@@ -84,23 +87,19 @@ Last-Update: 2015-06-14
  
  namespace
  {
-@@ -61,6 +62,7 @@
+@@ -94,10 +95,11 @@
  
-   static void Initialize(Handle<Object> obj)
+   static NAN_METHOD(Convert)
    {
 +    setlocale(LC_CTYPE,"C.UTF-8");
-     NanScope();
-     Local<ObjectTemplate> t = ObjectTemplate::New();
-     t->SetInternalFieldCount(1);
-@@ -95,7 +97,7 @@
-     NanScope();
      Iconv* iv = static_cast<Iconv*>(
-         NanGetInternalFieldPointer(args[0].As<Object>(), 0));
--    const char* input_buf = static_cast<const char*>(  // NULL on flush.
-+    char* input_buf = static_cast<char*>(  // NULL on flush.
-         args[1].As<Object>()->GetIndexedPropertiesExternalArrayData());
-     size_t input_start = args[2]->Uint32Value();
-     size_t input_size = args[3]->Uint32Value();
+         Nan::GetInternalFieldPointer(info[0].As<Object>(), 0));
+     const bool is_flush = info[8]->BooleanValue();
+-    const char* input_buf =
++    char* input_buf =
+         is_flush ? NULL : node::Buffer::Data(info[1].As<Object>());
+     size_t input_start = info[2]->Uint32Value();
+     size_t input_size = info[3]->Uint32Value();
 --- a/lib/iconv.js
 +++ b/lib/iconv.js
 @@ -45,11 +45,13 @@
@@ -121,7 +120,7 @@ Last-Update: 2015-06-14
    var context_ = { trailer: null };
  
    this.convert = function(input, encoding) {
-@@ -134,7 +136,9 @@
+@@ -135,7 +137,9 @@
          continue;
        }
        else if (errno === EILSEQ) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-iconv.git