[Pkg-javascript-commits] [node-iconv] 03/10: Refresh patches

[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 5dd27808dc767fe28928f8e250cce3385f13dc11
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sun Jun 14 21:04:45 2015 +0200

    Refresh patches
---
 debian/patches/path-to-binary-iconv.patch |  2 +-
 debian/patches/use-glibc-iconv.patch      | 29 ++++++++++++++++-------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/debian/patches/path-to-binary-iconv.patch b/debian/patches/path-to-binary-iconv.patch
index c50ac8b..e395fa0 100644
--- a/debian/patches/path-to-binary-iconv.patch
+++ b/debian/patches/path-to-binary-iconv.patch
@@ -3,7 +3,7 @@ Forwarded: not-needed
 Author: Matthew Pideil <matthewp_debian at teledetection.fr>
 --- a/lib/iconv.js
 +++ b/lib/iconv.js
-@@ -21,10 +21,10 @@
+@@ -23,10 +23,10 @@
  
  var bindings;
  try {
diff --git a/debian/patches/use-glibc-iconv.patch b/debian/patches/use-glibc-iconv.patch
index 8eab90a..aba925b 100644
--- a/debian/patches/use-glibc-iconv.patch
+++ b/debian/patches/use-glibc-iconv.patch
@@ -19,7 +19,7 @@ Last-Update: 2014-06-16
        'include_dirs': ['<!(node -e "require(\'nan\')")'],
        'sources': ['src/binding.cc'],
        'cflags': [
-@@ -18,43 +17,6 @@
+@@ -18,46 +17,6 @@
          'GCC_ENABLE_CPP_RTTI': 'NO',
          'WARNING_CFLAGS': ['-Wall', '-Wextra', '-Wno-unused-parameter'],
        },
@@ -31,14 +31,7 @@ Last-Update: 2014-06-16
 -      'direct_dependent_settings': {
 -        'include_dirs':  ['support'],
 -      },
--      'defines': [
--        'ICONV_CONST=const',
--        'USE_AIX=1',
--        'USE_DOS=1',
--        'USE_EXTRA=1',
--        'USE_OSF1=1',
--        'LIBDIR="."', # not actually used
--      ],
+-      'defines': ['ICONV_CONST=const', 'ENABLE_EXTRA=1'],
 -      'include_dirs': [
 -        'deps/libiconv/srclib',
 -        'support',
@@ -52,6 +45,16 @@ Last-Update: 2014-06-16
 -          'cflags!': ['-W', '-Wall', '-Wextra'],
 -        }],
 -      ],
+-      'msvs_settings': {
+-        'VCCLCompilerTool': {
+-          'DisableSpecificWarnings': [
+-            '4018',  # Signed/unsigned comparison.
+-            '4090',  # Const/non-const mismatch.
+-            '4244',  # Narrowing cast.
+-            '4267',  # Narrowing cast.
+-          ],
+-        },
+-      },
 -      'xcode_settings': {
 -        'WARNING_CFLAGS!': ['-W', '-Wall', '-Wextra'],
 -        'WARNING_CFLAGS': [
@@ -80,7 +83,7 @@ Last-Update: 2014-06-16
  
  namespace
  {
-@@ -60,6 +61,7 @@
+@@ -61,6 +62,7 @@
  
    static void Initialize(Handle<Object> obj)
    {
@@ -88,7 +91,7 @@ Last-Update: 2014-06-16
      NanScope();
      Local<ObjectTemplate> t = ObjectTemplate::New();
      t->SetInternalFieldCount(1);
-@@ -94,7 +96,7 @@
+@@ -95,7 +97,7 @@
      NanScope();
      Iconv* iv = static_cast<Iconv*>(
          NanGetInternalFieldPointer(args[0].As<Object>(), 0));
@@ -99,7 +102,7 @@ Last-Update: 2014-06-16
      size_t input_size = args[3]->Uint32Value();
 --- a/lib/iconv.js
 +++ b/lib/iconv.js
-@@ -43,11 +43,13 @@
+@@ -45,11 +45,13 @@
    stream.Stream.call(this);
    this.writable = true;
  
@@ -116,7 +119,7 @@ Last-Update: 2014-06-16
    var context_ = { trailer: null };
  
    this.convert = function(input, encoding) {
-@@ -132,7 +134,9 @@
+@@ -134,7 +136,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