mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-13 16:06:59 +02:00
chore(app-i18n/ibus-m17n): Delete
we don't need ibus in coreos, delete it
This commit is contained in:
Brandon Philips
parent
029267b874
commit
25a96d53e6
@ -1 +0,0 @@
|
|||||||
DIST ibus-m17n-1.3.3.tar.gz 431113 RMD160 ad707cd360bc933b32795e06f98984631e0c457a SHA1 923a3d6416e06c34b63b54c40deff6ab23c6211a SHA256 0374aef2149bcf1a337c39ab642ee39da4dbb17758ee8c095f954ca835dc10bf
|
|
||||||
@ -1,55 +0,0 @@
|
|||||||
From 11730d65d6d62711d7f8a2ce415d1229a86dd16e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peng Huang <shawn.p.huang@gmail.com>
|
|
||||||
Date: Sun, 18 Sep 2011 22:08:00 -0400
|
|
||||||
Subject: [PATCH] Fix a crash and add some warning log message.
|
|
||||||
|
|
||||||
BUG=Crash in Chrome OS
|
|
||||||
TEST=Linux desktop
|
|
||||||
|
|
||||||
Review URL: http://codereview.appspot.com/5050041
|
|
||||||
---
|
|
||||||
src/engine.c | 19 ++++++++++++++++---
|
|
||||||
1 files changed, 16 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/engine.c b/src/engine.c
|
|
||||||
index dcff0c7..db14607 100644
|
|
||||||
--- a/src/engine.c
|
|
||||||
+++ b/src/engine.c
|
|
||||||
@@ -816,8 +816,15 @@ ibus_m17n_engine_update_lookup_table (IBusM17NEngine *m17n)
|
|
||||||
ibus_lookup_table_set_page_size (m17n->table, mtext_len (mt));
|
|
||||||
|
|
||||||
buf = ibus_m17n_mtext_to_ucs4 (mt, &nchars);
|
|
||||||
- for (i = 0; i < nchars; i++) {
|
|
||||||
- ibus_lookup_table_append_candidate (m17n->table, ibus_text_new_from_unichar (buf[i]));
|
|
||||||
+ g_warn_if_fail (buf != NULL);
|
|
||||||
+
|
|
||||||
+ for (i = 0; buf != NULL && i < nchars; i++) {
|
|
||||||
+ IBusText *text = ibus_text_new_from_unichar (buf[i]);
|
|
||||||
+ if (text == NULL) {
|
|
||||||
+ text = ibus_text_new_from_printf ("INVCODE=U+%04"G_GINT32_FORMAT"X", buf[i]);
|
|
||||||
+ g_warn_if_reached ();
|
|
||||||
+ }
|
|
||||||
+ ibus_lookup_table_append_candidate (m17n->table, text);
|
|
||||||
}
|
|
||||||
g_free (buf);
|
|
||||||
}
|
|
||||||
@@ -834,9 +841,15 @@ ibus_m17n_engine_update_lookup_table (IBusM17NEngine *m17n)
|
|
||||||
mtext = (MText *) mplist_value (p);
|
|
||||||
buf = ibus_m17n_mtext_to_utf8 (mtext);
|
|
||||||
if (buf) {
|
|
||||||
- ibus_lookup_table_append_candidate (m17n->table, ibus_text_new_from_string (buf));
|
|
||||||
+ ibus_lookup_table_append_candidate (m17n->table,
|
|
||||||
+ ibus_text_new_from_string (buf));
|
|
||||||
g_free (buf);
|
|
||||||
}
|
|
||||||
+ else {
|
|
||||||
+ ibus_lookup_table_append_candidate (m17n->table,
|
|
||||||
+ ibus_text_new_from_static_string ("NULL"));
|
|
||||||
+ g_warn_if_reached();
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
1.7.1
|
|
||||||
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
diff --git a/src/m17nutil.c b/src/m17nutil.c
|
|
||||||
index 42aa8f6..dd10bbd 100644
|
|
||||||
--- a/src/m17nutil.c
|
|
||||||
+++ b/src/m17nutil.c
|
|
||||||
@@ -11,7 +11,9 @@
|
|
||||||
|
|
||||||
static MConverter *utf8_converter = NULL;
|
|
||||||
|
|
||||||
+#ifndef DEFAULT_XML
|
|
||||||
#define DEFAULT_XML (SETUPDIR "/default.xml")
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
struct _IBusM17NEngineConfigNode {
|
|
||||||
gchar *name;
|
|
||||||
@ -1,100 +0,0 @@
|
|||||||
# Copyright 1999-2009 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-m17n/ibus-m17n-1.2.0.20090617.ebuild,v 1.1 2009/06/18 15:40:00 matsuu Exp $
|
|
||||||
|
|
||||||
EAPI="2"
|
|
||||||
inherit eutils
|
|
||||||
|
|
||||||
DESCRIPTION="The M17N engine IMEngine for IBus Framework"
|
|
||||||
HOMEPAGE="http://code.google.com/p/ibus/"
|
|
||||||
SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 arm x86"
|
|
||||||
IUSE="nls"
|
|
||||||
|
|
||||||
RDEPEND=">=app-i18n/ibus-1.3.99
|
|
||||||
>=dev-libs/m17n-lib-1.6.1
|
|
||||||
>=dev-db/m17n-db-1.6.1
|
|
||||||
>=dev-db/m17n-contrib-1.1.10
|
|
||||||
nls? ( virtual/libintl )"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
>=chromeos-base/chromeos-chrome-16
|
|
||||||
chromeos-base/chromeos-assets
|
|
||||||
dev-libs/libxml2
|
|
||||||
dev-util/pkgconfig
|
|
||||||
>=sys-devel/gettext-0.16.1"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
# Make it possible to override the DEFAULT_XML macro.
|
|
||||||
epatch "${FILESDIR}"/ibus-m17n-1.3.3-allow-override-xml-path.patch
|
|
||||||
epatch "${FILESDIR}"/ibus-m17n-1.3.3-Fix-a-crash-and-add-some-warning-log-message.patch
|
|
||||||
|
|
||||||
# Build ibus-engine-m17n for the host platform.
|
|
||||||
(env -i ./configure && \
|
|
||||||
env -i make CFLAGS=-DDEFAULT_XML='\"./src/default.xml\"') || die
|
|
||||||
# Obtain the XML output by running the binary.
|
|
||||||
src/ibus-engine-m17n --xml > output.xml || die
|
|
||||||
# Sanity checks.
|
|
||||||
grep m17n:ar:kbd output.xml || die # in m17n-db
|
|
||||||
grep m17n:mr:itrans output.xml || die # in m17n-db-contrib
|
|
||||||
# Clean up.
|
|
||||||
make distclean || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
econf $(use_enable nls) || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
emake || die
|
|
||||||
# Rewrite m17n.xml using the XML output.
|
|
||||||
# input_methods.txt comes from chromeos-base/chromeos-chrome-9999.ebuild
|
|
||||||
ASSETSIMDIR="${SYSROOT}"/usr/share/chromeos-assets/input_methods
|
|
||||||
|
|
||||||
LIST="${ASSETSIMDIR}"/input_methods.txt
|
|
||||||
if [ -f ${LIST} ] ; then
|
|
||||||
python "${ASSETSIMDIR}"/filter.py < output.xml \
|
|
||||||
--whitelist="${LIST}" \
|
|
||||||
--rewrite=src/m17n.xml || die
|
|
||||||
else
|
|
||||||
# TODO(yusukes): Remove ibus_input_methods.txt support in R20.
|
|
||||||
LIST_OLD="${ASSETSIMDIR}"/ibus_input_methods.txt
|
|
||||||
if [ -f ${LIST_OLD} ] ; then
|
|
||||||
python "${ASSETSIMDIR}"/filter.py < output.xml \
|
|
||||||
--whitelist="${LIST_OLD}" \
|
|
||||||
--rewrite=src/m17n.xml || die
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Remove spaces from the XML to reduce file size from ~4k to ~3k.
|
|
||||||
# You can make it readable by 'xmllint --format' (on a target machine).
|
|
||||||
mv src/m17n.xml "${T}"/ || die
|
|
||||||
xmllint --noblanks "${T}"/m17n.xml > src/m17n.xml || die
|
|
||||||
# Sanity checks.
|
|
||||||
grep m17n:ar:kbd src/m17n.xml 2>&1 > /dev/null \
|
|
||||||
|| die # in m17n-db, whitelisted
|
|
||||||
grep m17n:mr:itrans src/m17n.xml 2>&1 > /dev/null \
|
|
||||||
|| die # in m17n-db-contrib, whitelisted
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
emake DESTDIR="${D}" install || die
|
|
||||||
rm -rf "${D}/usr/libexec/ibus-setup-m17n" || die
|
|
||||||
rm -rf "${D}/usr/share/ibus-m17n/icons" || die
|
|
||||||
|
|
||||||
# We should not delete default.xml in setup/.
|
|
||||||
rm -rf "${D}/usr/share/ibus-m17n/setup/ibus-m17n-preferences.ui" \
|
|
||||||
|| die
|
|
||||||
|
|
||||||
dodoc AUTHORS ChangeLog NEWS README
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
ewarn "This package is very experimental, please report your bugs to"
|
|
||||||
ewarn "http://ibus.googlecode.com/issues/list"
|
|
||||||
elog
|
|
||||||
elog "You should run ibus-setup and enable IM Engines you want to use!"
|
|
||||||
elog
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user