[Pkg-javascript-commits] [node-iconv] 04/06: 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 08cd6bf4eb73febb50bc67ec5edef547affcbfe9
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sat Jun 14 18:53:00 2014 +0200

    Refresh patches
---
 debian/patches/gyp-call-nodejs.patch | 18 +++++-----
 debian/patches/use-glibc-iconv.patch | 66 ++++++++++++++++++++++++++----------
 2 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/debian/patches/gyp-call-nodejs.patch b/debian/patches/gyp-call-nodejs.patch
index f44066e..2df552e 100644
--- a/debian/patches/gyp-call-nodejs.patch
+++ b/debian/patches/gyp-call-nodejs.patch
@@ -3,12 +3,12 @@ Forwarded: not-needed
 Author: Matthew Pideil <matthewp_debian at teledetection.fr>
 --- a/binding.gyp
 +++ b/binding.gyp
-@@ -10,7 +10,7 @@
-         'LIBDIR="."', # not actually used
-       ],
-       'include_dirs': [
--        '<!(node -e "require(\'nan\')")',
-+        '<!(nodejs -e "require(\'nan\')")',
-       ],
-       'sources': [
-         'src/binding.cc',
+@@ -2,7 +2,7 @@
+   'targets': [
+     {
+       'target_name': 'iconv',
+-      'include_dirs': ['<!(node -e "require(\'nan\')")'],
++      'include_dirs': ['<!(nodejs -e "require(\'nan\')")'],
+       'sources': ['src/binding.cc'],
+       'cflags': [
+         '-Wall',
diff --git a/debian/patches/use-glibc-iconv.patch b/debian/patches/use-glibc-iconv.patch
index fcc6f57..98ddbef 100644
--- a/debian/patches/use-glibc-iconv.patch
+++ b/debian/patches/use-glibc-iconv.patch
@@ -4,28 +4,58 @@ Author: Jérémy Lal <kapouer at melix.org>
 Last-Update: 2014-06-14
 --- a/binding.gyp
 +++ b/binding.gyp
-@@ -3,7 +3,6 @@
+@@ -2,7 +2,6 @@
+   'targets': [
      {
        'target_name': 'iconv',
-       'defines': [
+-      'dependencies': ['libiconv'],
+       'include_dirs': ['<!(node -e "require(\'nan\')")'],
+       'sources': ['src/binding.cc'],
+       'cflags': [
+@@ -18,43 +17,6 @@
+         'GCC_ENABLE_CPP_RTTI': 'NO',
+         'WARNING_CFLAGS': ['-Wall', '-Wextra', '-Wno-unused-parameter'],
+       },
+-    },
+-
+-    {
+-      'target_name': 'libiconv',
+-      'type': 'static_library',
+-      'direct_dependent_settings': {
+-        'include_dirs':  ['support'],
+-      },
+-      'defines': [
 -        'ICONV_CONST=const',
-         'USE_AIX=1',
-         'USE_DOS=1',
-         'USE_EXTRA=1',
-@@ -11,13 +10,9 @@
-         'LIBDIR="."', # not actually used
-       ],
-       'include_dirs': [
+-        'USE_AIX=1',
+-        'USE_DOS=1',
+-        'USE_EXTRA=1',
+-        'USE_OSF1=1',
+-        'LIBDIR="."', # not actually used
+-      ],
+-      'include_dirs': [
 -        'deps/libiconv/srclib',
 -        'support',
-         '<!(node -e "require(\'nan\')")',
-       ],
-       'sources': [
--        'deps/libiconv/libcharset/lib/localcharset.c',
--        'deps/libiconv/lib/iconv.c',
-         'src/binding.cc',
-       ],
-       'conditions': [
+-      ],
+-      'sources': ['deps/libiconv/lib/iconv.c'],
+-      'conditions': [
+-        ['OS == "win"', {
+-          'defines': ['WIN32_NATIVE=1'],
+-        }, {
+-          'defines': ['HAVE_WORKING_O_NOFOLLOW=1'],
+-          'cflags!': ['-W', '-Wall', '-Wextra'],
+-        }],
+-      ],
+-      'xcode_settings': {
+-        'WARNING_CFLAGS!': ['-W', '-Wall', '-Wextra'],
+-        'WARNING_CFLAGS': [
+-          '-Wno-parentheses-equality',
+-          '-Wno-static-in-inline',
+-          '-Wno-tautological-compare',
+-        ],
+-      },
+     }
+   ]
+ }
 --- a/src/binding.cc
 +++ b/src/binding.cc
 @@ -14,7 +14,7 @@
@@ -37,7 +67,7 @@ Last-Update: 2014-06-14
  #include "nan.h"
  
  #include <errno.h>
-@@ -97,7 +97,7 @@
+@@ -94,7 +94,7 @@
      NanScope();
      Iconv* iv = static_cast<Iconv*>(
          NanGetInternalFieldPointer(args[0].As<Object>(), 0));

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