From 496f41d1f8ba523f88a377e245a5144247e1c3d593cae5dbf56ef24e4303f3e3 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 19 Nov 2010 10:07:45 +0000 Subject: [PATCH] Accepting request 53307 from home:Mingxi_Wu:branches:M17N you're the maintainer - it's unusual to do submit requests for your own packages and not accept them right away OBS-URL: https://build.opensuse.org/request/show/53307 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=10 --- ibus-1.3.6.tar.gz | 3 --- ibus-1.3.8.tar.gz | 3 +++ ibus-disable-introspect.patch | 18 +++++++++--------- ibus.changes | 22 ++++++++++++++++++++++ ibus.spec | 6 +++--- 5 files changed, 37 insertions(+), 15 deletions(-) delete mode 100644 ibus-1.3.6.tar.gz create mode 100644 ibus-1.3.8.tar.gz diff --git a/ibus-1.3.6.tar.gz b/ibus-1.3.6.tar.gz deleted file mode 100644 index 40896e1..0000000 --- a/ibus-1.3.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:860d834dedf6a70a7872b4849469a3b43667b57c2691fdc02570f5e3acb1b042 -size 1343753 diff --git a/ibus-1.3.8.tar.gz b/ibus-1.3.8.tar.gz new file mode 100644 index 0000000..fdeb637 --- /dev/null +++ b/ibus-1.3.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8507517f5e5ba454b2663581b1133df21fdba74a077902259e18845cdd2468d +size 1379038 diff --git a/ibus-disable-introspect.patch b/ibus-disable-introspect.patch index 5018d31..fd6eca3 100644 --- a/ibus-disable-introspect.patch +++ b/ibus-disable-introspect.patch @@ -1,7 +1,7 @@ -diff --git a/configure.ac b/configure.ac -index ea35a7c..53065fc 100644 ---- a/configure.ac -+++ b/configure.ac +Index: ibus-1.3.8/configure.ac +=================================================================== +--- ibus-1.3.8.orig/configure.ac ++++ ibus-1.3.8/configure.ac @@ -169,7 +169,20 @@ else fi @@ -22,14 +22,14 @@ index ea35a7c..53065fc 100644 + AM_CONDITIONAL([HAVE_INTROSPECTION], [false]) +fi - # check for gtk-doc - GTK_DOC_CHECK(1.9) -@@ -374,7 +387,7 @@ Build options: - Build XIM agent server $enable_xim + IBUS_GIR_SCANNERFLAGS= + if test x"$found_introspection" = x"yes" ; then +@@ -397,7 +410,7 @@ Build options: Build python modules $enable_python Build gconf modules $enable_gconf + Build memconf modules $enable_memconf - Build introspection $found_introspection + Build introspection $enable_gobject_introspection + IBus-1.0.gir scannerflags "$IBUS_GIR_SCANNERFLAGS" Build vala binding $enable_vala Build document $enable_gtk_doc - Enable key snooper $enable_key_snooper diff --git a/ibus.changes b/ibus.changes index ff34444..96733d5 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Nov 17 08:44:04 UTC 2010 - mxwu@novell.com + +- Upgrade to ibus 1.3.8: + * Fix CPU 100% usage with signal.SIGCHLD + * Destroy existing connection before creating a new + connection, and only create the fake context once. + * Move the candidate window just above the cursor + when the window and a preedit string overlap. + * Enable key snooper by default again + * Always consume the hotkey, even if the hotkey + associated engine already activated. + * Fix race condition in bus_ibus_impl_create_engine() + * Fix a build error of IBus-1.0.gir with gobject-introspection 0.9.6 + * Implement stress tool for ibus. + * Fix a build error with GTK3 gdkkeysyms.h + * Add time info in log message from satorux@chromium.org + * Fix memory leak in ibus_input_context_process_key_event by Fujiwarat + * Fix segv in bus_engine_proxy_process_key_event_reply_cb + * Fix property issue. + * Updated many translations. + ------------------------------------------------------------------- Tue Jul 13 07:44:40 UTC 2010 - mxwu@novell.com diff --git a/ibus.spec b/ibus.spec index 06d71c1..521de6b 100644 --- a/ibus.spec +++ b/ibus.spec @@ -1,5 +1,5 @@ # -# spec file for package ibus (Version 1.3.6) +# spec file for package ibus (Version 1.2.0.20100111) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: ibus -Version: 1.3.6 +Version: 1.3.8 Release: 1 License: LGPL V2+ Url: http://code.google.com/p/ibus/ @@ -39,7 +39,7 @@ PreReq: /usr/bin/touch BuildRequires: gettext-devel gtk-doc libtool python BuildRequires: dbus-1-devel dbus-1-glib-devel dbus-1-python-devel gtk2-devel BuildRequires: gconf2-devel python-gobject2-devel update-desktop-files -BuildRequires: fdupes gobject-introspection-devel intltool iso-codes-devel +BuildRequires: fdupes intltool iso-codes-devel gobject-introspection-devel %if %suse_version >= 1100 BuildRequires: pcre-devel %endif