summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-02-13 18:13:53 +0000
committerJohannes Huber <johu@gentoo.org>2012-02-13 18:13:53 +0000
commit57ac6bf1065d97a810e150a4f139a4e0b49d578d (patch)
tree2d879f6adc9e3ba88d2e50e68809d6b3c7acd537 /kde-base
parentDo not install shadow.3 man page, see bug #403379. (diff)
downloadhistorical-57ac6bf1065d97a810e150a4f139a4e0b49d578d.tar.gz
historical-57ac6bf1065d97a810e150a4f139a4e0b49d578d.tar.bz2
historical-57ac6bf1065d97a810e150a4f139a4e0b49d578d.zip
Add upstream patch to build with app-i18n/ibus-1.4.1 wrt bug #403367.
Package-Manager: portage-2.2.0_alpha86/cvs/Linux i686
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdeplasma-addons/ChangeLog6
-rw-r--r--kde-base/kdeplasma-addons/Manifest19
-rw-r--r--kde-base/kdeplasma-addons/files/kdeplasma-addons-4.8.0-ibus141.patch328
-rw-r--r--kde-base/kdeplasma-addons/kdeplasma-addons-4.8.0.ebuild6
4 files changed, 348 insertions, 11 deletions
diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index 71331dc7d8df..ee4467c699b6 100644
--- a/kde-base/kdeplasma-addons/ChangeLog
+++ b/kde-base/kdeplasma-addons/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kdeplasma-addons
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.118 2012/01/25 18:17:16 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.119 2012/02/13 18:13:53 johu Exp $
+
+ 13 Feb 2012; Johannes Huber <johu@gentoo.org>
+ +files/kdeplasma-addons-4.8.0-ibus141.patch, kdeplasma-addons-4.8.0.ebuild:
+ Add upstream patch to build with app-i18n/ibus-1.4.1 wrt bug #403367.
*kdeplasma-addons-4.8.0 (25 Jan 2012)
diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest
index aa3f46078dcf..d159b68e0ced 100644
--- a/kde-base/kdeplasma-addons/Manifest
+++ b/kde-base/kdeplasma-addons/Manifest
@@ -3,22 +3,23 @@ Hash: SHA512
AUX kdeplasma-addons-4.6.2-optional-akonadi.patch 1982 RMD160 3f6c7e4356369d1b59bd8c57d91afc4b655ce18c SHA1 01505b07c9fc41628cfcb881364367cab6b3d17a SHA256 c62b36eccb02517561d5ae88e50fbe3029c37b65b1075c1f94ab7d6bb0fd51c9
AUX kdeplasma-addons-4.7.3-knowledge.patch 729 RMD160 b1830e318577bc1a9ed85bc07c7f1dc225f15eca SHA1 ce7c8265232d127761e8c3f4acb69540f5700197 SHA256 f4590f36a81e118510e3b240e1430dc41725fa3feb74c759d58d075a995d0839
+AUX kdeplasma-addons-4.8.0-ibus141.patch 13996 RMD160 751b7bd805b3738c6e02fd95b7dc964837ac7db9 SHA1 b4c473306ff6baf1c5df633d1bdcdc943eb46660 SHA256 a618981ea38db3f34aff65cebd35611bfe458b95036da09501b45e4cad549386
DIST kdeplasma-addons-4.6.3.tar.bz2 1935272 RMD160 85c546d4aad35e3785980203d2f8ff0d154cafb6 SHA1 7a43dcfebc0316e681b04d0958d89272620a11b7 SHA256 6f8c11191aecb7cd8477c3c406515dc13991c4f6f73b892c0e25e89b12e58bcf
DIST kdeplasma-addons-4.7.4.tar.bz2 1975849 RMD160 3cb04e64b67f53b24d7e80f47eeba14439648e97 SHA1 2bbf77d77e809733e6a74ff5688e6ff5487bc8bf SHA256 c55f5304d426a56455e34da7826f51b3ead2234ed31237a6673ae7ebaf141519
DIST kdeplasma-addons-4.8.0.tar.bz2 2034509 RMD160 486aece43ce7e6154aa25b4b4a66b5a3231eacb0 SHA1 0049d6977cb89f303468813811f3fde2807fd8db SHA256 9c79872b6ab85a5a3b0cc4be24f30d0d43f5883999d774f8a3f0670bbfad056b
EBUILD kdeplasma-addons-4.6.3.ebuild 2013 RMD160 4bd6ccaad55ba7ee179f369637504472d8717a34 SHA1 7d0a3a15633b3fbc5e396b7fadecdc97f645b3b3 SHA256 717e593e1cb20a2701964ae9df26d8c4de572368a73c632a30d48f96b94a661a
EBUILD kdeplasma-addons-4.7.4.ebuild 1836 RMD160 d9682ea381b66c4f9adaf0891c9cf52f1d039ed4 SHA1 4bd9e72a1ae4dc1780ce6631496f86b5450f5e89 SHA256 8cbc4318cb617a939b61fbba504c8127d2250be846af82fc13e0db630d64a0f9
-EBUILD kdeplasma-addons-4.8.0.ebuild 1771 RMD160 1ff7aeb5922c42f41048452aef93e3b7b4cf7d95 SHA1 492fe5ed325420cf2e8d8d34e7f6fed8343e8399 SHA256 34393a1c80622673f16b207cbfeafd025b2ef8ddb4d147a33adb965d5d95aaa6
-MISC ChangeLog 17268 RMD160 ed577ff4021c3b74f6313cb8ff9e471a1d3fc0de SHA1 bafceb1027570d017946dbaab4fe4f2c9a57d9a3 SHA256 d4f99c662c4f4637b256fbe4dce3d8ad1b456319f14a79a4c6d4b8f65d399a92
+EBUILD kdeplasma-addons-4.8.0.ebuild 1825 RMD160 1a088c752c7f1447ba8161d824d33ae465555480 SHA1 0b9eeff9080df04411acf93bbb5d147ef09817b2 SHA256 030ad517813deee7a3e725474ba43a7596f41d54bf7dcba5c1809b081cf00d49
+MISC ChangeLog 17467 RMD160 0caff9da44b48918665b947f3eecebe490006db6 SHA1 338fb7637a66145efbba86d7dc590851e7c5f3fc SHA256 0505759716cc47fc7cbb5f6c6366568401df55dfe54bf4ab74f9199257d7ebfd
MISC metadata.xml 590 RMD160 348b8b1bc247366b339794cc2aec564b2226e067 SHA1 677e55796be545f56fc4b7351268fb7aff49aaa9 SHA256 f1b43f2d7869ec912de095ae4cac3d50bcd7cd8295d73f65e57e0ff7d8ca9ea6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBCgAGBQJPIEg1AAoJEO+t9ga+3I3a3F0H+wSq6pE5+mrqrkPR+8WPAnmm
-/e0lm7FmZ0F13SE5qtrngXBs8JZVwuA8aRV+Tmi+39qEZwNDpij9zPHlsl0GYSvU
-/OryM9j9QBTAj0SzbRf1BlX0jNLHBeehYGf52+vrV/DFgYiDBBOiJdUwQBGQeB3N
-wURoL4fyoZdr88Y9AKSGwA33l+eOIT4Tj3gV8s5+DTyfHmk0P63FyKbeeLDh7YLW
-J2aBGbfc/p3wY4ttYl4Czv6j3YxbTHpuhAc4TaZdTAR8hWq8GhY6NLAxFqGsGPYH
-RiRRbMZKRCo4g+NWLDQbIsxpaFNDLJ/3uiVJNtERNrvr+scu3w/oe1sv/KTzZ8c=
-=ymll
+iQEcBAEBCgAGBQJPOVP8AAoJEO+t9ga+3I3antkH/iUkE9fbFqX4XjElWYh658j4
+QNGviuvbi7o+0opaGkQqdB4EuuuXWuuypXbznjHIpem9NWR8BbmtHzEzqCqdRkba
+1YCcHS2Wj/wiyyAAbSUS/i2o4Vqd2tIcfUWfSnU6dTzisECZPFIztwiq9KHzGe0R
+xIoZFn36VCUowHEdW8l0s9v0VCMeWTblZOLw8BnIzJfmcDuxX8MQpFB12PNkBuTX
+9upHmUbgBMHT2iuEQnfX6p8ffnJ1qUTI9Yn2/HoFZ/7UiMudT8w1V31KdpSciGRn
+/zITXhPyJT6rW/DSJub8JKz3B1ZrnvCN9aMaxKr+CBNSJ9QAhrmRG3ApUyeev3M=
+=sE2a
-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.8.0-ibus141.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.8.0-ibus141.patch
new file mode 100644
index 000000000000..94521be6b252
--- /dev/null
+++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.8.0-ibus141.patch
@@ -0,0 +1,328 @@
+commit c36d480a2b1867fffc553ccbeb55bef5d6a0d72e
+Author: Weng Xuetian <wengxt@gmail.com>
+Date: Sun Feb 12 19:54:39 2012 +0800
+
+ backport: ibus 1.4.1 compatible.
+
+diff --git a/applets/kimpanel/backend/ibus/panel.c b/applets/kimpanel/backend/ibus/panel.c
+index 9ec68cf..b917c89 100644
+--- a/applets/kimpanel/backend/ibus/panel.c
++++ b/applets/kimpanel/backend/ibus/panel.c
+@@ -1,6 +1,6 @@
+ /*
+ * This file is part of KIMToy, an input method frontend for KDE
+- * Copyright (C) 2011 Ni Hui <shuizhuyuanluo@126.com>
++ * Copyright (C) 2011-2012 Ni Hui <shuizhuyuanluo@126.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+@@ -28,6 +28,9 @@
+ #endif
+ #include "panel.h"
+
++#ifndef DBUS_ERROR_FAILED
++#define DBUS_ERROR_FAILED "org.freedesktop.DBus.Error.Failed"
++#endif /* DBUS_ERROR_FAILED */
+ #define _UNUSED(x) ((void) x)
+
+ typedef struct _IBusPanelImpanelClass IBusPanelImpanelClass;
+@@ -236,6 +239,7 @@ ibus_property_args_to_propstr (const char *key,
+ char *propstr)
+ {
+ static const char pre[] = "/IBus/";
++ propstr[0] = '\0';
+ strcat(propstr, pre);
+ strcat(propstr, key);
+ strcat(propstr, prop_sep);
+@@ -250,11 +254,19 @@ static void
+ ibus_property_to_propstr (IBusProperty *property,
+ char *propstr)
+ {
++#if !IBUS_CHECK_VERSION(1,3,99)
+ ibus_property_args_to_propstr(property->key,
+ property->label->text,
+ property->icon,
+ property->tooltip->text,
+ propstr);
++#else
++ ibus_property_args_to_propstr(ibus_property_get_key (property),
++ ibus_text_get_text (ibus_property_get_label (property)),
++ ibus_property_get_icon (property),
++ ibus_text_get_text (ibus_property_get_tooltip (property)),
++ propstr);
++#endif
+ }
+
+ static void
+@@ -266,6 +278,7 @@ ibus_engine_desc_args_to_propstr (const char *name,
+ char *propstr)
+ {
+ static const char pre[] = "/IBus/Engine/";
++ propstr[0] = '\0';
+ strcat(propstr, pre);
+ strcat(propstr, name);
+ strcat(propstr, prop_sep);
+@@ -502,48 +515,34 @@ ibus_panel_impanel_init (IBusPanelImpanel *impanel)
+ impanel, NULL);
+
+ // some custom property
+- impanel->logo_prop = (IBusProperty *)malloc(sizeof(IBusProperty));
+- memset(impanel->logo_prop, 0, sizeof(IBusProperty));
+- impanel->logo_prop->key = strdup("Logo");
+- impanel->logo_prop->icon = strdup("ibus");
+- impanel->logo_prop->label = (IBusText *)malloc(sizeof(IBusText));
+- memset(impanel->logo_prop->label, 0, sizeof(IBusText));
+- impanel->logo_prop->label->text = strdup("IBus");
+- impanel->logo_prop->tooltip = (IBusText *)malloc(sizeof(IBusText));
+- memset(impanel->logo_prop->tooltip, 0, sizeof(IBusText));
+- impanel->logo_prop->tooltip->text = strdup("IBus input method");
+- impanel->about_prop = (IBusProperty *)malloc(sizeof(IBusProperty));
+- memset(impanel->about_prop, 0, sizeof(IBusProperty));
+- impanel->about_prop->key = strdup("About");
+- impanel->about_prop->icon = strdup("ibus-help");
+- impanel->about_prop->label = (IBusText *)malloc(sizeof(IBusText));
+- memset(impanel->about_prop->label, 0, sizeof(IBusText));
+- impanel->about_prop->label->text = strdup("IBus intelligent input bus");
+- impanel->about_prop->tooltip = (IBusText *)malloc(sizeof(IBusText));
+- memset(impanel->about_prop->tooltip, 0, sizeof(IBusText));
+- impanel->about_prop->tooltip->text = strdup("IBus is an intelligent input bus for Linux/Unix.\n\n"
+- "Huang Peng <shawn.p.huang@gmail.com>");
++ impanel->logo_prop = ibus_property_new ("Logo",
++ PROP_TYPE_NORMAL,
++ ibus_text_new_from_string ("IBus"),
++ "ibus",
++ ibus_text_new_from_string ("IBus input method"),
++ FALSE,
++ FALSE,
++ PROP_STATE_UNCHECKED,
++ NULL);
++
++ impanel->about_prop = ibus_property_new ("About",
++ PROP_TYPE_NORMAL,
++ ibus_text_new_from_string ("IBus intelligent input bus"),
++ "ibus-help",
++ ibus_text_new_from_string ("IBus is an intelligent input bus for Linux/Unix.\n\n"
++ "Huang Peng <shawn.p.huang@gmail.com>"),
++ FALSE,
++ FALSE,
++ PROP_STATE_UNCHECKED,
++ NULL);
+ }
+
+ static void
+ ibus_panel_impanel_destroy (IBusPanelImpanel *impanel)
+ {
+- // free custom property
+- free(impanel->logo_prop->key);
+- free(impanel->logo_prop->icon);
+- free(impanel->logo_prop->label->text);
+- free(impanel->logo_prop->label);
+- free(impanel->logo_prop->tooltip->text);
+- free(impanel->logo_prop->tooltip);
+- free(impanel->logo_prop);
++ g_object_unref (impanel->logo_prop);
+ impanel->logo_prop = NULL;
+- free(impanel->about_prop->key);
+- free(impanel->about_prop->icon);
+- free(impanel->about_prop->label->text);
+- free(impanel->about_prop->label);
+- free(impanel->about_prop->tooltip->text);
+- free(impanel->about_prop->tooltip);
+- free(impanel->about_prop);
++ g_object_unref (impanel->about_prop);
+ impanel->about_prop = NULL;
+
+ g_bus_unown_name (owner_id);
+@@ -584,8 +583,7 @@ ibus_panel_impanel_focus_in (IBusPanelService *panel,
+ // fprintf(stderr, "enable %d %s\n", enable, input_context_path);
+
+ if (enable == 0) {
+- free(IBUS_PANEL_IMPANEL (panel)->logo_prop->icon);
+- IBUS_PANEL_IMPANEL (panel)->logo_prop->icon = strdup("ibus");
++ ibus_property_set_icon (IBUS_PANEL_IMPANEL (panel)->logo_prop, "ibus");
+ }
+ else {
+ IBusEngineDesc *engine_desc = ibus_input_context_get_engine(ic);
+@@ -600,11 +598,10 @@ ibus_panel_impanel_focus_in (IBusPanelService *panel,
+ #endif
+ }
+
+- free(IBUS_PANEL_IMPANEL (panel)->logo_prop->icon);
+ #if !IBUS_CHECK_VERSION(1,3,99)
+- IBUS_PANEL_IMPANEL (panel)->logo_prop->icon = strdup(engine_desc->icon);
++ ibus_property_set_icon (IBUS_PANEL_IMPANEL (panel)->logo_prop, engine_desc->icon);
+ #else
+- IBUS_PANEL_IMPANEL (panel)->logo_prop->icon = strdup(ibus_engine_desc_get_icon(engine_desc));
++ ibus_property_set_icon (IBUS_PANEL_IMPANEL (panel)->logo_prop, ibus_engine_desc_get_icon (engine_desc));
+ #endif
+ }
+
+@@ -654,41 +651,28 @@ ibus_panel_impanel_register_properties (IBusPanelService *panel,
+ {
+ IBusProperty* property = NULL;
+ guint i = 0;
+- char *logo_propstr;
+- char *about_propstr;
+- char *need_free[32] = {NULL};// WARNING enough large I think --- nihui
++ char propstr[512];
+
+ GVariantBuilder builder;
+ g_variant_builder_init (&builder, G_VARIANT_TYPE ("as"));
+
+- logo_propstr = (char*)malloc(512 * sizeof(char));
+- logo_propstr[0] = '\0';
+- ibus_property_to_propstr(IBUS_PANEL_IMPANEL (panel)->logo_prop, logo_propstr);
+- g_variant_builder_add (&builder, "s", logo_propstr);
++ ibus_property_to_propstr(IBUS_PANEL_IMPANEL (panel)->logo_prop, propstr);
++ g_variant_builder_add (&builder, "s", propstr);
+
+ while ( ( property = ibus_prop_list_get( prop_list, i ) ) != NULL ) {
+- need_free[i] = (char*)malloc(512 * sizeof(char));
+- need_free[i][0] = '\0';
+- ibus_property_to_propstr(property, need_free[i]);
+- g_variant_builder_add (&builder, "s", need_free[i]);
++ ibus_property_to_propstr(property, propstr);
++ g_variant_builder_add (&builder, "s", propstr);
+ ++i;
+ }
+
+- about_propstr = (char*)malloc(512 * sizeof(char));
+- about_propstr[0] = '\0';
+- ibus_property_to_propstr(IBUS_PANEL_IMPANEL (panel)->about_prop, about_propstr);
+- g_variant_builder_add (&builder, "s", about_propstr);
++ ibus_property_to_propstr(IBUS_PANEL_IMPANEL (panel)->about_prop, propstr);
++ g_variant_builder_add (&builder, "s", propstr);
+
+ g_dbus_connection_emit_signal (IBUS_PANEL_IMPANEL (panel)->conn,
+ NULL, "/kimpanel", "org.kde.kimpanel.inputmethod", "RegisterProperties",
+ g_variant_new ("(as)", &builder),
+ NULL);
+
+- free(logo_propstr);
+- free(about_propstr);
+- for (i = 0; i < 32; ++i) {
+- free(need_free[i]);
+- }
+ #if !IBUS_CHECK_VERSION(1,3,99)
+ _UNUSED(error);
+ return TRUE;
+@@ -738,7 +722,11 @@ ibus_panel_impanel_update_auxiliary_text (IBusPanelService *panel,
+ gboolean visible)
+ #endif
+ {
+- gchar* t = text->text;
++#if !IBUS_CHECK_VERSION(1,3,99)
++ const gchar* t = text->text;
++#else
++ const gchar* t = ibus_text_get_text (text);
++#endif
+ const gchar *attr = "";
+
+ g_dbus_connection_emit_signal (IBUS_PANEL_IMPANEL (panel)->conn,
+@@ -792,7 +780,7 @@ ibus_panel_impanel_update_lookup_table (IBusPanelService *panel,
+ guint i;
+
+ gchar label[16][4];// WARNING large enough I think --- nihui
+- gchar *candidate;
++ const gchar *candidate;
+
+ GVariantBuilder builder_labels;
+ GVariantBuilder builder_candidates;
+@@ -808,7 +796,11 @@ ibus_panel_impanel_update_lookup_table (IBusPanelService *panel,
+ // label = ibus_lookup_table_get_label(lookup_table, i)->text;
+ g_variant_builder_add (&builder_labels, "s", label[i-start]);
+
+- candidate = ibus_lookup_table_get_candidate(lookup_table, i)->text;
++#if !IBUS_CHECK_VERSION(1,3,99)
++ candidate = ibus_lookup_table_get_candidate (lookup_table, i)->text;
++#else
++ candidate = ibus_text_get_text (ibus_lookup_table_get_candidate (lookup_table, i));
++#endif
+ g_variant_builder_add (&builder_candidates, "s", candidate);
+
+ g_variant_builder_add (&builder_attrs, "s", attr);
+@@ -858,7 +850,11 @@ ibus_panel_impanel_update_preedit_text (IBusPanelService *panel,
+ gboolean visible)
+ #endif
+ {
+- gchar* t = text->text;
++#if !IBUS_CHECK_VERSION(1,3,99)
++ const gchar* t = text->text;
++#else
++ const gchar* t = ibus_text_get_text (text);
++#endif
+ const gchar *attr = "";
+
+ g_dbus_connection_emit_signal (IBUS_PANEL_IMPANEL (panel)->conn,
+@@ -1181,8 +1177,7 @@ ibus_panel_impanel_state_changed (IBusPanelService *panel)
+ gboolean enable = ibus_input_context_is_enabled(IBUS_PANEL_IMPANEL (panel)->input_context);
+
+ if (enable == 0) {
+- free(IBUS_PANEL_IMPANEL (panel)->logo_prop->icon);
+- IBUS_PANEL_IMPANEL (panel)->logo_prop->icon = strdup("ibus");
++ ibus_property_set_icon (IBUS_PANEL_IMPANEL (panel)->logo_prop, "ibus");
+ }
+ else {
+ IBusEngineDesc *engine_desc = ibus_input_context_get_engine(IBUS_PANEL_IMPANEL (panel)->input_context);
+@@ -1194,11 +1189,10 @@ ibus_panel_impanel_state_changed (IBusPanelService *panel)
+ #endif
+ }
+
+- free(IBUS_PANEL_IMPANEL (panel)->logo_prop->icon);
+ #if !IBUS_CHECK_VERSION(1,3,99)
+- IBUS_PANEL_IMPANEL (panel)->logo_prop->icon = strdup(engine_desc->icon);
++ ibus_property_set_icon (IBUS_PANEL_IMPANEL (panel)->logo_prop, engine_desc->icon);
+ #else
+- IBUS_PANEL_IMPANEL (panel)->logo_prop->icon = strdup(ibus_engine_desc_get_icon(engine_desc));
++ ibus_property_set_icon (IBUS_PANEL_IMPANEL (panel)->logo_prop, ibus_engine_desc_get_icon (engine_desc));
+ #endif
+ }
+
+@@ -1239,9 +1233,7 @@ ibus_panel_impanel_exec_dialog (IBusPanelService *panel)
+ static void
+ ibus_panel_impanel_exec_menu (IBusPanelService *panel)
+ {
+- guint i = 0;
+- char *disable_propstr;
+- char *need_free[64] = {NULL};// WARNING enough large I think --- nihui
++ char propstr[512];
+
+ GVariantBuilder builder;
+ g_variant_builder_init (&builder, G_VARIANT_TYPE ("as"));
+@@ -1253,32 +1245,23 @@ ibus_panel_impanel_exec_menu (IBusPanelService *panel)
+ engine_desc = (IBusEngineDesc *)(node->data);
+ node = g_list_next (node);
+
+- need_free[i] = (char*)malloc(512 * sizeof(char));
+- need_free[i][0] = '\0';
+- ibus_engine_desc_to_propstr(engine_desc, need_free[i]);
+- g_variant_builder_add (&builder, "s", need_free[i]);
+- ++i;
++ ibus_engine_desc_to_propstr(engine_desc, propstr);
++ g_variant_builder_add (&builder, "s", propstr);
+ }
+
+- disable_propstr = (char*)malloc(512 * sizeof(char));
+- disable_propstr[0] = '\0';
+ ibus_engine_desc_args_to_propstr("None",
+ NULL,
+ "Disable",
+ "ibus",
+ "",
+- disable_propstr);
++ propstr);
+
+- g_variant_builder_add (&builder, "s", disable_propstr);
++ g_variant_builder_add (&builder, "s", propstr);
+
+ g_dbus_connection_emit_signal (IBUS_PANEL_IMPANEL (panel)->conn,
+ NULL, "/kimpanel", "org.kde.kimpanel.inputmethod", "ExecMenu",
+ g_variant_new ("(as)", &builder),
+ NULL);
+-
+- for (i = 0; i < 64; ++i) {
+- free(need_free[i]);
+- }
+ }
+
+ IBusPanelImpanel *
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.0.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.0.ebuild
index dcab277b2100..e5ee9f5b92f6 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.0.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.0.ebuild,v 1.1 2012/01/25 18:17:16 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.0.ebuild,v 1.2 2012/02/13 18:13:53 johu Exp $
EAPI=4
@@ -39,6 +39,10 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
"
+PATCHES=(
+ "${FILESDIR}/${PN}-4.8.0-ibus141.patch"
+)
+
src_prepare() {
use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonadi.patch"
kde4-base_src_prepare