[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#687801: marked as done (unblock: fcitx/1:4.2.4.1-6)



Your message dated Sun, 16 Sep 2012 12:11:26 +0100
with message-id <1347793886.28617.100.camel@jacala.jungle.funky-badger.org>
and subject line Re: Bug#687801: unblock: fcitx/1:4.2.4.1-6
has caused the Debian Bug report #687801,
regarding unblock: fcitx/1:4.2.4.1-6
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
687801: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687801
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Fixes RC bug #684245.

unblock: fcitx/1:4.2.4.1-6

diff --git a/debian/changelog b/debian/changelog
index 3085974..a5bca71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fcitx (1:4.2.4.1-6) unstable; urgency=low
+
+  * add gbp.conf for wheezy
+  * Add 0009-gnumeric_cursor_keys_edit.patch (Closes: #684245)
+
+ -- YunQiang Su <wzssyqa@gmail.com>  Sun, 16 Sep 2012 01:50:56 +0800
+
 fcitx (1:4.2.4.1-5) unstable; urgency=low

   * fcitx-modules Breaks fcitx-modules-x11 (<< 4.2.4.1-5).
diff --git a/debian/control b/debian/control
index 54c1672..8b49f0f 100644
--- a/debian/control
+++ b/debian/control
@@ -488,8 +488,8 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: fcitx (>= 1:4.2.0), fcitx-module-dbus,
  fcitx-module-kimpanel, fcitx-module-lua, fcitx-module-x11
-Replaces: fcitx (<< 1:4.2.0), fcitx-keyboard, fcitx-modules-x11 (<<
1:4.2.4.1-5)
-Breaks: fcitx (<< 1:4.2.0), fcitx-keyboard, fcitx-modules-x11 (<< 1:4.2.4.1-5)
+Replaces: fcitx (<< 1:4.2.0), fcitx-keyboard, fcitx-module-x11 (<< 1:4.2.4.1-5)
+Breaks: fcitx (<< 1:4.2.0), fcitx-keyboard, fcitx-module-x11 (<< 1:4.2.4.1-5)
 Provides: fcitx-keyboard
 Description: Flexible Input Method Framework - core modules
  Fcitx is a input method framework with extension support, which provides
diff --git a/debian/control.in b/debian/control.in
index ee7898c..b4e0583 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -488,8 +488,8 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: fcitx (>= 1:4.2.0), fcitx-module-dbus,
  fcitx-module-kimpanel, fcitx-module-lua, fcitx-module-x11
-Replaces: fcitx (<< 1:4.2.0), fcitx-keyboard, fcitx-modules-x11 (<<
1:4.2.4.1-5)
-Breaks: fcitx (<< 1:4.2.0), fcitx-keyboard, fcitx-modules-x11 (<< 1:4.2.4.1-5)
+Replaces: fcitx (<< 1:4.2.0), fcitx-keyboard, fcitx-module-x11 (<< 1:4.2.4.1-5)
+Breaks: fcitx (<< 1:4.2.0), fcitx-keyboard, fcitx-module-x11 (<< 1:4.2.4.1-5)
 Provides: fcitx-keyboard
 Description: Flexible Input Method Framework - core modules
  Fcitx is a input method framework with extension support, which provides
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..175d2b9
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,5 @@
+[DEFAULT]
+upstream-branch = upstream/wheezy
+debian-branch = wheezy
+upstream-tag = %(version)s
+compression = xz
diff --git a/debian/patches/0009-gnumeric_cursor_keys_edit.patch
b/debian/patches/0009-gnumeric_cursor_keys_edit.patch
new file mode 100644
index 0000000..46cdacf
--- /dev/null
+++ b/debian/patches/0009-gnumeric_cursor_keys_edit.patch
@@ -0,0 +1,44 @@
+diff --git a/src/frontend/ipc/ipc.c b/src/frontend/ipc/ipc.c
+index 1d57567..67261fe 100644
+--- a/src/frontend/ipc/ipc.c
++++ b/src/frontend/ipc/ipc.c
+@@ -43,6 +43,7 @@ typedef struct _FcitxIPCIC {
+     char* surroundingText;
+     unsigned int anchor;
+     unsigned int cursor;
++    boolean lastPreeditIsEmpty;
+ } FcitxIPCIC;
+
+ typedef struct _FcitxIPCFrontend {
+@@ -349,6 +350,7 @@ void IPCCreateIC(void* arg, FcitxInputContext*
context, void* priv)
+
+     ipcic->id = ipc->maxid;
+     ipc->maxid ++;
++    ipcic->lastPreeditIsEmpty = false;
+     sprintf(ipcic->path, FCITX_IC_DBUS_PATH, ipcic->id);
+
+     uint32_t arg1, arg2, arg3, arg4;
+@@ -930,6 +932,23 @@ static void IPCICSetCursorRect(FcitxIPCFrontend*
ipc, FcitxInputContext* ic, int
+
+ void IPCUpdatePreedit(void* arg, FcitxInputContext* ic)
+ {
++    FcitxIPCFrontend* ipc = (FcitxIPCFrontend*) arg;
++    FcitxInputState* input = FcitxInstanceGetInputState(ipc->owner);
++    FcitxMessages* clientPreedit = FcitxInputStateGetClientPreedit(input);
++    int i = 0;
++    for (i = 0; i < FcitxMessagesGetMessageCount(clientPreedit) ; i ++) {
++        char* str = FcitxMessagesGetMessageString(clientPreedit, i);
++        if (!fcitx_utf8_check_string(str))
++            return;
++    }
++
++    /* a small optimization, don't need to update empty preedit */
++    FcitxIPCIC* ipcic = GetIPCIC(ic);
++    if (ipcic->lastPreeditIsEmpty &&
FcitxMessagesGetMessageCount(clientPreedit) == 0)
++        return;
++
++    ipcic->lastPreeditIsEmpty =
(FcitxMessagesGetMessageCount(clientPreedit) == 0);
++
+     if (ic->contextCaps & CAPACITY_FORMATTED_PREEDIT) {
+         FcitxIPCFrontend* ipc = (FcitxIPCFrontend*) arg;
+         dbus_uint32_t serial = 0; // unique number to associate
replies with requests
diff --git a/debian/patches/series b/debian/patches/series
index 764fd7f..32e7ebc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0006-fix-im-loading.patch
 0007-fix-message-resending-bug-and-log-format.patch
 0008-fix-getopt_long.patch
+0009-gnumeric_cursor_keys_edit.patch


-- 
Regards,
Aron Xu

--- End Message ---
--- Begin Message ---
On Sun, 2012-09-16 at 08:55 +0800, Aron Xu wrote:
> Fixes RC bug #684245.
[...]
> -Replaces: fcitx (<< 1:4.2.0), fcitx-keyboard, fcitx-modules-x11 (<<
> 1:4.2.4.1-5)
> -Breaks: fcitx (<< 1:4.2.0), fcitx-keyboard, fcitx-modules-x11 (<< 1:4.2.4.1-5)
> +Replaces: fcitx (<< 1:4.2.0), fcitx-keyboard, fcitx-module-x11 (<< 1:4.2.4.1-5)
> +Breaks: fcitx (<< 1:4.2.0), fcitx-keyboard, fcitx-module-x11 (<< 1:4.2.4.1-5)

That should be mentioned in the changelog.

Unblocked; thanks.

Regards,

Adam

--- End Message ---

Reply to: