Merge lp:~gunnarhj/ubuntu/wily/ibus/pt_PT-compose into lp:ubuntu/wily/ibus

[Gunnar Hjalmarsson]

[Sebastien Bacher (seb128)]

Gunnar, thanks for the work but it seems upstream ibus fixed that differently right? Which means that solution is deprecated? I'm marking it as rejected but feel free to change it back if that's a wrong understanding of the situation

review: Disapprove

[Gunnar Hjalmarsson (gunnarhj)]

Basically I agree. The one reason for uploading this (temporarily) would be if it will take some time before the upstream change lands in Ubuntu. Are you able to estimate that?

[Sebastien Bacher (seb128)]

No, but the new cycle just started so we should be able to get the update before the next version of ubuntu ships to users. Aron might have a better idea about that though

Unmerged revisions

56. By Gunnar Hjalmarsson on 2015-05-07

* debian/patches/ubuntu-add-pt_PT-compose.patch:
  - Add compose table for pt_PT (LP: #518056).

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-04 20:39:27 +0000
+++ debian/changelog	2015-05-07 16:21:13 +0000
@@ -1,3 +1,10 @@
+ibus (1.5.9-1ubuntu4) wily; urgency=medium
+
+  * debian/patches/ubuntu-add-pt_PT-compose.patch:
+    - Add compose table for pt_PT (LP: #518056).
+
+ -- Gunnar Hjalmarsson <[e-mail]>  Thu, 07 May 2015 17:48:00 +0200
+
 ibus (1.5.9-1ubuntu3) vivid; urgency=medium
 
   * Drop the ibus dependency on python-notify. According to the changelog,

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-10-28 17:07:58 +0000
+++ debian/patches/series	2015-05-07 16:21:13 +0000
@@ -21,3 +21,4 @@
 ubuntu-disable-trigger.patch
 ubuntu-forward-panel-properties.patch
 ibus-zz-C.UTF-8.patch
+ubuntu-add-pt_PT-compose.patch

=== added file 'debian/patches/ubuntu-add-pt_PT-compose.patch'
--- debian/patches/ubuntu-add-pt_PT-compose.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ubuntu-add-pt_PT-compose.patch	2015-05-07 16:21:13 +0000
@@ -0,0 +1,103 @@
+Description: Add compose table for pt_PT
+Bug: https://launchpad.net/bugs/518056
+Forwarded: https://code.google.com/p/ibus/issues/detail?id=1777
+Author: Gunnar Hjalmarsson <[e-mail]>
+
+diff -ru ibus.orig/bindings/vala/ibus-private.vapi ibus/bindings/vala/ibus-private.vapi
+--- ibus.orig/bindings/vala/ibus-private.vapi	2014-09-16 04:55:35.000000000 +0200
++++ ibus/bindings/vala/ibus-private.vapi	2015-04-07 16:37:11.073047380 +0200
+@@ -19,4 +19,8 @@
+         public const uint16[] seqs_pt_br;
+ 	[CCode (cname = "ibus_compose_table_pt_br", cheader_filename = "ibuscomposetable.h")]
+ 	public const Table table_pt_br;
++	[CCode (cname = "ibus_compose_seqs_pt_pt", cheader_filename = "ibuscomposetable.h")]
++        public const uint16[] seqs_pt_br;
++	[CCode (cname = "ibus_compose_table_pt_pt", cheader_filename = "ibuscomposetable.h")]
++	public const Table table_pt_br;
+ }
+diff -ru ibus.orig/src/gencomposetable.c ibus/src/gencomposetable.c
+--- ibus.orig/src/gencomposetable.c	2014-09-16 04:55:35.000000000 +0200
++++ ibus/src/gencomposetable.c	2015-04-07 16:32:51.081097441 +0200
+@@ -140,6 +140,7 @@
+     "/usr/share/X11/locale/el_GR.UTF-8/Compose",
+     "/usr/share/X11/locale/fi_FI.UTF-8/Compose",
+     "/usr/share/X11/locale/pt_BR.UTF-8/Compose",
++    "/usr/share/X11/locale/pt_PT.UTF-8/Compose",
+     NULL
+ };
+ 
+@@ -883,6 +884,8 @@
+             PRINT_LOCALE_AND_IBUS_COMPOSE_TABLE (fi_fi);
+         else if (g_strstr_len (compose_file, -1, "pt_BR") != NULL)
+             PRINT_LOCALE_AND_IBUS_COMPOSE_TABLE (pt_br);
++        else if (g_strstr_len (compose_file, -1, "pt_PT") != NULL)
++            PRINT_LOCALE_AND_IBUS_COMPOSE_TABLE (pt_pt);
+         else
+             g_assert_not_reached ();
+     }
+@@ -932,6 +935,10 @@
+             g_printerr ("Generating ibus_compose_seqs_pt_br ...\n");
+             g_printf ("static const guint16 ibus_compose_seqs_pt_br[] = {\n");
+         }
++        else if (g_strstr_len (compose_file, -1, "pt_PT") != NULL) {
++            g_printerr ("Generating ibus_compose_seqs_pt_pt ...\n");
++            g_printf ("static const guint16 ibus_compose_seqs_pt_pt[] = {\n");
++        }
+         else
+             g_assert_not_reached ();
+ 
+@@ -952,6 +959,8 @@
+             PRINT_IBUS_COMPOSE_TABLE_LOCALE (fi_fi, MAX_COMPOSE_LEN);
+         else if (g_strstr_len (compose_file, -1, "pt_BR") != NULL)
+             PRINT_IBUS_COMPOSE_TABLE_LOCALE (pt_br, MAX_COMPOSE_LEN);
++        else if (g_strstr_len (compose_file, -1, "pt_PT") != NULL)
++            PRINT_IBUS_COMPOSE_TABLE_LOCALE (pt_pt, MAX_COMPOSE_LEN);
+         else
+             g_assert_not_reached ();
+ 
+diff -ru ibus.orig/src/ibuscomposetable.h ibus/src/ibuscomposetable.h
+--- ibus.orig/src/ibuscomposetable.h	2014-09-16 04:55:35.000000000 +0200
++++ ibus/src/ibuscomposetable.h	2015-04-07 16:35:29.751713537 +0200
+@@ -2088,10 +2088,42 @@
+     G_N_ELEMENTS (ibus_compose_seqs_pt_br) / (4 + 2)
+ };
+ 
++static const guint16 ibus_compose_seqs_pt_pt[] = {
++  IBUS_KEY_dead_acute, IBUS_KEY_C, 0, 0,
++    0, 0x00C7, /* Ccedilla	# LATIN CAPITAL LETTER C WITH CEDILLA */
++  IBUS_KEY_dead_acute, IBUS_KEY_c, 0, 0,
++    0, 0x00E7, /* ccedilla	# LATIN SMALL LETTER C WITH CEDILLA */
++  IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_slash, 0,
++    0, 0x301E, /* U301e	# DOUBLE PRIME QUOTATION MARK */
++  IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_backslash, 0,
++    0, 0x301D, /* U301d	# REVERSED DOUBLE PRIME QUOTATION MARK */
++  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x03D2, 0,
++    0, 0x03D3, /* U03D3	# GREEK UPSILON WITH ACUTE AND HOOK SYMBOL */
++  IBUS_KEY_Multi_key, IBUS_KEY_comma, IBUS_KEY_E, 0,
++    0, 0x0228, /* U0228	# LATIN CAPITAL LETTER E WITH CEDILLA */
++  IBUS_KEY_Multi_key, IBUS_KEY_comma, IBUS_KEY_e, 0,
++    0, 0x0229, /* U0229	# LATIN SMALL LETTER E WITH CEDILLA */
++  IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_comma, IBUS_KEY_E,
++    0, 0x1E1C, /* U1E1C	# LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE */
++  IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_comma, IBUS_KEY_e,
++    0, 0x1E1D, /* U1E1D	# LATIN SMALL LETTER E WITH CEDILLA AND BREVE */
++  IBUS_KEY_Multi_key, IBUS_KEY_e, IBUS_KEY_e, 0,
++    0, 0x018F, /* U018f */
++  IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x03D2, 0,
++    0, 0x03D3  /* U03D3	# GREEK UPSILON WITH ACUTE AND HOOK SYMBOL */
++};
++
++static const IBusComposeTable ibus_compose_table_pt_pt = {
++    ibus_compose_seqs_pt_pt,
++    4,
++    G_N_ELEMENTS (ibus_compose_seqs_pt_pt) / (4 + 2)
++};
++
+ static const IBusComposeTableLocaleList ibus_compose_table_locale_list[] = {
+     { "el_gr", &ibus_compose_table_el_gr },
+     { "fi_fi", &ibus_compose_table_fi_fi },
+     { "pt_br", &ibus_compose_table_pt_br },
++    { "pt_pt", &ibus_compose_table_pt_pt },
+     { NULL, NULL }
+ };
+