Commit 6498febd authored by Boyuan Yang's avatar Boyuan Yang
Browse files

debian/patches: Remove all obsolete patches.

parent 1347a0b2
Description: fix FTBFS with clang instead of gcc
Author: Nicolas Sévelin-Radiguet <[email protected]>
Last-Update: 2014-03-30
--- a/src/setup.c
+++ b/src/setup.c
@@ -428,7 +428,7 @@
gboolean retval = TRUE;
if (!gtk_tree_model_get_iter_first (model, &iter))
- return;
+ return FALSE;
do {
gtk_tree_model_get (model, &iter,
This diff is collapsed.
From b0e03bac1f3b420ac1b7ac76d6008dd4ed942cbf Mon Sep 17 00:00:00 2001
From: Daiki Ueno <[email protected]>
Date: Mon, 13 May 2013 15:45:33 +0900
Subject: [PATCH] Fix ibus-m17n-preferences.ui location
---
src/setup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/setup.c b/src/setup.c
index 513fabf..4de8fb1 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -570,7 +570,7 @@ setup_dialog_new (IBusConfig *config,
error = NULL;
if (gtk_builder_add_from_file (builder,
- PKGDATADIR "setup/ibus-m17n-preferences.ui",
+ PKGDATADIR "/setup/ibus-m17n-preferences.ui",
&error) == 0) {
g_warning ("can't read ibus-m17n-preferences.ui: %s",
error->message);
--
1.8.1.4
From e5c742c56abaadaa5d5a018c0d9004bf2d0a100c Mon Sep 17 00:00:00 2001
From: Mike FABIAN <[email protected]>
Date: Mon, 12 Aug 2013 18:51:59 +0200
Subject: [PATCH] engine: fix preedit background colour and underlining
BUG=rhbz#995842
Review URL: https://codereview.appspot.com/12688049
Patch from Mike FABIAN <[email protected]>.
---
src/engine.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/src/engine.c
+++ b/src/engine.c
@@ -293,7 +293,7 @@
"preedit_underline",
G_VARIANT_TYPE_INT32);
if (value != NULL) {
- klass->preedit_background = g_variant_get_int32 (value);
+ klass->preedit_underline = g_variant_get_int32 (value);
g_variant_unref (value);
}
From 02022c17212357afb5cec727edd8f095aa40d98d Mon Sep 17 00:00:00 2001
From: Daiki Ueno <[email protected]>
Date: Thu, 29 Sep 2011 10:17:28 +0900
Subject: [PATCH 2/4] Hide status from the panel if status == title.
---
src/engine.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
--- a/src/engine.c
+++ b/src/engine.c
@@ -36,6 +36,7 @@
IBusPreeditFocusMode preedit_focus_mode;
gint lookup_table_orientation;
+ gchar *title;
MInputMethod *im;
};
@@ -245,6 +246,10 @@
}
engine_name = g_strdup_printf ("m17n:%s:%s", lang, name);
klass->config_section = g_strdup_printf ("engine/M17N/%s/%s", lang, name);
+ MPlist *l = minput_get_title_icon (msymbol (lang), msymbol (name));
+ if (l && mplist_key (l) == Mtext) {
+ klass->title = ibus_m17n_mtext_to_utf8 (mplist_value (l));
+ }
g_free (lang);
g_free (name);
@@ -903,8 +908,9 @@
else if (command == Minput_status_draw) {
gchar *status;
status = ibus_m17n_mtext_to_utf8 (m17n->context->status);
+ IBusM17NEngineClass *klass = (IBusM17NEngineClass *) G_OBJECT_GET_CLASS (m17n);
- if (status && strlen (status)) {
+ if (status && strlen (status) && g_strcmp0 (status, klass->title)) {
IBusText *text;
text = ibus_text_new_from_string (status);
ibus_property_set_label (m17n->status_prop, text);
Index: ibus-m17n-1.3.4/src/default.xml
===================================================================
--- ibus-m17n-1.3.4.orig/src/default.xml
+++ ibus-m17n-1.3.4/src/default.xml
@@ -184,6 +184,15 @@
<name>m17n:si:samanala</name>
<rank>0</rank>
</engine>
+ <!-- Some Indic engines expect AltGr is automatically mapped -->
+ <engine>
+ <name>m17n:*:inscript*</name>
+ <layout>default[lv3:ralt_switch]</layout>
+ </engine>
+ <engine>
+ <name>m17n:si:*</name>
+ <layout>default[lv3:ralt_switch]</layout>
+ </engine>
<!-- Some CJK engines use preedit. -->
<engine>
<name>m17n:zh:cangjie</name>
Index: ibus-m17n-1.3.4/src/m17nutil.c
===================================================================
--- ibus-m17n-1.3.4.orig/src/m17nutil.c
+++ ibus-m17n-1.3.4/src/m17nutil.c
@@ -17,7 +17,8 @@ typedef enum {
ENGINE_CONFIG_RANK_MASK = 1 << 0,
ENGINE_CONFIG_SYMBOL_MASK = 1 << 1,
ENGINE_CONFIG_LONGNAME_MASK = 1 << 2,
- ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK = 1 << 3
+ ENGINE_CONFIG_LAYOUT_MASK = 1 << 3,
+ ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK = 1 << 4
} EngineConfigMask;
struct _EngineConfigNode {
@@ -137,7 +138,7 @@ ibus_m17n_engine_new (MSymbol lang,
"language", msymbol_name (lang),
"license", "GPL",
"icon", engine_icon ? engine_icon : "",
- "layout", "default",
+ "layout", config->layout ? config->layout : "default",
"rank", config->rank,
"symbol", config->symbol ? config->symbol : "",
"setup", engine_setup,
@@ -272,6 +273,8 @@ ibus_m17n_get_engine_config (const gchar
config->symbol = cnode->config.symbol;
if (cnode->mask & ENGINE_CONFIG_LONGNAME_MASK)
config->longname = cnode->config.longname;
+ if (cnode->mask & ENGINE_CONFIG_LAYOUT_MASK)
+ config->layout = cnode->config.layout;
if (cnode->mask & ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK)
config->preedit_highlight = cnode->config.preedit_highlight;
}
@@ -314,6 +317,12 @@ ibus_m17n_engine_config_parse_xml_node (
cnode->mask |= ENGINE_CONFIG_LONGNAME_MASK;
continue;
}
+ if (g_strcmp0 (sub_node->name , "layout") == 0) {
+ g_free (cnode->config.layout);
+ cnode->config.layout = g_strdup (sub_node->text);
+ cnode->mask |= ENGINE_CONFIG_LAYOUT_MASK;
+ continue;
+ }
if (g_strcmp0 (sub_node->name , "preedit-highlight") == 0) {
if (g_ascii_strcasecmp ("TRUE", sub_node->text) == 0)
cnode->config.preedit_highlight = TRUE;
Index: ibus-m17n-1.3.4/src/m17nutil.h
===================================================================
--- ibus-m17n-1.3.4.orig/src/m17nutil.h
+++ ibus-m17n-1.3.4/src/m17nutil.h
@@ -20,6 +20,9 @@ struct _IBusM17NEngineConfig {
/* overridding longname shown on panel */
gchar *longname;
+ /* keyboard layout */
+ gchar *layout;
+
/* whether to highlight preedit */
gboolean preedit_highlight;
};
#ibus-m17n-HEAD.patch
#ibus-m17n-fix-data-location.patch
ibus-m17n-fix-preedit-color.patch
# Fedora specific patches:
# Enable lv3:ralt_switch option for some Indic engines in default.xml.
#ibus-m17n-xkb-options.patch
# Don't make the status button clickable (maybe obsolete).
ibus-m17n-hide-title-status.patch
clang_FTBFS-Wreturn-type.patch
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment