rpms/ibus/devel ibus-HEAD.patch,1.8,1.9 ibus.spec,1.54,1.55
Huang Peng
phuang at fedoraproject.org
Sat Mar 28 04:23:28 UTC 2009
Author: phuang
Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19129
Modified Files:
ibus-HEAD.patch ibus.spec
Log Message:
Update ibus-HEAD.patch to fix bug 490009, 490381
ibus-HEAD.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.9 ibus-HEAD.patch
Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus-HEAD.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ibus-HEAD.patch 25 Feb 2009 05:59:33 -0000 1.8
+++ ibus-HEAD.patch 28 Mar 2009 04:23:27 -0000 1.9
@@ -1 +1,4922 @@
-
+diff --git a/autogen.sh b/autogen.sh
+index c34acab..addc0bd 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -2,13 +2,13 @@
+ set -e
+ set -x
+
+-autopoint --force
+-libtoolize --automake --copy --force
+-gtkdocize --copy #--flavour=no-tmpl
+-aclocal -I m4 --force
+-autoheader --force
+-automake --add-missing --copy --force
+-autoconf --force
++autopoint --force || exit 1
++libtoolize --automake --copy --force || exit 1
++gtkdocize --copy || exit 1 #--flavour=no-tmpl
++aclocal -I m4 --force || exit 1
++autoheader --force || exit 1
++automake --add-missing --copy --force || exit 1
++autoconf --force || exit 1
+ export CFLAGS="-Wall -g -O0 -Wl,--no-undefined"
+ export CXXFLAGS="$CFLAGS"
+-./configure --enable-maintainer-mode $*
++./configure --enable-maintainer-mode $* || exit 1
+diff --git a/bus/engineproxy.c b/bus/engineproxy.c
+index 647845b..e78fbcf 100644
+--- a/bus/engineproxy.c
++++ b/bus/engineproxy.c
+@@ -541,7 +541,11 @@ bus_engine_proxy_process_key_event_reply_cb (IBusPendingCall *pending,
+
+ reply_message = dbus_pending_call_steal_reply (pending);
+
+- if ((error = ibus_error_new_from_message (reply_message)) != NULL) {
++ if (reply_message == NULL) {
++ call_data->func(FALSE, call_data->user_data);
++ return;
++ }
++ else if ((error = ibus_error_new_from_message (reply_message)) != NULL) {
+ g_warning ("%s: %s", error->name, error->message);
+ ibus_message_unref (reply_message);
+ ibus_error_free (error);
+diff --git a/bus/inputcontext.c b/bus/inputcontext.c
+index 4d66232..723f3af 100644
+--- a/bus/inputcontext.c
++++ b/bus/inputcontext.c
+@@ -1472,7 +1472,7 @@ bus_input_context_update_lookup_table (BusInputContext *context,
+ if (priv->capabilities & IBUS_CAP_LOOKUP_TABLE) {
+ bus_input_context_send_signal (context,
+ "UpdateLookupTable",
+- IBUS_TYPE_TEXT, &(priv->lookup_table),
++ IBUS_TYPE_LOOKUP_TABLE, &(priv->lookup_table),
+ G_TYPE_BOOLEAN, &(priv->lookup_table_visible),
+ G_TYPE_INVALID);
+ }
+diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
+index 29e7753..4483696 100644
+--- a/client/gtk2/ibusimcontext.c
++++ b/client/gtk2/ibusimcontext.c
+@@ -569,7 +569,6 @@ _ibus_context_commit_text_cb (IBusInputContext *ibus_context,
+ static void
+ _ibus_context_forward_key_event_cb (IBusInputContext *ibus_context,
+ guint keyval,
+- gboolean is_press,
+ guint state,
+ IBusIMContext *context)
+ {
+@@ -579,7 +578,7 @@ _ibus_context_forward_key_event_cb (IBusInputContext *ibus_context,
+ IBusIMContextPrivate *priv;
+
+ priv = context->priv;
+- event = (GdkEventKey *)gdk_event_new (is_press ? GDK_KEY_PRESS : GDK_KEY_RELEASE);
++ event = (GdkEventKey *)gdk_event_new (state & IBUS_RELEASE_MASK ? GDK_KEY_RELEASE : GDK_KEY_PRESS);
+
+ event->time = GDK_CURRENT_TIME;
+ event->window = g_object_ref (priv->client_window);
+diff --git a/configure.ac b/configure.ac
+index 2b6f0d8..263b83f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -49,6 +49,13 @@ AC_ISC_POSIX
+ AC_HEADER_STDC
+ AM_PROG_LIBTOOL
+
++# For dislpay Date
++m4_define(ibus_maybe_datedisplay,
++ m4_esyscmd([if test x]ibus_released[ != x1; then date '+%a %b %d %Y' | tr -d '\n\r'; fi]))
++m4_define([ibus_datedisplay], ibus_maybe_datedisplay)
++DATE_DISPLAY="ibus_datedisplay"
++AC_SUBST(DATE_DISPLAY)
++
+ # If only source code changed, lt_revision + 1
+ # If any interface added, lt_age + 1
+ # If any interfaces changed or removed, lt_current + 1
+diff --git a/docs/reference/ibus/Makefile.am b/docs/reference/ibus/Makefile.am
+index c1991f1..310bdef 100644
+--- a/docs/reference/ibus/Makefile.am
++++ b/docs/reference/ibus/Makefile.am
+@@ -25,7 +25,8 @@ SCANGOBJ_OPTIONS=
+
+ # Extra options to supply to gtkdoc-scan.
+ # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
+-SCAN_OPTIONS=--rebuild-sections
++# SCAN_OPTIONS=--rebuild-sections
++SCAN_OPTIONS=
+
+ # Extra options to supply to gtkdoc-mkdb.
+ # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
+@@ -42,7 +43,7 @@ FIXXREF_OPTIONS=
+ # Used for dependencies. The docs will be rebuilt if any of these change.
+ # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
+ # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
+-HFILE_GLOB=
++HFILE_GLOB=$(top_srcdir)/src/*.h
+ CFILE_GLOB=
+
+ # Header files to ignore when scanning.
+@@ -97,4 +98,10 @@ EXTRA_DIST +=
+
+ # Comment this out if you want your docs-status tested during 'make check'
+ #TESTS = $(GTKDOC_CHECK)
+-# CLEANFILES += ibus*
++
++clean-local:
++ rm -rf tmpl
++
++CLEANFILES+= *.stamp
++
++
+diff --git a/docs/reference/ibus/ibus-docs.sgml b/docs/reference/ibus/ibus-docs.sgml
+index 35d0bea..043890c 100644
+--- a/docs/reference/ibus/ibus-docs.sgml
++++ b/docs/reference/ibus/ibus-docs.sgml
+@@ -3,46 +3,76 @@
+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+ <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
+ <bookinfo>
+- <title>IBus Reference Manual</title>
++ <title>iBus Reference Manual</title>
+ <releaseinfo>
+- for ibus 1.1.0
++ iBus 1.1.0 reference manual.
+ The latest version of this documentation can be found on-line at
+ <ulink role="online-location" url="http://code.google.com/p/ibus">http://code.google.com/p/ibus</ulink>.
+ </releaseinfo>
+ </bookinfo>
+
+ <chapter>
+- <title>API Reference</title>
+- <xi:include href="xml/ibusfactory.xml"/>
+- <xi:include href="xml/ibusattribute.xml"/>
+- <xi:include href="xml/ibusinputcontext.xml"/>
+- <xi:include href="xml/ibusobservedpath.xml"/>
+- <xi:include href="xml/ibusengine.xml"/>
+- <xi:include href="xml/ibusservice.xml"/>
+- <xi:include href="xml/ibuslookuptable.xml"/>
+- <xi:include href="xml/ibusproxy.xml"/>
+- <xi:include href="xml/ibusserver.xml"/>
+- <xi:include href="xml/ibuscomponent.xml"/>
+- <xi:include href="xml/ibusconnection.xml"/>
+- <xi:include href="xml/ibusproperty.xml"/>
+- <xi:include href="xml/ibustext.xml"/>
+- <xi:include href="xml/ibusserializable.xml"/>
+- <xi:include href="xml/ibushotkey.xml"/>
+- <xi:include href="xml/ibusbus.xml"/>
+- <xi:include href="xml/ibusenginedesc.xml"/>
+- <xi:include href="xml/ibusobject.xml"/>
+- <xi:include href="xml/ibusconfig.xml"/>
+- <xi:include href="xml/ibusmessage.xml"/>
+- <xi:include href="xml/ibusdebug.xml"/>
+- <xi:include href="xml/ibusmarshalers.xml"/>
+- <xi:include href="xml/keyname-table.xml"/>
+- <xi:include href="xml/ibustypes.xml"/>
+- <xi:include href="xml/ibuserror.xml"/>
+- <xi:include href="xml/ibuspendingcall.xml"/>
+- <xi:include href="xml/ibuskeysyms.xml"/>
+- <xi:include href="xml/ibusenumtypes.xml"/>
+- <xi:include href="xml/ibusxml.xml"/>
+- <xi:include href="xml/ibusshare.xml"/>
+- <xi:include href="xml/ibusinternal.xml"/>
++ <title>API Overviews</title>
++ <para>The iBus API consists 3 parts:
++ <emphasis>User interfaces</emphasis> for objects and services which
++ are relateed to iBus UI such as language bar;
++ <emphasis>Input method engine</emphasis> for input method main logic and input/output handling;
++ <emphasis>Configure</emphasis> for services for save, load and listening configures.
++ </para>
++ </chapter>
++ <chapter>
[...4532 lines suppressed...]
+ };
+
+ GType ibus_text_get_type (void);
++
++/**
++ * ibus_text_new_from_string:
++ * @str: An text string to be set.
++ * @returns: A newly allocated IBusText.
++ *
++ * New an IBusText whose content is copied from a text string.
++ */
+ IBusText *ibus_text_new_from_string (const gchar *str);
++
++/**
++ * ibus_text_new_from_ucs4:
++ * @str: An text string to be set.
++ * @returns: A newly allocated IBusText.
++ *
++ * New an IBusText whose content is copied from a UCS4 encoded text string.
++ */
+ IBusText *ibus_text_new_from_ucs4 (const gunichar *str);
++
++/**
++ * ibus_text_new_from_static_string:
++ * @str: An text string to be set.
++ * @returns: A newly allocated IBusText.
++ *
++ * New an IBusText whose content is from a static string.
++ * Note that it is the developer's duty to ensure @str is static.
++ */
+ IBusText *ibus_text_new_from_static_string (const gchar *str);
++
++/**
++ * ibus_text_new_from_printf:
++ * @fmt: printf format string.
++ * @...: arguments for @fmt.
++ * @returns: A newly allocated IBusText.
++ *
++ * New an IBusText from a printf expression.
++ */
+ IBusText *ibus_text_new_from_printf (const gchar *fmt,
+ ...);
++
++/**
++ * ibus_text_new_from_unichar:
++ * @c: A single UCS4-encoded character.
++ * @returns: A newly allocated IBusText.
++ *
++ * New an IBusText from a single UCS4-encoded character.
++ */
+ IBusText *ibus_text_new_from_unichar (gunichar c);
++
++/**
++ * ibus_text_append_attribute:
++ * @text: an IBusText
++ * @type: IBusAttributeType for @text.
++ * @value: Value for the type.
++ * @start_index: The starting index, inclusive.
++ * @end_index: The ending index, exclusive.
++ *
++ * Append an IBusAttribute for IBusText.
++ */
+ void ibus_text_append_attribute (IBusText *text,
+ guint type,
+ guint value,
+ guint start_index,
+ gint end_index);
++/**
++ * ibus_text_get_length:
++ * @text: An IBusText.
++ * @returns: Number of character in @text, not counted by bytes.
++ *
++ * Return number of characters in an IBusText.
++ * This function is based on g_utf8_strlen(), so unlike strlen(),
++ * it does not count by bytes but characters instead.
++ */
+ guint ibus_text_get_length (IBusText *text);
+
+ G_END_DECLS
+diff --git a/src/ibustypes.h b/src/ibustypes.h
+index a977db4..b2ea627 100644
+--- a/src/ibustypes.h
++++ b/src/ibustypes.h
+@@ -17,9 +17,41 @@
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
++/**
++ * SECTION: ibustypes
++ * @short_description: Generic types for iBus.
++ * @stability: Stable
++ *
++ * This session consists generic types for iBus, including shift/control key modifiers,
++ * and a rectangle structure.
++ */
+ #ifndef __IBUS_TYPES_H_
+ #define __IBUS_TYPES_H_
+
++/**
++ * IBusModifierType:
++ * @IBUS_SHIFT_MASK: Shift is activated.
++ * @IBUS_LOCK_MASK: Cap Lock is locked.
++ * @IBUS_CONTROL_MASK: Control key is activated.
++ * @IBUS_MOD1_MASK: Modifier 1 (Usually Alt_L (0x40), Alt_R (0x6c), Meta_L (0xcd)) activated.
++ * @IBUS_MOD2_MASK: Modifier 2 (Usually Num_Lock (0x4d)) activated.
++ * @IBUS_MOD3_MASK: Modifier 3 activated.
++ * @IBUS_MOD4_MASK: Modifier 4 (Usually Super_L (0xce), Hyper_L (0xcf)) activated.
++ * @IBUS_MOD5_MASK: Modifier 5 (ISO_Level3_Shift (0x5c), Mode_switch (0xcb)) activated.
++ * @IBUS_BUTTON1_MASK: Mouse button 1 (left) is activated.
++ * @IBUS_BUTTON2_MASK: Mouse button 2 (middle) is activated.
++ * @IBUS_BUTTON3_MASK: Mouse button 3 (right) is activated.
++ * @IBUS_BUTTON4_MASK: Mouse button 4 (scroll up) is activated.
++ * @IBUS_BUTTON5_MASK: Mouse button 5 (scroll down) is activated.
++ * @IBUS_FORWARD_MASK: Forward mask.
++ * @IBUS_SUPER_MASK: Super (Usually Win) key is activated.
++ * @IBUS_HYPER_MASK: Hyper key is activated.
++ * @IBUS_RELEASE_MASK: Key is released.
++ * @IBUS_MODIFIER_MASK: Modifier mask for the all the masks above.
++ *
++ * Handles key modifier such as control, shift and alt and release event.
++ * Note that nits 15 - 25 are currently unused, while bit 29 is used internally.
++ */
+ typedef enum
+ {
+ IBUS_SHIFT_MASK = 1 << 0,
+@@ -40,7 +72,7 @@ typedef enum
+ * Bits 15 - 25 are currently unused. Bit 29 is used internally.
+ */
+
+- /* forard mask */
++ /* forward mask */
+ IBUS_FORWARD_MASK = 1 << 25,
+
+ IBUS_SUPER_MASK = 1 << 26,
+@@ -52,6 +84,16 @@ typedef enum
+ IBUS_MODIFIER_MASK = 0x5c001fff
+ } IBusModifierType;
+
++/**
++ * IBusCapabilite:
++ * @IBUS_CAP_PREEDIT_TEXT: UI is capable to show pre-edit text.
++ * @IBUS_CAP_AUXILIARY_TEXT: UI is capable to show auxiliary text.
++ * @IBUS_CAP_LOOKUP_TABLE: UI is capable to show the lookup table.
++ * @IBUS_CAP_FOCUS: UI is capable to get focus.
++ * @IBUS_CAP_PROPERTY: UI is capable to have property.
++ *
++ * Capability flags of UI.
++ */
+ typedef enum {
+ IBUS_CAP_PREEDIT_TEXT = 1 << 0,
+ IBUS_CAP_AUXILIARY_TEXT = 1 << 1,
+@@ -60,6 +102,15 @@ typedef enum {
+ IBUS_CAP_PROPERTY = 1 << 4,
+ } IBusCapabilite;
+
++/**
++ * IBusRectangle:
++ * @x: x coordinate.
++ * @y: y coordinate.
++ * @width: width of the rectangle.
++ * @height: height of the renctangl.
++ *
++ * Rectangle definition.
++ */
+ typedef struct _IBusRectangle IBusRectangle;
+ struct _IBusRectangle {
+ gint x;
+@@ -68,7 +119,13 @@ struct _IBusRectangle {
+ gint height;
+ };
+
+-typedef void (* IBusFreeFunc) (gpointer );
++/**
++ * IBusFreeFunc:
++ * @object: object to be freed.
++ *
++ * Free function prototype.
++ */
++typedef void (* IBusFreeFunc) (gpointer object);
+
+ #endif
+
+diff --git a/ui/gtk/candidatepanel.py b/ui/gtk/candidatepanel.py
+index db02163..05c4e71 100644
+--- a/ui/gtk/candidatepanel.py
++++ b/ui/gtk/candidatepanel.py
+@@ -238,11 +238,11 @@ class CandidatePanel(gtk.VBox):
+ else:
+ # package all widgets in HORIZONTAL mode
+ image = gtk.Image()
+- image.set_from_stock(gtk.STOCK_GO_BACK, gtk.ICON_SIZE_MENU)
++ image.set_from_stock(gtk.STOCK_GO_UP, gtk.ICON_SIZE_MENU)
+ self.__prev_button.set_image(image)
+
+ image = gtk.Image()
+- image.set_from_stock(gtk.STOCK_GO_FORWARD, gtk.ICON_SIZE_MENU)
++ image.set_from_stock(gtk.STOCK_GO_DOWN, gtk.ICON_SIZE_MENU)
+ self.__next_button.set_image(image)
+
+ vbox = gtk.VBox()
Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ibus.spec 11 Mar 2009 06:48:42 -0000 1.54
+++ ibus.spec 28 Mar 2009 04:23:27 -0000 1.55
@@ -8,7 +8,7 @@
Name: ibus
Version: 1.1.0.20090311
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+
Group: System Environment/Libraries
@@ -20,6 +20,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: cvs
BuildRequires: gettext-devel
BuildRequires: libtool
BuildRequires: python
@@ -103,7 +104,9 @@
%prep
%setup -q
-# %patch0 -p1
+rm -rf docs/reference/ibus/ibus-sections.txt
+%patch0 -p1
+./autogen.sh --help
%build
%configure --disable-static \
@@ -214,6 +217,11 @@
%{_libdir}/pkgconfig/*
%changelog
+* Sat Mar 28 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090311-2
+- Recreate the ibus-HEAD.patch from upstream git source tree.
+- Fixe bug 490009 - Deleting Next Engine shortcuts doesn't work
+- Fixe bug 490381 - Change "Next/Previous engine" labels
+
* Wed Mar 11 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090311-1
- Update to ibus-1.1.0.20090311.
- Update setup ui follow GNOME Human Interface Guidelines 2.2 (#489497).
More information about the fedora-extras-commits
mailing list