From 73a7cfcfd50e891a03e3f0ab6927031424172990b5059b231c8703467ac67071 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Fri, 14 Oct 2022 11:49:55 +0000 Subject: [PATCH] Accepting request 1010892 from home:MargueriteSu:branches:M17N - according to upstream, XMODIFIERS and QT/GTK_IM_MODULE should set to fcitx instead of fcitx5 - build with enchant-2 again (boo#1203575) - update version 5.0.19 * classicui: support blur mask on kwin (x11&wayland) * xim: fix preedit start callback - switch source to _dict variant and drop * en_dict-20121020.tar.gz * fcitx5-no-download.patch - drop 0001-Remove-unused-xkbcommon-headers.patch, upstreamed - Fix the fcitx 4 obsoletes - obsoleting fcitx <= 4.2.9.8 does not suffice, we are at fcitx-4.2.9.9-1.2 - Update to 5.0.18 * Support for plasma themes in classicui * Fix client cursor disappears when using qt text-input-v2 * Fix clear text when ctrl+c when using gtk text-input-v3 * Fix a rare wayland protocol error on sway - Fix build by removing unused headers (gh#fcitx/fcitx5#538) * 0001-Remove-unused-xkbcommon-headers.patch - Replace raw package name with pkgconfig() - Remove "ENABLE_PRESAGE", it's not used anywhere (https://github.com/fcitx/fcitx5/commit/e7348f0f972d7f4934f3a1dd1258a51d7d057ac4) - update version 5.0.15 * bugfix release, drop EGL in classic UI - systemd user env generator moved to package systemd-inputmethod-generator - fcitx4 further splits its libraries, adds new Provides/Obsoletes - fix preun scirpt - update version 5.0.14 * support populate keyboard layout configuration to KDE5 under wayland. * A fcitx5-wayland-launcher tool to use the same fcitx instance with multiple wayland compositors. * Fix a crash when building with libevent. * Generates coredump on crash. * Refactor wl_shm code to use modern shared memory API on linux/BSD * Fix wayland input method protocol under weston * Fix paging button not clickable under vertical layout - drop baselibs.conf, no consumer yet - update version 5.0.13 * bug fix release - change in 5.0.12 * A lot of fixes in zwp_input_method_v1 to make it ready to be used with future Plasma 5.24 native wayland input method support. With the next Plasma release (not out yet as of today), you should be able to directly select fcitx in the "Virtual keyboard KCM" (it was designed for on screen keyboard so the naming is a little bit confusing at this point) and use it with native wayland input method protocols. This allows some non-gtk/qt text-input-v{2,3} applications to be used with the input method under kwin. - add fcitx5-5.0.13-memfd.patch - Fix xim.d script for KDE Plasma (boo#1194916); $WINDOWMANAGER check needs to be adjusted - can start via systemd user service on wayland - fix typo and requirements - update to version 5.0.11 - update to version 5.0.9 * Wayland repeat key fix under native wayland input method protocol * Improved fcitx5-diagnose to include more information * Screen DPI detection fixing, now you can change DPI on the fly without the need to restart fcitx. This also fixed another issue about when fcitx does not pick up DPI change upon login. * Fix XWindow based tray menu * Fix multi-screen detection with xrandr. Under certain cases, screen change may not be automatically picked up. - Fix build with Leap 15.3 and 15.4 due to rsvg pkg conflicts - update version 5.0.8 * Fix key repeating with wayland input method protocol * Workaround SNI gnome extension for "empty icon" or duplicate icon with kimpanel issue. * The Unicode addon trigger key is now configurable. * Fix some BSD build issue * Fix key grab when the input method group is added or removed. - update version 5.0.7 * Fix reforwarding event value - update version 5.0.6 * Improve the build ability on android/ios, more options can be disabled. * xim uses sync mode * Reload new addon at runtime with version check. * Bug fix on rotated screen. * Use fixed line height for classicui. * Fix "Default" value for classicui * Add sub mode label to input method - update version 5.0.5 * Add a new client side ui api to have extensive support for the client side input panel * Fix a bunch of issue in classic ui theme and add an option for customize border if image is not used. * fix ibus frontend content type * reduce the memory usage by making unicode data load on demand. - update version 5.0.4 * Supporting resolving the session dbus address exported to X11 * Add long press support for special symbol, this is disabled by default and also customizable. * Avoid trigger dbus activation for "fcitx5-remote -e" * In order to support "old" fcitx im module bundled, added a new fcitx4 frontend (mainly to support wps-office out of box). - add fcitx5-gcc7.patch: fix build on openSUSE Leap 15.1 with gcc7 - update version 5.0.3 - Move the startup snippet to /usr/etc/X11/xim.d for TW - update version 5.0.1 - Update the spec file to obselete fcitx < 4.99.0 - Update to version 4.99+git20201015.dd9dc94: * Preload default input method configured in the group. * Add logger type for multimap/set. * Batch multiple commit string together * Make candidate list key based label support more key * add fcitx5-diagnose * add support for modifying default configuration at runtime - update to 4.99.0+git20200902.a87f7b0 - FTBFS for Tumbleweed * add fcitx5-std-runtime_error.patch, std::runtime_error is in stdexcept.h - update to version 4.99.0+git20200212.9436416 * Add log functionality for surrounding text * Add fsync before rename * Add shorthand append for candidate list * Make cldr emoji annotation as required * Add emoji module and emoji typing in keyboard module - add build-requires cldr-emoji-annotation-devel - fix build errors on openSUSE_Leap_15.2 - fix build-requires for factory/tumbleweed rsvg-convert tool is now in rsvg-convert package - update version 4.99.0+git20181128.984f3f2 - initial package OBS-URL: https://build.opensuse.org/request/show/1010892 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx5?expand=0&rev=40 --- fcitx5-diagnose-env.patch | 62 --------------------------------------- fcitx5.changes | 7 ++--- fcitx5.spec | 1 - xim.d-fcitx5 | 19 ++++-------- 4 files changed, 8 insertions(+), 81 deletions(-) delete mode 100644 fcitx5-diagnose-env.patch diff --git a/fcitx5-diagnose-env.patch b/fcitx5-diagnose-env.patch deleted file mode 100644 index ad60b75..0000000 --- a/fcitx5-diagnose-env.patch +++ /dev/null @@ -1,62 +0,0 @@ -Index: fcitx5-5.0.19/data/fcitx5-diagnose.sh -=================================================================== ---- fcitx5-5.0.19.orig/data/fcitx5-diagnose.sh -+++ fcitx5-5.0.19/data/fcitx5-diagnose.sh -@@ -1113,18 +1113,18 @@ _env_incorrect() { - - check_xim() { - write_title 2 "Xim:" -- xim_name=fcitx -+ xim_name=fcitx5 - write_order_list "$(code_inline '${XMODIFIERS}'):" - if [ -z "${XMODIFIERS}" ]; then - write_error_eval "$(_ 'XMODIFIERS is not set')" -- set_env_link XMODIFIERS '@im=fcitx' -+ set_env_link XMODIFIERS '@im=fcitx5' - __need_blank_line=0 -- elif [ "${XMODIFIERS}" = '@im=fcitx' ]; then -- _env_correct 'XMODIFIERS' '@im=fcitx' -+ elif [ "${XMODIFIERS}" = '@im=fcitx5' ]; then -+ _env_correct 'XMODIFIERS' '@im=fcitx5' - __need_blank_line=0 - else -- _env_incorrect 'XMODIFIERS' '@im=fcitx' "${XMODIFIERS}" -- set_env_link XMODIFIERS '@im=fcitx' -+ _env_incorrect 'XMODIFIERS' '@im=fcitx5' "${XMODIFIERS}" -+ set_env_link XMODIFIERS '@im=fcitx5' - if [[ ${XMODIFIERS} =~ @im=([-_0-9a-zA-Z]+) ]]; then - xim_name="${BASH_REMATCH[1]}" - else -@@ -1183,11 +1183,11 @@ _check_toolkit_env() { - [ -z "${!env_name}" ] || break - done - if [ -z "${!env_name}" ]; then -- set_env_link "${env_name}" 'fcitx' -- elif [ "${!env_name}" = 'fcitx' ]; then -- _env_correct "${env_name}" 'fcitx' -+ set_env_link "${env_name}" 'fcitx5' -+ elif [ "${!env_name}" = 'fcitx5' ]; then -+ _env_correct "${env_name}" 'fcitx5' - else -- _env_incorrect "${env_name}" 'fcitx' "${!env_name}" -+ _env_incorrect "${env_name}" 'fcitx5' "${!env_name}" - __need_blank_line=0 - if [ "${!env_name}" = 'xim' ]; then - write_error_eval "$(_ 'You are using xim in ${1} programs.')" \ -@@ -1195,14 +1195,14 @@ _check_toolkit_env() { - no_xim_link - else - write_error_eval \ -- "$(_ 'You may have trouble using fcitx in ${1} programs.')" \ -+ "$(_ 'You may have trouble using fcitx5 in ${1} programs.')" \ - "${name}" - if [ "${!env_name}" = "ibus" ] && [ "${name}" = 'qt' ]; then - __need_blank_line=0 - gnome_36_link || __need_blank_line=1 - fi - fi -- set_env_link "${env_name}" 'fcitx' -+ set_env_link "${env_name}" 'fcitx5' - fi - } - diff --git a/fcitx5.changes b/fcitx5.changes index 7779808..37dbe7a 100644 --- a/fcitx5.changes +++ b/fcitx5.changes @@ -1,9 +1,8 @@ ------------------------------------------------------------------- -Tue Oct 4 04:23:27 UTC 2022 - Marguerite Su +Fri Oct 7 12:34:18 UTC 2022 - Marguerite Su -- fix boo#1203579, fcitx5-diagnose requests environment variables - to be set to fcitx instead of fcitx5 -- add fcitx5-diagnose-env.patch +- according to upstream, XMODIFIERS and QT/GTK_IM_MODULE should + set to fcitx instead of fcitx5 ------------------------------------------------------------------- Sat Oct 1 16:26:46 UTC 2022 - Andreas Stieger diff --git a/fcitx5.spec b/fcitx5.spec index 7638100..1179737 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -38,7 +38,6 @@ Source4: macros.fcitx5 Source102: fcitx5.service Patch1: fcitx5-gcc7.patch Patch2: fcitx5-5.0.13-memfd.patch -Patch3: fcitx5-diagnose-env.patch BuildRequires: cmake BuildRequires: dbus-1-devel BuildRequires: extra-cmake-modules diff --git a/xim.d-fcitx5 b/xim.d-fcitx5 index fb4dfcf..794e08d 100644 --- a/xim.d-fcitx5 +++ b/xim.d-fcitx5 @@ -1,21 +1,12 @@ #make sure set these vars before dbus-launch export LC_CTYPE=$LANG -export XMODIFIERS="@im=fcitx5" -export GTK_IM_MODULE=fcitx5 +export XMODIFIERS="@im=fcitx" +export GTK_IM_MODULE=fcitx export QT_IM_SWITCHER=imsw-multi -export QT_IM_MODULE=fcitx5 +export QT_IM_MODULE=fcitx -case "$WINDOWMANAGER" in - *gnome*|*plasma*|*xfce*|*lxde*) - # started via xdg autostart (boo#947576) - # explicitly set below, as referred in xdg autostart - export INPUT_METHOD=fcitx5 - ;; - *) - # FIXME: a little bit of delay is required to avoid race (boo#947576) - (sleep 2; fcitx5 -d) & - ;; -esac +# FIXME: a little bit of delay is required to avoid race (boo#947576) +(sleep 2; fcitx5 -d) & # success: return 0