Bug#811766: scim-unikey: FTBFS with GCC 6: narrowing conversion

2018-03-16 Thread James Cowgill 
Control: tags -1 pending

Hi,

On Tue, 19 Jan 2016 17:55:39 -0800 Martin Michlmayr  wrote:
> Package: scim-unikey
> Version: 0.3.1+debian-3.1
> Severity: important
> User: debian-...@lists.debian.org
> Usertags: ftbfs-gcc-6 gcc-6-narrowing
> 
> This package fails to build with GCC 6.  GCC 6 has not been released
> yet, but it's expected that GCC 6 will become the default compiler for
> stretch.

I've uploaded the attached NMU to DELAYED/2 which fixes this bug by
applying the upstream patch already mentioned in this bug report. I have
also taken the opportunity to add the mandatory build-{arch,indep}
targets to debian/rules. Please tell me if I should cancel it / delay it
longer.

Thanks,
James
diff -Nru scim-unikey-0.3.1+debian/debian/changelog 
scim-unikey-0.3.1+debian/debian/changelog
--- scim-unikey-0.3.1+debian/debian/changelog   2012-07-12 16:51:22.0 
+0100
+++ scim-unikey-0.3.1+debian/debian/changelog   2018-03-16 17:26:15.0 
+
@@ -1,3 +1,13 @@
+scim-unikey (0.3.1+debian-3.2) unstable; urgency=medium
+
+  * debian/patches:
+- Add upstream patch to fix FTBFS with GCC 6 due to narrowing conversions.
+  (Closes: #811766)
+  * debian/rules:
+- Add mandatory build-{arch,indep} targets.
+
+ -- James Cowgill   Fri, 16 Mar 2018 17:26:15 +
+
 scim-unikey (0.3.1+debian-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru scim-unikey-0.3.1+debian/debian/patches/gcc6.patch 
scim-unikey-0.3.1+debian/debian/patches/gcc6.patch
--- scim-unikey-0.3.1+debian/debian/patches/gcc6.patch  1970-01-01 
01:00:00.0 +0100
+++ scim-unikey-0.3.1+debian/debian/patches/gcc6.patch  2018-03-16 
17:02:48.0 +
@@ -0,0 +1,269 @@
+Description: Fix FTBFS with GCC 6 caused by narrowing conversions
+Author: marguerite 
+Origin: upstream, 
https://github.com/scim-im/scim-unikey/commit/dcc2ef6057a72d5babc49c51c1a5f998c9a31131
+Bug-Debian: https://bugs.debian.org/811766
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/ukengine/data.cpp
 b/ukengine/data.cpp
+@@ -96,145 +96,145 @@ See TCVN3 & VPS below for examples
+ unsigned char SingleByteTables[][TOTAL_VNCHARS] = 
+ 
+ // TCVN3
+-{{'A','a','¸','¸','µ','µ','¶','¶','·','·','¹','¹',  // 0: a
+-  '¢','©','Ê','Ê','Ç','Ç','È','È','É','É','Ë','Ë',// 1: a^
+-  '¡','¨','¾','¾','»','»','¼','¼','½','½','Æ','Æ',// 2: a(
+-  'B','b','C','c','D','d',
+-  '§','®',
+-  'E','e','Ð','Ð','Ì','Ì','Î','Î','Ï','Ï','Ñ','Ñ',// 3: e
+-  '£','ª','Õ','Õ','Ò','Ò','Ó','Ó','Ô','Ô','Ö','Ö',  // 4: e^
+-  'F','f','G','g','H','h',
+-  'I','i','Ý','Ý','×','×','Ø','Ø','Ü','Ü','Þ','Þ',// 5: i
+-  'J','j','K','k','L','l','M','m','N','n',
+-  'O','o','ã','ã','ß','ß','á','á','â','â','ä','ä',// 6: o
+-  '¤','«','è','è','å','å','æ','æ','ç','ç','é','é',// 7: o^
+-  '¥','¬','í','í','ê','ê','ë','ë','ì','ì','î','î',// 8: o+
+-  'P','p','Q','q','R','r','S','s','T','t',
+-  'U','u','ó','ó','ï','ï','ñ','ñ','ò','ò','ô','ô',// 9: u
+-  '¦','­','ø','ø','õ','õ','ö','ö','÷','÷','ù','ù',//10: u+ 
+-  'V','v','W','w','X','x',
+-  'Y','y','ý','ý','ú','ú','û','û','ü','ü','þ','þ',//11: y
+-  'Z','z',
++{{static_cast('A'),static_cast('a'),static_cast('¸'),static_cast('¸'),static_cast('µ'),static_cast('µ'),static_cast('¶'),static_cast('¶'),static_cast('·'),static_cast('·'),static_cast('¹'),static_cast('¹'), 
 // 0: a
++  static_cast('¢'),static_cast('©'),static_cast('Ê'),static_cast('Ê'),static_cast('Ç'),static_cast('Ç'),static_cast('È'),static_cast('È'),static_cast('É'),static_cast('É'),static_cast('Ë'),static_cast('Ë'), 
   // 1: a^
++  static_cast('¡'),static_cast('¨'),static_cast('¾'),static_cast('¾'),static_cast('»'),static_cast('»'),static_cast('¼'),static_cast('¼'),static_cast('½'),static_cast('½'),static_cast('Æ'),static_cast('Æ'), 
   // 2: a(
++  static_cast('B'),static_cast('b'),static_cast('C'),static_cast('c'),static_cast('D'),static_cast('d'),
++  static_cast('§'),static_cast('®'),
++  static_cast('E'),static_cast('e'),static_cast('Ð'),static_cast('Ð'),static_cast('Ì'),static_cast('Ì'),static_cast('Î'),static_cast('Î'),static_cast('Ï'),static_cast('Ï'),static_cast('Ñ'),static_cast('Ñ'), 
   // 3: e
++  static_cast('£'),static_cast('ª'),static_cast('Õ'),static_cast('Õ'),static_cast('Ò'),static_cast('Ò'),static_cast('Ó'),static_cast('Ó'),static_cast('Ô'),static_cast('Ô'),static_cast('Ö'),static_cast('Ö'), 
 // 4: e^
++  static_cast('F'),static_cast('f'),static_cast('G'),static_cast('g'),static_cast('H'),static_cast('h'),
++  static_cast('I'),static_cast('i'),static_cast('Ý'),static_cast('Ý'),static_cast('×'),static_cast('×'),static_cast('Ø'),static_cast('Ø'),static_cast('Ü'),static_cast('Ü'),static_cast('Þ'),static_cast('Þ'), 
   // 5: i
++

Bug#811766: scim-unikey: FTBFS with GCC 6: narrowing conversion

2017-12-05 Thread Juhani Numminen 

Control: tags -1 patch

There are fixes available: [ubuntu] uses -std=gnu++98 and [upstream] 
added hundreds of static_casts.


[ubuntu] 
https://patches.ubuntu.com/s/scim-unikey/scim-unikey_0.3.1+debian-3.1ubuntu1.patch 



[upstream] https://github.com/scim-im/scim-unikey/commit/dcc2ef6057a

Regards,
Juhani