diff -Nru ibus-qt-1.3.2/CMakeLists.txt ibus-qt-1.3.3/CMakeLists.txt --- ibus-qt-1.3.2/CMakeLists.txt 2013-03-11 06:54:25.000000000 +0000 +++ ibus-qt-1.3.3/CMakeLists.txt 2014-04-22 09:11:18.000000000 +0000 @@ -11,7 +11,7 @@ set(MAINTAINER "Peng Huang ") set(VERSION_MAJOR "1") set(VERSION_MINOR "3") -set(VERSION_PATCH "2") +set(VERSION_PATCH "3") set(VERSION_SNAPDATE "") set(LIB_VERSION "1.3.0") set(LIB_SOVERSION "1") @@ -89,25 +89,10 @@ endif() endif(NOT LIBDIR) -if(NOT DOCDIR) - set(DOCDIR "share/doc/ibus-qt-${CPACK_PACKAGE_VERSION}") -endif(NOT DOCDIR) - if(NOT MANDIR) set(MANDIR "share/man") endif(NOT MANDIR) -# ===== -# install -set(MAIN_DOCS - AUTHORS - README - INSTALL) -install(FILES ${MAIN_DOCS} - DESTINATION ${DOCDIR}) - - - # ====== # sub dirs add_subdirectory(src) diff -Nru ibus-qt-1.3.2/debian/changelog ibus-qt-1.3.3/debian/changelog --- ibus-qt-1.3.2/debian/changelog 2015-08-05 16:40:14.000000000 +0000 +++ ibus-qt-1.3.3/debian/changelog 2020-10-09 01:01:55.000000000 +0000 @@ -1,13 +1,58 @@ -ibus-qt (1.3.2-2build1) wily; urgency=medium +ibus-qt (1.3.3-4~16.04.sav0) xenial; urgency=medium - * No-change rebuild against new libicu + * Backport to Xenial + * debian/compat: Set compat level to 10 (Launchpad sbuild highest for Xenial) + * Due FTBFS with GCC 5.4.0 (various errors) build with GCC 7.5.0 instead: + - debian/control: Add g++ (>= 4:7.5.0-1~) BD (ppa:savoury1/gcc-defaults-7) - -- Iain Lane Wed, 05 Aug 2015 17:40:14 +0100 + -- Rob Savoury Thu, 08 Oct 2020 18:01:55 -0700 + +ibus-qt (1.3.3-4) unstable; urgency=medium + + * Team upload. + * Rebuild for Debian Buster. + * debian/patches: Add a patch to use pkg-config to detect icu. + (Closes: #915389) + + -- Boyuan Yang Mon, 03 Dec 2018 13:17:12 -0500 + +ibus-qt (1.3.3-3) unstable; urgency=medium + + * Team upload. + * Mark ibus-qt4, libibus-qt-dev and libibus-qt1 as Multi-Arch: same. + (LP: #1077490) + + -- Boyuan Yang Mon, 22 Oct 2018 22:31:50 -0400 + +ibus-qt (1.3.3-2) unstable; urgency=medium + + * Team upload. + * Rebuild against gcc 8.2. + * Modernize packaging: + + Update maintainer and use Debian Input Method Team. + (Closes: #899546). + + Bump debhelper compat to v11. + + Bump Standards-Version to 4.2.1. + + Apply "wrap-and-sort -abst". + + Use "dh_missing --fail-missing" in debian/rules. + * debian/patches: Cherry-pick an upstream patch to fix uninitialized + variable in src/qibusserializable.cpp. + + -- Boyuan Yang Mon, 22 Oct 2018 11:11:58 -0400 + +ibus-qt (1.3.3-1) unstable; urgency=medium + + * New upstream release. + * Update uploaders. Closes: #841802 + * Update upstream URL. + * Set hardening=+all. + + -- Osamu Aoki Sat, 10 Dec 2016 11:42:32 +0900 ibus-qt (1.3.2-2) unstable; urgency=medium * Remove recommends: qt4-qtconfig. Closes: #611190 - * Quiet Qt via DEB_CFLAGS_MAINT_APPEND. Closes: #738136 + * Quiet Qt via DEB_CFLAGS_MAINT_APPEND. Closes: #738136 -- Osamu Aoki Sat, 01 Feb 2014 02:35:34 +0900 @@ -25,7 +70,7 @@ ibus-qt (1.3.1-4) unstable; urgency=low * Team upload. - * M-A enabled. Closes: #704812 + * M-A enabled. Closes: #704812 -- Osamu Aoki Thu, 12 Sep 2013 22:08:02 +0900 @@ -62,15 +107,15 @@ [ Asias He ] * New upstream release. * debian/control: - - set maintainer to pkg-ime, add LI Daobing + - set maintainer to pkg-ime, add LI Daobing & Asias He to uploaders. - update Vcs-* fields. - bump standards version to 3.9.1. * removed debian/patches/binutils-gold. - * debian/watch: moved to googlecode.debian.net + * debian/watch: moved to googlecode.debian.net [ LI Daobing ] - * debian/watch: updated. + * debian/watch: updated. -- LI Daobing Sat, 21 Aug 2010 22:42:36 +0800 @@ -103,13 +148,13 @@ ibus-qt (1.2.0.20091014-1) unstable; urgency=low * new upstream release. - * debian/rules: updated. + * debian/rules: updated. -- LI Daobing Wed, 14 Oct 2009 18:48:52 +0800 ibus-qt (1.2.0.20090822-2) unstable; urgency=low - * split ibus-qt to libibus-qt, libibus-qt-dev, ibus-qt4 + * split ibus-qt to libibus-qt, libibus-qt-dev, ibus-qt4 -- Asias He Fri, 28 Aug 2009 16:21:31 +0800 @@ -117,10 +162,10 @@ * new upstream release. - Fix "Composite key stops working" (Closes: #541784) - * debian/control: - - bump standards version to 3.8.3. + * debian/control: + - bump standards version to 3.8.3. - add libicu-dev, libibus-dev to build-depends. - - change version of debhelper from 7.0.50 to 7 + - change version of debhelper from 7.0.50 to 7 * debian/rules: - use debhelper 7. diff -Nru ibus-qt-1.3.2/debian/compat ibus-qt-1.3.3/debian/compat --- ibus-qt-1.3.2/debian/compat 2014-01-26 15:19:19.000000000 +0000 +++ ibus-qt-1.3.3/debian/compat 2020-10-09 01:01:55.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru ibus-qt-1.3.2/debian/control ibus-qt-1.3.3/debian/control --- ibus-qt-1.3.2/debian/control 2014-02-08 06:56:44.000000000 +0000 +++ ibus-qt-1.3.3/debian/control 2020-10-09 01:01:55.000000000 +0000 @@ -1,27 +1,31 @@ Source: ibus-qt Section: utils Priority: optional -Maintainer: IME Packaging Team -Uploaders: LI Daobing , - Asias He , - Osamu Aoki -Build-Depends: cmake, - debhelper (>= 9.0.0), - doxygen, - libdbus-1-dev, - libibus-1.0-dev, - libicu-dev, - libqt4-dev (>= 4:4.8.0~), - libx11-dev, - pkg-config -Standards-Version: 3.9.5 -Homepage: http://code.google.com/p/ibus -Vcs-Git: git://anonscm.debian.org/pkg-ime/ibus-qt.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ime/ibus-qt.git +Maintainer: Debian Input Method Team +Uploaders: + Osamu Aoki , +Build-Depends: + cmake, + debhelper (>= 11), + doxygen, + g++ (>= 4:7.5.0-1~), + libdbus-1-dev, + libibus-1.0-dev, + libicu-dev, + libqt4-dev (>= 4:4.8.0~), + libx11-dev, + pkg-config, +Standards-Version: 4.2.1 +Homepage: https://github.com/ibus/ibus-qt +Vcs-Git: https://salsa.debian.org/input-method-team/ibus-qt.git +Vcs-Browser: https://salsa.debian.org/input-method-team/ibus-qt Package: ibus-qt4 Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} +Multi-Arch: same +Depends: + ${misc:Depends}, + ${shlibs:Depends}, Description: qt-immodule for ibus (QT4) (plugin) IBus is an Intelligent Input Bus. It is a new input framework for Linux OS. It provides full featured and user friendly input method user interface. @@ -29,30 +33,35 @@ . ibus-qt4 is the QT4 client of ibus, it provide a qt-immodule for ibus. -Package: libibus-qt1 -Section: libs +Package: libibus-qt-dev +Section: libdevel Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: qt-immodule for ibus (QT4) (library) +Multi-Arch: same +Depends: + libdbus-1-dev, + libibus-1.0-dev, + libibus-qt1 (= ${binary:Version}), + libqt4-dev, + ${misc:Depends}, + ${shlibs:Depends}, +Description: qt-immodule for ibus (QT4) (development package) IBus is an Intelligent Input Bus. It is a new input framework for Linux OS. It provides full featured and user friendly input method user interface. It also may help developers to develop input method easily. . - libibus-qt1 is the library of ibus-qt. + This package contains the header files which is needed for + developing the ibus-qt applications. -Package: libibus-qt-dev -Section: libdevel +Package: libibus-qt1 +Section: libs Architecture: any -Depends: libdbus-1-dev, - libibus-1.0-dev, - libibus-qt1 (= ${binary:Version}), - libqt4-dev, - ${misc:Depends}, - ${shlibs:Depends} -Description: qt-immodule for ibus (QT4) (development package) +Multi-Arch: same +Depends: + ${misc:Depends}, + ${shlibs:Depends}, +Description: qt-immodule for ibus (QT4) (library) IBus is an Intelligent Input Bus. It is a new input framework for Linux OS. It provides full featured and user friendly input method user interface. It also may help developers to develop input method easily. . - This package contains the header files which is needed for - developing the ibus-qt applications. + libibus-qt1 is the library of ibus-qt. diff -Nru ibus-qt-1.3.2/debian/copyright ibus-qt-1.3.3/debian/copyright --- ibus-qt-1.3.2/debian/copyright 2014-01-26 15:23:12.000000000 +0000 +++ ibus-qt-1.3.3/debian/copyright 2018-12-03 18:14:27.000000000 +0000 @@ -4,7 +4,7 @@ It was downloaded from: - http://code.google.com/p/ibus + https://github.com/ibus/ibus/wiki Upstream Author: diff -Nru ibus-qt-1.3.2/debian/patches/0001-Fix-typo.patch ibus-qt-1.3.3/debian/patches/0001-Fix-typo.patch --- ibus-qt-1.3.2/debian/patches/0001-Fix-typo.patch 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/debian/patches/0001-Fix-typo.patch 2018-12-03 18:16:37.000000000 +0000 @@ -0,0 +1,21 @@ +From: Osamu Aoki +Date: Sat, 10 Dec 2016 11:28:17 +0900 +Subject: [PATCH] Fix typo + +--- + qtim/ibus-input-context.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qtim/ibus-input-context.cpp b/qtim/ibus-input-context.cpp +index e898443..b749e22 100644 +--- a/qtim/ibus-input-context.cpp ++++ b/qtim/ibus-input-context.cpp +@@ -744,7 +744,7 @@ IBusInputContext::displayPreeditText (const TextPointer &text, uint cursor_pos, + break; + default: + qWarning () << "IBusInputContext::displayPreeditText:" +- << "unknow Attribute type" << attr->type (); ++ << "unknown Attribute type" << attr->type (); + continue; + } + diff -Nru ibus-qt-1.3.2/debian/patches/0002-Fix-uninitialized-variable-in-src-qibusserializable..patch ibus-qt-1.3.3/debian/patches/0002-Fix-uninitialized-variable-in-src-qibusserializable..patch --- ibus-qt-1.3.2/debian/patches/0002-Fix-uninitialized-variable-in-src-qibusserializable..patch 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/debian/patches/0002-Fix-uninitialized-variable-in-src-qibusserializable..patch 2018-12-03 18:16:59.000000000 +0000 @@ -0,0 +1,25 @@ +From: fujiwarat +Date: Thu, 1 May 2014 15:14:23 +0900 +Subject: Fix uninitialized variable in src/qibusserializable.cpp +Applied-Upstream: https://github.com/ibus/ibus-qt/commit/dc8f7cb79302743a11915067bc13580655f92d12 + +BUG=http://code.google.com/p/ibus/issues/detail?id=1706 + +Review URL: https://codereview.appspot.com/99920043 +--- + src/qibusserializable.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/qibusserializable.cpp b/src/qibusserializable.cpp +index 4b5566e..6828518 100644 +--- a/src/qibusserializable.cpp ++++ b/src/qibusserializable.cpp +@@ -25,7 +25,7 @@ Serializable::getAttachment (const QString &key) const + SerializablePointer + Serializable::removeAttachment (const QString &key) + { +- SerializablePointer p = m_attachments.value (key, p); ++ SerializablePointer p = m_attachments.value (key); + if (p) + m_attachments.remove (key); + return p; diff -Nru ibus-qt-1.3.2/debian/patches/0003-Use-pkg-config-to-detect-icu.patch ibus-qt-1.3.3/debian/patches/0003-Use-pkg-config-to-detect-icu.patch --- ibus-qt-1.3.2/debian/patches/0003-Use-pkg-config-to-detect-icu.patch 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/debian/patches/0003-Use-pkg-config-to-detect-icu.patch 2018-12-03 18:17:08.000000000 +0000 @@ -0,0 +1,23 @@ +From: Hugh McMaster +Date: Mon, 3 Dec 2018 12:47:39 +0000 +Subject: Use pkg-config to detect icu +Last-Update: 2018-12-03 + +icu-config is deprecated and will be removed, causing ibus-qt to FTBFS. +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eab31ab..9f0d599 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -72,7 +72,7 @@ include(${QT_USE_FILE}) + + # check dbus + find_package(PkgConfig REQUIRED) +-find_package(ICU REQUIRED) ++pkg_check_modules(ICU REQUIRED icu-uc icu-i18n) + pkg_check_modules(DBUS REQUIRED dbus-1) + pkg_check_modules(IBUS REQUIRED ibus-1.0>=1.3.7) + diff -Nru ibus-qt-1.3.2/debian/patches/series ibus-qt-1.3.3/debian/patches/series --- ibus-qt-1.3.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/debian/patches/series 2018-12-03 18:16:37.000000000 +0000 @@ -0,0 +1,3 @@ +0001-Fix-typo.patch +0002-Fix-uninitialized-variable-in-src-qibusserializable..patch +0003-Use-pkg-config-to-detect-icu.patch diff -Nru ibus-qt-1.3.2/debian/rules ibus-qt-1.3.3/debian/rules --- ibus-qt-1.3.2/debian/rules 2014-02-08 06:57:11.000000000 +0000 +++ ibus-qt-1.3.3/debian/rules 2018-12-03 18:14:27.000000000 +0000 @@ -1,23 +1,24 @@ #!/usr/bin/make -f #DH_VERBOSE = 1 # see FEATURE AREAS in dpkg-buildflags(1) -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_BUILD_MAINT_OPTIONS = hardening=+all # see ENVIRONMENT in dpkg-buildflags(1) # package maintainers to append CFLAGS export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT # package maintainers to append LDFLAGS export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +include /usr/share/dpkg/architecture.mk %: dh $@ override_dh_auto_configure: dh_auto_configure -- \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) + -DLIBDIR=lib/$(DEB_HOST_MULTIARCH) override_dh_makeshlibs: dh_makeshlibs -Nibus-qt4 +override_dh_missing: + dh_missing --fail-missing diff -Nru ibus-qt-1.3.2/debian/watch ibus-qt-1.3.3/debian/watch --- ibus-qt-1.3.2/debian/watch 2014-01-26 15:19:19.000000000 +0000 +++ ibus-qt-1.3.3/debian/watch 2018-12-03 18:14:27.000000000 +0000 @@ -1,7 +1,8 @@ version=3 opts=uversionmangle=s/-Source$// \ -http://code.google.com/p/ibus/downloads/list \ +https://github.com/ibus/ibus-qt/releases \ .*/ibus-qt(?:-|_|_v|V)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) - -# +################################################################## +# https://github.com/ibus/ibus-qt/releases +# diff -Nru ibus-qt-1.3.2/qtim/ibus-input-context.cpp ibus-qt-1.3.3/qtim/ibus-input-context.cpp --- ibus-qt-1.3.2/qtim/ibus-input-context.cpp 2013-03-11 06:54:25.000000000 +0000 +++ ibus-qt-1.3.3/qtim/ibus-input-context.cpp 2014-04-22 09:11:18.000000000 +0000 @@ -2,7 +2,7 @@ /* * ibus - The Input Bus * - * Copyright (c) 2007-2008 Huang Peng + * Copyright (c) 2007-2014 Huang Peng * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -89,8 +89,9 @@ m_preedit_cursor_pos (0), m_has_focus (false), m_password_mode (false), - m_caps (CapPreeditText | CapFocus), - m_n_compose (0) + m_caps (CapPreeditText | CapFocus | CapSurroundingText), + m_n_compose (0), + m_needs_surrounding_text (false) { Q_ASSERT (!m_bus.isNull ()); @@ -164,7 +165,33 @@ QPoint topleft = widget->mapToGlobal(QPoint(0,0)); rect.translate (topleft); - m_context->setCursorLocation (rect.x (), rect.y (), rect.width (), rect.height ()); + m_context->setCursorLocation (rect.x (), + rect.y (), + rect.width (), + rect.height ()); + + if (m_needs_surrounding_text) { + QString surroundingText = + widget->inputMethodQuery (Qt::ImSurroundingText).toString (); + uint cursor_pos = + widget->inputMethodQuery (Qt::ImCursorPosition).toUInt (); + uint anchor_pos = + widget->inputMethodQuery (Qt::ImAnchorPosition).toUInt (); + + Text *wrappedSurroundingText = new Text (surroundingText); + TextPointer wrappedSurroundingTextPointer (wrappedSurroundingText); + + m_context->setSurroundingText (wrappedSurroundingTextPointer, + cursor_pos, + anchor_pos); + + // We don't destroy wrappedSurroundingText because when + // wrappedSurroundingTextPointer is destroyed when this function + // returns, it calls wrappedSurroundingText->unref() + // which, in turn, destroys wrappedSurroundingText. + // It would actually crash if we did since wrappedSurroundingText + // is already freed. + } #if 0 QVariant value; @@ -248,9 +275,13 @@ *state |= IBus::ReleaseMask; char key_str[64]; - if (XLookupString (&xevent->xkey, key_str, sizeof (key_str), (KeySym *)keyval, 0) <= 0) { - *keyval = (quint32) XLookupKeysym (&xevent->xkey, 0); - } + /* Follow gtkxim module. + * https://git.gnome.org/browse/gtk+/tree/modules/input/gtkimcontextxim.c#n736 + * I think XLookupString can get right keyval even if the return value + * is 0 but key_str might not be a string. + * And XLookupString won't return the negative value in my test. */ + XLookupString (&xevent->xkey, key_str, sizeof (key_str), + (KeySym *)keyval, 0); return true; @@ -552,6 +583,10 @@ this, SLOT (slotShowPreeditText (void))); connect (m_context, SIGNAL (hidePreeditText (void)), this, SLOT (slotHidePreeditText (void))); + connect (m_context, SIGNAL (deleteSurroundingText (int, uint)), + this, SLOT (slotDeleteSurroundingText (int, uint))); + connect (m_context, SIGNAL (requireSurroundingText (void)), + this, SLOT (slotRequireSurroundingText (void))); if (m_has_focus) { m_context->focusIn (); @@ -787,3 +822,32 @@ displayPreeditText (m_preedit, m_preedit_cursor_pos, false); deleteInputContext (); } + +void +IBusInputContext::slotDeleteSurroundingText (int offset, uint nchars) +{ + + QWidget *widget = focusWidget(); + if (widget == NULL) + return; + + int cursor = widget->inputMethodQuery(Qt::ImCursorPosition).toInt(); + + cursor += offset; + if (cursor < 0) { + offset -= cursor; + nchars += cursor; + } + + QInputMethodEvent event; + event.setCommitString ("", offset, nchars); + sendEvent (event); + update (); +} + +void +IBusInputContext::slotRequireSurroundingText (void) +{ + m_needs_surrounding_text = true; + update(); +} diff -Nru ibus-qt-1.3.2/qtim/ibus-input-context.h ibus-qt-1.3.3/qtim/ibus-input-context.h --- ibus-qt-1.3.2/qtim/ibus-input-context.h 2013-03-11 06:54:25.000000000 +0000 +++ ibus-qt-1.3.3/qtim/ibus-input-context.h 2014-04-22 09:11:18.000000000 +0000 @@ -2,7 +2,7 @@ /* * ibus - The Input Bus * - * Copyright (c) 2007-2008 Huang Peng + * Copyright (c) 2007-2014 Huang Peng * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -58,6 +58,8 @@ void slotHidePreeditText (void); void slotConnected (void); void slotDisconnected (void); + void slotDeleteSurroundingText (int offset, uint nchars); + void slotRequireSurroundingText (void); private: void createInputContext (void); @@ -78,6 +80,7 @@ uint m_caps; uint m_compose_buffer[IBUS_MAX_COMPOSE_LEN + 1]; int m_n_compose; + bool m_needs_surrounding_text; }; #endif //__IBUS_INPUT_CONTEXT_H_ diff -Nru ibus-qt-1.3.2/qtim/moc_ibus-input-context.cxx_parameters ibus-qt-1.3.3/qtim/moc_ibus-input-context.cxx_parameters --- ibus-qt-1.3.2/qtim/moc_ibus-input-context.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/qtim/moc_ibus-input-context.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,21 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-I/usr/include/ibus-1.0 +-I/usr/include/glib-2.0 +-I/usr/lib64/glib-2.0/include +-I/home/tfujiwar/tmp/a/qtim/../src +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/qtim/moc_ibus-input-context.cxx +/home/tfujiwar/tmp/a/qtim/ibus-input-context.h diff -Nru ibus-qt-1.3.2/src/interfaces/org.freedesktop.IBus.InputContext.xml ibus-qt-1.3.3/src/interfaces/org.freedesktop.IBus.InputContext.xml --- ibus-qt-1.3.2/src/interfaces/org.freedesktop.IBus.InputContext.xml 2013-03-11 06:54:25.000000000 +0000 +++ ibus-qt-1.3.3/src/interfaces/org.freedesktop.IBus.InputContext.xml 2014-04-22 09:11:18.000000000 +0000 @@ -41,6 +41,11 @@ + + + + + @@ -51,6 +56,11 @@ + + + + + diff -Nru ibus-qt-1.3.2/src/moc_qibusattribute.cxx_parameters ibus-qt-1.3.3/src/moc_qibusattribute.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusattribute.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusattribute.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusattribute.cxx +/home/tfujiwar/tmp/a/src/qibusattribute.h diff -Nru ibus-qt-1.3.2/src/moc_qibusattrlist.cxx_parameters ibus-qt-1.3.3/src/moc_qibusattrlist.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusattrlist.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusattrlist.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusattrlist.cxx +/home/tfujiwar/tmp/a/src/qibusattrlist.h diff -Nru ibus-qt-1.3.2/src/moc_qibusbus.cxx_parameters ibus-qt-1.3.3/src/moc_qibusbus.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusbus.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusbus.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusbus.cxx +/home/tfujiwar/tmp/a/src/qibusbus.h diff -Nru ibus-qt-1.3.2/src/moc_qibuscomponent.cxx_parameters ibus-qt-1.3.3/src/moc_qibuscomponent.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibuscomponent.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibuscomponent.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibuscomponent.cxx +/home/tfujiwar/tmp/a/src/qibuscomponent.h diff -Nru ibus-qt-1.3.2/src/moc_qibusconfigadaptor.cxx_parameters ibus-qt-1.3.3/src/moc_qibusconfigadaptor.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusconfigadaptor.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusconfigadaptor.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusconfigadaptor.cxx +/home/tfujiwar/tmp/a/src/qibusconfigadaptor.h diff -Nru ibus-qt-1.3.2/src/moc_qibusconfig.cxx_parameters ibus-qt-1.3.3/src/moc_qibusconfig.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusconfig.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusconfig.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusconfig.cxx +/home/tfujiwar/tmp/a/src/qibusconfig.h diff -Nru ibus-qt-1.3.2/src/moc_qibusconfigproxy.cxx_parameters ibus-qt-1.3.3/src/moc_qibusconfigproxy.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusconfigproxy.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusconfigproxy.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusconfigproxy.cxx +/home/tfujiwar/tmp/a/src/qibusconfigproxy.h diff -Nru ibus-qt-1.3.2/src/moc_qibusconfigservice.cxx_parameters ibus-qt-1.3.3/src/moc_qibusconfigservice.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusconfigservice.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusconfigservice.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusconfigservice.cxx +/home/tfujiwar/tmp/a/src/qibusconfigservice.h diff -Nru ibus-qt-1.3.2/src/moc_qibusdbusproxy.cxx_parameters ibus-qt-1.3.3/src/moc_qibusdbusproxy.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusdbusproxy.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusdbusproxy.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusdbusproxy.cxx +/home/tfujiwar/tmp/a/src/qibusdbusproxy.h diff -Nru ibus-qt-1.3.2/src/moc_qibusengineadaptor.cxx_parameters ibus-qt-1.3.3/src/moc_qibusengineadaptor.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusengineadaptor.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusengineadaptor.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusengineadaptor.cxx +/home/tfujiwar/tmp/a/src/qibusengineadaptor.h diff -Nru ibus-qt-1.3.2/src/moc_qibusengine.cxx_parameters ibus-qt-1.3.3/src/moc_qibusengine.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusengine.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusengine.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusengine.cxx +/home/tfujiwar/tmp/a/src/qibusengine.h diff -Nru ibus-qt-1.3.2/src/moc_qibusenginedesc.cxx_parameters ibus-qt-1.3.3/src/moc_qibusenginedesc.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusenginedesc.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusenginedesc.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusenginedesc.cxx +/home/tfujiwar/tmp/a/src/qibusenginedesc.h diff -Nru ibus-qt-1.3.2/src/moc_qibusenginefactory.cxx_parameters ibus-qt-1.3.3/src/moc_qibusenginefactory.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusenginefactory.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusenginefactory.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusenginefactory.cxx +/home/tfujiwar/tmp/a/src/qibusenginefactory.h diff -Nru ibus-qt-1.3.2/src/moc_qibusfactoryadaptor.cxx_parameters ibus-qt-1.3.3/src/moc_qibusfactoryadaptor.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusfactoryadaptor.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusfactoryadaptor.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusfactoryadaptor.cxx +/home/tfujiwar/tmp/a/src/qibusfactoryadaptor.h diff -Nru ibus-qt-1.3.2/src/moc_qibusibusproxy.cxx_parameters ibus-qt-1.3.3/src/moc_qibusibusproxy.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusibusproxy.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusibusproxy.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusibusproxy.cxx +/home/tfujiwar/tmp/a/src/qibusibusproxy.h diff -Nru ibus-qt-1.3.2/src/moc_qibusinputcontext.cxx_parameters ibus-qt-1.3.3/src/moc_qibusinputcontext.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusinputcontext.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusinputcontext.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusinputcontext.cxx +/home/tfujiwar/tmp/a/src/qibusinputcontext.h diff -Nru ibus-qt-1.3.2/src/moc_qibusinputcontextproxy.cxx_parameters ibus-qt-1.3.3/src/moc_qibusinputcontextproxy.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusinputcontextproxy.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusinputcontextproxy.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusinputcontextproxy.cxx +/home/tfujiwar/tmp/a/src/qibusinputcontextproxy.h diff -Nru ibus-qt-1.3.2/src/moc_qibuslookuptable.cxx_parameters ibus-qt-1.3.3/src/moc_qibuslookuptable.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibuslookuptable.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibuslookuptable.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibuslookuptable.cxx +/home/tfujiwar/tmp/a/src/qibuslookuptable.h diff -Nru ibus-qt-1.3.2/src/moc_qibusobject.cxx_parameters ibus-qt-1.3.3/src/moc_qibusobject.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusobject.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusobject.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusobject.cxx +/home/tfujiwar/tmp/a/src/qibusobject.h diff -Nru ibus-qt-1.3.2/src/moc_qibusobservedpath.cxx_parameters ibus-qt-1.3.3/src/moc_qibusobservedpath.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusobservedpath.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusobservedpath.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusobservedpath.cxx +/home/tfujiwar/tmp/a/src/qibusobservedpath.h diff -Nru ibus-qt-1.3.2/src/moc_qibusproperty.cxx_parameters ibus-qt-1.3.3/src/moc_qibusproperty.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusproperty.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusproperty.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusproperty.cxx +/home/tfujiwar/tmp/a/src/qibusproperty.h diff -Nru ibus-qt-1.3.2/src/moc_qibusproplist.cxx_parameters ibus-qt-1.3.3/src/moc_qibusproplist.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusproplist.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusproplist.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusproplist.cxx +/home/tfujiwar/tmp/a/src/qibusproplist.h diff -Nru ibus-qt-1.3.2/src/moc_qibusserializable.cxx_parameters ibus-qt-1.3.3/src/moc_qibusserializable.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibusserializable.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibusserializable.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusserializable.cxx +/home/tfujiwar/tmp/a/src/qibusserializable.h diff -Nru ibus-qt-1.3.2/src/moc_qibustext.cxx_parameters ibus-qt-1.3.3/src/moc_qibustext.cxx_parameters --- ibus-qt-1.3.2/src/moc_qibustext.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/src/moc_qibustext.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibustext.cxx +/home/tfujiwar/tmp/a/src/qibustext.h diff -Nru ibus-qt-1.3.2/src/qibusinputcontext.cpp ibus-qt-1.3.3/src/qibusinputcontext.cpp --- ibus-qt-1.3.2/src/qibusinputcontext.cpp 2013-03-11 06:54:25.000000000 +0000 +++ ibus-qt-1.3.3/src/qibusinputcontext.cpp 2014-04-22 09:11:18.000000000 +0000 @@ -54,6 +54,10 @@ this, SLOT (slotUpdateProperty (const QDBusVariant &))); /* others */ + QObject::connect (m_context, SIGNAL (DeleteSurroundingText (int, uint)), + this, SLOT (slotDeleteSurroundingText (int, uint))); + QObject::connect (m_context, SIGNAL (RequireSurroundingText (void)), + this, SLOT (slotRequireSurroundingText (void))); QObject::connect (m_context, SIGNAL (ForwardKeyEvent (uint, uint, uint)), this, SLOT (slotForwardKeyEvent (uint, uint, uint))); QObject::connect (m_context, SIGNAL (Enabled (void)), @@ -184,6 +188,13 @@ m_context->SetEngine (name); } +void +InputContext::setSurroundingText (const TextPointer &text, uint cursor_pos, uint anchor_pos) +{ + QDBusVariant dbus_text = qDBusVariantFromSerializable (text); + m_context->SetSurroundingText (dbus_text, cursor_pos, anchor_pos); +} + /* slots */ void InputContext::slotCommitText (const QDBusVariant &text) @@ -291,6 +302,18 @@ } void +InputContext::slotDeleteSurroundingText (int offset, uint nchars) +{ + deleteSurroundingText (offset, nchars); +} + +void +InputContext::slotRequireSurroundingText () +{ + requireSurroundingText(); +} + +void InputContext::slotRegisterProperties (const QDBusVariant &props) { registerProperties (qDBusVariantToSerializable (props)); diff -Nru ibus-qt-1.3.2/src/qibusinputcontext.h ibus-qt-1.3.3/src/qibusinputcontext.h --- ibus-qt-1.3.2/src/qibusinputcontext.h 2013-03-11 06:54:25.000000000 +0000 +++ ibus-qt-1.3.3/src/qibusinputcontext.h 2014-04-22 09:11:18.000000000 +0000 @@ -37,6 +37,7 @@ void setCapabilities (uint caps); void setCursorLocation (int x, int y, int w, int h); void setEngine (const QString &name); + void setSurroundingText (const TextPointer &text, uint cursor_pos, uint anchor_pos); public: static InputContextPointer create (const BusPointer &bus, const QString &name); @@ -67,6 +68,8 @@ void disabled (void); void forwardKeyEvent (uint keyval, uint keycode, uint state); + void deleteSurroundingText (int offset, uint nchars); + void requireSurroundingText (void); private Q_SLOTS: void slotCommitText (const QDBusVariant &text); @@ -94,6 +97,8 @@ void slotDisabled(); void slotForwardKeyEvent(uint keyval, uint keycode, uint state); + void slotDeleteSurroundingText(int offset, uint nchars); + void slotRequireSurroundingText(); /* signals: diff -Nru ibus-qt-1.3.2/src/qibusinputcontextproxy.cpp ibus-qt-1.3.3/src/qibusinputcontextproxy.cpp --- ibus-qt-1.3.2/src/qibusinputcontextproxy.cpp 2013-03-11 06:54:25.000000000 +0000 +++ ibus-qt-1.3.3/src/qibusinputcontextproxy.cpp 2014-04-22 09:11:18.000000000 +0000 @@ -1,8 +1,8 @@ /* - * This file was generated by qdbusxml2cpp version 0.7 + * This file was generated by qdbusxml2cpp version 0.8 * Command line was: qdbusxml2cpp -p qibusinputcontextproxy -c IBusInputContextProxy -v org.freedesktop.IBus.InputContext.xml org.freedesktop.IBus.InputContext * - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). * * This is an auto-generated file. * This file may have been hand-edited. Look for HAND-EDIT comments diff -Nru ibus-qt-1.3.2/src/qibusinputcontextproxy.h ibus-qt-1.3.3/src/qibusinputcontextproxy.h --- ibus-qt-1.3.2/src/qibusinputcontextproxy.h 2013-03-11 06:54:25.000000000 +0000 +++ ibus-qt-1.3.3/src/qibusinputcontextproxy.h 2014-04-22 09:11:18.000000000 +0000 @@ -1,15 +1,15 @@ /* - * This file was generated by qdbusxml2cpp version 0.7 + * This file was generated by qdbusxml2cpp version 0.8 * Command line was: qdbusxml2cpp -p qibusinputcontextproxy -c IBusInputContextProxy -v org.freedesktop.IBus.InputContext.xml org.freedesktop.IBus.InputContext * - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). * * This is an auto-generated file. * Do not edit! All changes made to it will be lost. */ -#ifndef QIBUSINPUTCONTEXTPROXY_H_1268726783 -#define QIBUSINPUTCONTEXTPROXY_H_1268726783 +#ifndef QIBUSINPUTCONTEXTPROXY_H_1395517681 +#define QIBUSINPUTCONTEXTPROXY_H_1395517681 #include #include @@ -81,14 +81,14 @@ inline QDBusPendingReply ProcessKeyEvent(uint keyval, uint keycode, uint state) { QList argumentList; - argumentList << qVariantFromValue(keyval) << qVariantFromValue(keycode) << qVariantFromValue(state); + argumentList << QVariant::fromValue(keyval) << QVariant::fromValue(keycode) << QVariant::fromValue(state); return asyncCallWithArgumentList(QLatin1String("ProcessKeyEvent"), argumentList); } inline QDBusPendingReply<> PropertyActivate(const QString &name, int state) { QList argumentList; - argumentList << qVariantFromValue(name) << qVariantFromValue(state); + argumentList << QVariant::fromValue(name) << QVariant::fromValue(state); return asyncCallWithArgumentList(QLatin1String("PropertyActivate"), argumentList); } @@ -101,28 +101,36 @@ inline QDBusPendingReply<> SetCapabilities(uint caps) { QList argumentList; - argumentList << qVariantFromValue(caps); + argumentList << QVariant::fromValue(caps); return asyncCallWithArgumentList(QLatin1String("SetCapabilities"), argumentList); } inline QDBusPendingReply<> SetCursorLocation(int x, int y, int w, int h) { QList argumentList; - argumentList << qVariantFromValue(x) << qVariantFromValue(y) << qVariantFromValue(w) << qVariantFromValue(h); + argumentList << QVariant::fromValue(x) << QVariant::fromValue(y) << QVariant::fromValue(w) << QVariant::fromValue(h); return asyncCallWithArgumentList(QLatin1String("SetCursorLocation"), argumentList); } inline QDBusPendingReply<> SetEngine(const QString &name) { QList argumentList; - argumentList << qVariantFromValue(name); + argumentList << QVariant::fromValue(name); return asyncCallWithArgumentList(QLatin1String("SetEngine"), argumentList); } + inline QDBusPendingReply<> SetSurroundingText(const QDBusVariant &text, uint cursor_pos, uint anchor_pos) + { + QList argumentList; + argumentList << QVariant::fromValue(text) << QVariant::fromValue(cursor_pos) << QVariant::fromValue(anchor_pos); + return asyncCallWithArgumentList(QLatin1String("SetSurroundingText"), argumentList); + } + Q_SIGNALS: // SIGNALS void CommitText(const QDBusVariant &text); void CursorDownLookupTable(); void CursorUpLookupTable(); + void DeleteSurroundingText(int offset, uint nchars); void Disabled(); void Enabled(); void ForwardKeyEvent(uint keyval, uint keycode, uint state); @@ -132,6 +140,7 @@ void PageDownLookupTable(); void PageUpLookupTable(); void RegisterProperties(const QDBusVariant &props); + void RequireSurroundingText(); void ShowAuxiliaryText(); void ShowLookupTable(); void ShowPreeditText(); diff -Nru ibus-qt-1.3.2/src/qibustypes.h ibus-qt-1.3.3/src/qibustypes.h --- ibus-qt-1.3.2/src/qibustypes.h 2013-03-11 06:54:25.000000000 +0000 +++ ibus-qt-1.3.3/src/qibustypes.h 2014-04-22 09:11:18.000000000 +0000 @@ -46,6 +46,7 @@ CapLookupTable = 1 << 2, CapFocus = 1 << 3, CapProperty = 1 << 4, + CapSurroundingText = 1 << 5, } Capabilite; typedef enum { diff -Nru ibus-qt-1.3.2/test/moc_qibusdemoengine.cxx_parameters ibus-qt-1.3.3/test/moc_qibusdemoengine.cxx_parameters --- ibus-qt-1.3.2/test/moc_qibusdemoengine.cxx_parameters 1970-01-01 00:00:00.000000000 +0000 +++ ibus-qt-1.3.3/test/moc_qibusdemoengine.cxx_parameters 2014-04-22 09:11:58.000000000 +0000 @@ -0,0 +1,21 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-I/usr/include/ibus-1.0 +-I/usr/include/glib-2.0 +-I/usr/lib64/glib-2.0/include +-I/home/tfujiwar/tmp/a/test/../src +-D$<$>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/test/moc_qibusdemoengine.cxx +/home/tfujiwar/tmp/a/test/qibusdemoengine.h