misc/ibus-unikey: Updated for version 0.6.1.

Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>

3 files changed, 236 insertions, 4 deletions

diff --git a/misc/ibus-unikey/gcc-6.diff b/misc/ibus-unikey/gcc-6.diff
new file mode 100644
index 0000000000..424bd74fb0
--- /dev/null
+++ b/misc/ibus-unikey/gcc-6.diff
@@ -0,0 +1,227 @@
+Index: b/ukengine/data.cpp
+===================================================================
+--- a/ukengine/data.cpp
++++ b/ukengine/data.cpp
+@@ -96,144 +96,144 @@ See TCVN3 & VPS below for examples
+ unsigned char SingleByteTables[][TOTAL_VNCHARS] = 
+ 
+ // TCVN3
+-{{'A','a','�','�','�','�','�','�','�','�','�','�',      // 0: a
+-  '�','�','�','�','�','�','�','�','�','�','�','�',		// 1: a^
+-  '�','�','�','�','�','�','�','�','�','�','�','�',		// 2: a(
++{{'A','a',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),      // 0: a
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),		// 1: a^
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),		// 2: a(
+   'B','b','C','c','D','d',
+-  '�','�',
+-  'E','e','�','�','�','�','�','�','�','�','�','�',		// 3: e
+-  '�','�','�','�','�','�','�','�','�','�','�','�',      // 4: e^
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  'E','e',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),		// 3: e
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),      // 4: e^
+   'F','f','G','g','H','h',
+-  'I','i','�','�','�','�','�','�','�','�','�','�',		// 5: i
++  'I','i',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),		// 5: i
+   'J','j','K','k','L','l','M','m','N','n',
+-  'O','o','�','�','�','�','�','�','�','�','�','�',		// 6: o
+-  '�','�','�','�','�','�','�','�','�','�','�','�',		// 7: o^
+-  '�','�','�','�','�','�','�','�','�','�','�','�',		// 8: o+
++  'O','o',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),		// 6: o
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),		// 7: o^
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),		// 8: o+
+   'P','p','Q','q','R','r','S','s','T','t',
+-  'U','u','�','�','�','�','�','�','�','�','�','�',		// 9: u
+-  '�','�','�','�','�','�','�','�','�','�','�','�',		//10: u+ 
++  'U','u',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),		// 9: u
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),		//10: u+ 
+   'V','v','W','w','X','x',
+-  'Y','y','�','�','�','�','�','�','�','�','�','�',		//11: y
++  'Y','y',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),		//11: y
+   'Z','z',
+   0x80, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88,
+   0x89, 0x8A, 0x8B, 0x8C, 0x8E, 0x91, 0x92, 0x93,
+   0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B,
+   0x9C, 0x9E, 0x9F},
+ //VPS
+-{ 'A','a','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
++{ 'A','a',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'B','b','C','c','D','d',
+-  '�','�',
+-  'E','e','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  'E','e',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'F','f','G','g','H','h',
+-  'I','i','�','�','�','�','�','�','�','�','�','�',
++  'I','i',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'J','j','K','k','L','l','M','m','N','n',
+-  'O','o','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
++  'O','o',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'P','p','Q','q','R','r','S','s','T','t',
+-  'U','u','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
++  'U','u',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'V','v','W','w','X','x',
+-  'Y','y','�','�','�','�','�','�','�','�','�','�',
++  'Y','y',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'Z','z',
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x8E, 0x91, 0x92, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x9E, 0x00},
+ //VISCII
+-{ 'A','a','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
++{ 'A','a',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'B','b','C','c','D','d',
+-  '�','�',
+-  'E','e','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  'E','e',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'F','f','G','g','H','h',
+-  'I','i','�','�','�','�','�','�','�','�','�','�',
++  'I','i',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'J','j','K','k','L','l','M','m','N','n',
+-  'O','o','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
++  'O','o',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'P','p','Q','q','R','r','S','s','T','t',
+-  'U','u','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
++  'U','u',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'V','v','W','w','X','x',
+-  'Y','y','�','�','�','�','�','�','�','�','�','�',
++  'Y','y',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'Z','z',
+   0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x8E, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x9E, 0x00},
+ // BKHCM1
+-{'A','a','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','~','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
++{'A','a',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),'~',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'B','b','C','c','D','d',
+-  '}','�',
+-  'E','e','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
++  '}',static_cast<unsigned char>('�'),
++  'E','e',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'F','f','G','g','H','h',
+-  'I','i','�','�','�','�','�','�','�','�','�','�',
++  'I','i',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'J','j','K','k','L','l','M','m','N','n',
+-  'O','o','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
++  'O','o',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'P','p','Q','q','R','r','S','s','T','t',
+-  'U','u','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
++  'U','u',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'V','v','W','w','X','x',
+-  'Y','y','{','�','^','�','`','�','|','�','�','�',
++  'Y','y','{',static_cast<unsigned char>('�'),'^',static_cast<unsigned char>('�'),'`',static_cast<unsigned char>('�'),'|',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'Z','z',
+   0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x8E, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x9E, 0x00},
+ //Vietware-F
+-{ 'A','a','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
++{ 'A','a',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'B','b','C','c','D','d',
+-  '�','�',
+-  'E','e','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  'E','e',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'F','f','G','g','H','h',
+-  'I','i','�','�','�','�','�','�','�','�','�','�',
++  'I','i',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'J','j','K','k','L','l','M','m','N','n',
+-  'O','o','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
++  'O','o',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'P','p','Q','q','R','r','S','s','T','t',
+-  'U','u','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
++  'U','u',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'V','v','W','w','X','x',
+-  'Y','y','�','�','�','�','�','�','�','�','�','�',
++  'Y','y',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'Z','z',
+   0x80, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88,
+   0x89, 0x8A, 0x8B, 0x8C, 0x8E, 0x91, 0x92, 0x93,
+   0x94, 0x95, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x9E, 0x00},
+ // ISC
+- {'A','a','�','�','�','�','�','�','�','�','�','�', 
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
++ {'A','a',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'), 
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'B','b','C','c','D','d',
+-  '�','�',
+-  'E','e','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  'E','e',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'F','f','G','g','H','h',
+-  'I','i','�','�','�','�','�','�','�','�','�','�',
++  'I','i',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'J','j','K','k','L','l','M','m','N','n',
+-  'O','o','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
+-  '�','�','�','�','�','�','�','�','�','�','�','�',
++  'O','o',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'P','p','Q','q','R','r','S','s','T','t',
+-  'U','u','@','�','�','�','�','�','�','�','|','�',
+-  '�','�','`','�',0x5C,'�','^','�','~','�','#','�',
++  'U','u','@',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),'|',static_cast<unsigned char>('�'),
++  static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),'`',static_cast<unsigned char>('�'),0x5C,static_cast<unsigned char>('�'),'^',static_cast<unsigned char>('�'),'~',static_cast<unsigned char>('�'),'#',static_cast<unsigned char>('�'),
+   'V','v','W','w','X','x',
+-  'Y','y','�','�','�','�','�','�','�','�','�','�',
++  'Y','y',static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),static_cast<unsigned char>('�'),
+   'Z','z',
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x12, 0x13,
diff --git a/misc/ibus-unikey/ibus-unikey.SlackBuild b/misc/ibus-unikey/ibus-unikey.SlackBuild
index 3a60cac3af..3e2c7cc047 100644
--- a/misc/ibus-unikey/ibus-unikey.SlackBuild
+++ b/misc/ibus-unikey/ibus-unikey.SlackBuild
@@ -7,7 +7,7 @@
 # Maintained by Binh Nguyen <binhvng@gmail.com> from version 0.5.1
 
 PRGNAM=ibus-unikey
-VERSION=${VERSION:-0.5.1}
+VERSION=${VERSION:-0.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,6 +54,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Debian patch to fix compile errors with gcc
+patch -p1 -i $CWD/gcc-6.diff
+
+./autogen.sh
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/misc/ibus-unikey/ibus-unikey.info b/misc/ibus-unikey/ibus-unikey.info
index 3c18e3da66..d12327e7e8 100644
--- a/misc/ibus-unikey/ibus-unikey.info
+++ b/misc/ibus-unikey/ibus-unikey.info
@@ -1,8 +1,8 @@
 PRGNAM="ibus-unikey"
-VERSION="0.5.1"
+VERSION="0.6.1"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/ibus-unikey-0.5.1.tar.gz"
-MD5SUM="0b8f79941dc3e9a4744d52e88e4401dc"
+DOWNLOAD="https://github.com/mrlequoctuan/ibus-unikey/archive/0.6.1/ibus-unikey-0.6.1.tar.gz"
+MD5SUM="a219025729840ff86dec307373d78f33"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ibus"