[Pkg-javascript-commits] [node-iconv] 01/04: Fix patch to match latest libc6 version

[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 c35c408ab4e218c034be560ba8693f7c7f3ad7a3
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sun Oct 16 22:47:04 2016 +0200

    Fix patch to match latest libc6 version
---
 debian/patches/use-glibc-iconv.patch | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/debian/patches/use-glibc-iconv.patch b/debian/patches/use-glibc-iconv.patch
index d58fd2c..a1d1df6 100644
--- a/debian/patches/use-glibc-iconv.patch
+++ b/debian/patches/use-glibc-iconv.patch
@@ -2,14 +2,12 @@ Description: use system iconv from glibc
  1) do not build bundled iconv
  2) work around eglibc libiconv implementation, that is:
   * do not throw when //translit is on
-  * set locale to "" to get previsible //translit behavior (previously
-    it was C.UTF-8), this is possible because C locale is portable
-    (setlocale(3)), and transliteration need UTF-8 code-set to work
-    the same as upstream's libiconv tested behavior.
+  * set LC_CTYPE to "C.UTF-8" to get previsible //translit behavior.
+    This is a feature a debian's libc6 implementation.
   * codepages CP858 CP853 CP943 are not available
 Forwarded: not-needed
 Author: Jérémy Lal <kapouer at melix.org>
-Last-Update: 2016-10-08
+Last-Update: 2016-10-16
 --- a/src/binding.cc
 +++ b/src/binding.cc
 @@ -14,13 +14,14 @@
@@ -34,7 +32,7 @@ Last-Update: 2016-10-08
  
    static void Initialize(Handle<Object> obj)
    {
-+		setlocale(LC_ALL, "");
++		setlocale(LC_CTYPE, "C.UTF-8");
      Local<ObjectTemplate> t = Nan::New<ObjectTemplate>();
      t->SetInternalFieldCount(1);
      object_template.Reset(t);
@@ -75,18 +73,7 @@ Last-Update: 2016-10-08
          if (context === null || input === FLUSH) {
 --- a/test/test-basic.js
 +++ b/test/test-basic.js
-@@ -132,20 +132,17 @@
- iconv = new Iconv('utf-8', 'ascii//translit');
- assert.equal(iconv.convert('ça va').toString(), 'ca va');
- 
--iconv = new Iconv('utf-8', 'ascii//translit');
--assert.throws(function() { iconv.convert('ça va が'); }); // untranslatable
--
- iconv = new Iconv('utf-8', 'ascii//translit//ignore');
--assert.equal(iconv.convert('ça va が').toString(), 'ca va ');
-+assert.equal(iconv.convert('ça va が').toString(), 'ca va ?');
- 
- iconv = Iconv('utf-8', 'iso-8859-1');
+@@ -142,10 +142,10 @@
  assert.equal(iconv.convert('b2s=', 'base64').toString(), 'ok');
  
  var aixEncodings =

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