diff --git a/_service b/_service deleted file mode 100644 index a2dc5da..0000000 --- a/_service +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - allhttps://github.com/fcitx/fcitx.git4.2gitfcitxgit - - *.tar - bz2 - - - diff --git a/boo954623.patch b/boo954623.patch deleted file mode 100644 index 2901126..0000000 --- a/boo954623.patch +++ /dev/null @@ -1,64 +0,0 @@ -Index: fcitx-4.2.9.1/src/module/notificationitem/notificationitem.c -=================================================================== ---- fcitx-4.2.9.1.orig/src/module/notificationitem/notificationitem.c -+++ fcitx-4.2.9.1/src/module/notificationitem/notificationitem.c -@@ -565,8 +565,17 @@ void FcitxNotificationItemUpdateIMList(v - - boolean FcitxNotificationItemEnable(FcitxNotificationItem* notificationitem, FcitxNotificationItemAvailableCallback callback, void* data) - { -- if (!callback || notificationitem->callback) -+ if (!callback) - return false; -+ -+ if (notificationitem->callback == callback) { -+ return true; -+ } -+ -+ if (notificationitem->callback) { -+ return false; -+ } -+ - if (notificationitem->serviceName) { - FcitxLog(ERROR, "This should not happen, please report bug."); - return false; -Index: fcitx-4.2.9.1/src/ui/classic/TrayWindow.c -=================================================================== ---- fcitx-4.2.9.1.orig/src/ui/classic/TrayWindow.c -+++ fcitx-4.2.9.1/src/ui/classic/TrayWindow.c -@@ -226,11 +226,11 @@ boolean TrayEventHandler(void *arg, XEve - if (event->xclient.message_type == trayWindow->atoms[ATOM_MANAGER] - && event->xclient.data.l[1] == trayWindow->atoms[ATOM_SELECTION] - && trayWindow->dockWindow == None) { -- if (classicui->notificationItemAvailable) -- return true; - trayWindow->dockWindow = event->xclient.data.l[2]; - TrayWindowRelease(trayWindow); -- TrayWindowInit(trayWindow); -+ if (!classicui->notificationItemAvailable && !classicui->isSuspend) { -+ TrayWindowInit(trayWindow); -+ } - return true; - } - break; -Index: fcitx-4.2.9.1/src/ui/classic/classicui.c -=================================================================== ---- fcitx-4.2.9.1.orig/src/ui/classic/classicui.c -+++ fcitx-4.2.9.1/src/ui/classic/classicui.c -@@ -168,7 +168,7 @@ void* ClassicUICreate(FcitxInstance* ins - void ClassicUIDelayedInitTray(void* arg) { - FcitxClassicUI* classicui = (FcitxClassicUI*) arg; - // FcitxLog(INFO, "yeah we delayed!"); -- if (!classicui->bUseTrayIcon) -+ if (!classicui->bUseTrayIcon || classicui->isSuspend) - return; - /* - * if this return false, something wrong happened and callback -@@ -187,7 +187,7 @@ void ClassicUIDelayedShowTray(void* arg) - { - FcitxClassicUI* classicui = (FcitxClassicUI*) arg; - classicui->trayTimeout = 0; -- if (!classicui->bUseTrayIcon) -+ if (!classicui->bUseTrayIcon || classicui->isSuspend) - return; - - if (!classicui->trayWindow->bTrayMapped) { diff --git a/fcitx-4.2.9.1_dict.tar.xz b/fcitx-4.2.9.1_dict.tar.xz deleted file mode 100644 index c7ba78f..0000000 --- a/fcitx-4.2.9.1_dict.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5337c8226417a1d4e6f88b3b1048aa73695d281ed483568a7b6a9ee849ad6c77 -size 8684772 diff --git a/fcitx-4.2.9.5_dict.tar.xz b/fcitx-4.2.9.5_dict.tar.xz new file mode 100644 index 0000000..86df4f2 --- /dev/null +++ b/fcitx-4.2.9.5_dict.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be398ac4433f6f4599d2728e20615e4f4602a5f67e9c29df4a3d4c1126d376ca +size 8736972 diff --git a/fcitx-autostart-desktop-no-display.patch b/fcitx-autostart-desktop-no-display.patch deleted file mode 100644 index f97e399..0000000 --- a/fcitx-autostart-desktop-no-display.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- - data/fcitx-autostart.desktop.in | 1 + - 1 file changed, 1 insertion(+) - ---- a/data/fcitx-autostart.desktop.in -+++ b/data/fcitx-autostart.desktop.in -@@ -8,6 +8,7 @@ Terminal=false - Type=Application - Categories=System;Utility; - StartupNotify=false -+NoDisplay=true - X-GNOME-Autostart-Phase=Applications - X-GNOME-AutoRestart=false - X-GNOME-Autostart-Notify=false diff --git a/fcitx-use-basename-for-log.patch b/fcitx-use-basename-for-log.patch deleted file mode 100644 index c18499d..0000000 --- a/fcitx-use-basename-for-log.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- - src/lib/fcitx-utils/log.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/src/lib/fcitx-utils/log.c -+++ b/src/lib/fcitx-utils/log.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include "config.h" - #include "fcitx/fcitx.h" -@@ -136,7 +137,7 @@ FcitxLogFunc(FcitxLogLevel e, const char - { - va_list ap; - va_start(ap, fmt); -- FcitxLogFuncV(e, filename, line, fmt, ap); -+ FcitxLogFuncV(e, basename(filename), line, fmt, ap); - va_end(ap); - } - diff --git a/fcitx.changes b/fcitx.changes index 5805a4a..e1369f7 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,71 @@ +------------------------------------------------------------------- +Sat Nov 11 01:06:32 UTC 2017 - i@marguerite.su + +- update 4.2.9.5 + * [qt] remove quickphrase editor, moved to qt5 + * [misc] forget to remove the add_directory for quickphrase editor + * fcitx-configtool.desktop: Remove MimeType entry + * [frontend] add a compatibility layer for ofd.portal.Fcitx + * [gtk] run clang-format on gtk libraries + * [gclinet] remove a undefined function + * set display for fcitx and harden dbus frontend with sender verification + * extend dbus module to be able to accept external dbus connection + * [ipcportal] fix signal sending in portal + * [qt] delay the recheck on availability, but does do the recheck + * [portal] put ipc portal in queue + * [qt] do the real unwatch + * [misc] make more optional disabled option for easier flatpak + * [table] make sure we don't download table data if we disable table +- changes in 4.2.9.4 + * [gtk, kimpanel] add relative coordinate support + * [kimpanel] check null before use ic + * [kimpanel] correctly reset relative spot state + * [notificationitem] Reply event method call +- changes in 4.2.9.3 + * [core] Make sure when RealEnd is called, instance->destroy == true +- changes in 4.2.9.2 + * [notificationitem] avoid unnecessary xembed tray icon fallback + * [classicui] give tray icon a default size + * [qt] fix inconsistency when handling qstring and ucs4 string + * [classicui] Watch for dockWindow visual property change + * [qt] fromUcs4 expect a nul terminated string by default, give it a size + * [core] Expose internal show input speed function + * logging should not include the build path(boo#951602) + * autostart desktop file should not be shown(boo#968486) + * [qt] replace QPointer with raw pointer in icdata + * [notificationitem] display layout under unity + * [diagnose] Print info about dbus name owner + * Include emoji short codes ("emoji alpha codes") + * [notificationitem] Fix a bug in plugin entry + * [core] Add a new hook to watch ui status changed + * [xim] handle reset ic + * [utils] Improve process name detection on *BSD + * [quickphrase] use some different character, original one looks bad under noto + * [misc] use RTLD_NODELETE for all dlopen + * Call sem_post() only on valid semaphore + * [unicode] Update Unicode 9.0 descriptions + * [classicui] Check XShape version before using it + * [remote] exit the loop after trying 20 times + * Require bash in fcitx-cmake-helper.sh + * [xim] fix a memset + * [pinyin] fix missing files + * [dbus] fix a wrong dbus destruct order that my cause deadlock on exit + * [xkb] handle some corner case for any evil third party that override layout + * [xkb, xkbdbus] add support for our gnome-shell kimpanel dbus helper + * [xkb] fix circular deps between xkb and xkbdbus + * [gclient] try to eliminate a warning for configtool + * [misc] enforce c99 for compiler + * [core] call backtrace() ahead to let it finish init() + * [misc] remove a dup define + * [unicode] enable prev/next key and enter to choose for unicode + * [gtk] fix wrong gobject add weak pointer + * [misc] use unsigned int instead for portability + * Remove deprecated api in enchant so we can also support 2.1.0. + * Fix bashism/use correct shebang +- drop fcitx-autostart-desktop-no-display.patch, upstreamed +- drop fcitx-use-basename-for-log.patch, upstreamed +- drop boo954623.patch, upstreamed + ------------------------------------------------------------------- Fri Apr 21 12:12:12 UTC 2017 - fvogt@suse.com diff --git a/fcitx.spec b/fcitx.spec index 1cbd247..bfd0836 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -19,7 +19,7 @@ %define libver -4_2_9 Name: fcitx -Version: 4.2.9.1 +Version: 4.2.9.5 Release: 0 Summary: Flexible Context-aware Input Tool with eXtension License: GPL-2.0+ @@ -32,14 +32,8 @@ Source3: xim.fcitx.suse.template Source8: openSUSE-themes.tar.gz Source9: macros.%{name} Source99: baselibs.conf -# PATCH-FIX-OPENSUSE fcitx-use-basename-for-log.patch boo#951602 -Patch1: fcitx-use-basename-for-log.patch # PATCH-FIX-OPENSUSE fcitx-autostart-check-INPUT_METHOD.patch boo#947576 Patch2: fcitx-autostart-check-INPUT_METHOD.patch -# PATCH-FIX-OPENSUSE fcitx-autostart-desktop-no-display.patch boo#968486 -Patch3: fcitx-autostart-desktop-no-display.patch -# PATCH-FIX-UPSTREAM boo#964623 -Patch4: boo954623.patch BuildRequires: cairo-devel BuildRequires: cmake BuildRequires: dbus-1-devel @@ -56,6 +50,7 @@ BuildRequires: iso-codes-devel BuildRequires: libicu-devel BuildRequires: libpresage-devel BuildRequires: libqt4-devel +BuildRequires: libuuid-devel BuildRequires: libxml2-devel BuildRequires: opencc-devel BuildRequires: pango-devel @@ -310,10 +305,7 @@ You can either use this package for download from kde-look.org using knewstaff i %prep %setup -q -n %{name}-%{version} -%patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build mkdir build