Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ibus-libpinyin for openSUSE:Factory checked in at 2024-02-20 21:15:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-libpinyin (Old) and /work/SRC/openSUSE:Factory/.ibus-libpinyin.new.1706 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-libpinyin" Tue Feb 20 21:15:34 2024 rev:39 rq:1147942 version:1.15.7 Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-libpinyin/ibus-libpinyin.changes 2024-01-25 18:40:55.114043357 +0100 +++ /work/SRC/openSUSE:Factory/.ibus-libpinyin.new.1706/ibus-libpinyin.changes 2024-02-20 21:15:59.793610954 +0100 @@ -1,0 +2,6 @@ +Tue Feb 20 12:30:29 UTC 2024 - Hillwood Yang <hillw...@opensuse.org> + +- Update version to 1.15.7 + * Fix bugs + +------------------------------------------------------------------- Old: ---- ibus-libpinyin-1.15.5.tar.gz New: ---- ibus-libpinyin-1.15.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-libpinyin.spec ++++++ --- /var/tmp/diff_new_pack.eN5SpG/_old 2024-02-20 21:16:00.373631993 +0100 +++ /var/tmp/diff_new_pack.eN5SpG/_new 2024-02-20 21:16:00.373631993 +0100 @@ -20,7 +20,7 @@ %define with_cloud_input 1 Name: ibus-libpinyin -Version: 1.15.5 +Version: 1.15.7 Release: 0 Summary: Intelligent Pinyin engine based on libpinyin for IBus License: GPL-3.0-or-later ++++++ ibus-libpinyin-1.15.5.tar.gz -> ibus-libpinyin-1.15.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/ChangeLog new/ibus-libpinyin-1.15.7/ChangeLog --- old/ibus-libpinyin-1.15.5/ChangeLog 2023-11-27 09:06:06.000000000 +0100 +++ new/ibus-libpinyin-1.15.7/ChangeLog 2024-02-01 05:15:32.000000000 +0100 @@ -1,3 +1,101 @@ +commit 1a0dd87cbb49511ef52f03153daa99ce6fa0c3bd +Author: Damien Pou <dampato+li...@ik.me> +Date: 2024-01-16 14:37:08 +0100 + + Translated using Weblate (French) + + Currently translated at 100.0% (167 of 167 strings) + + Translation: ibus-libpinyin/main + Translate-URL: https://translate.fedoraproject.org/projects/ibus-libpinyin/main/fr/ + +M po/fr.po + +commit d88c0a3011f6dfa587e768f2ce7e024d843727c8 +Author: Peng Wu <alexep...@gmail.com> +Date: 2024-01-31 10:01:42 +0800 + + Update NEWS + +M NEWS + +commit 1c69ff8d50adee23c9cc45f4b59977efa53ac9fc +Author: Peng Wu <alexep...@gmail.com> +Date: 2024-01-31 09:58:24 +0800 + + Bump version 1.15.7 + +M configure.ac + +commit 312d3908da8dc50b27b2100152beff73a8bef534 +Author: Peng Wu <alexep...@gmail.com> +Date: 2024-01-31 09:52:08 +0800 + + Fix getRequestString method + +M src/PYPCloudCandidates.cc + +commit f91bbc04cd0ac0651575c8964e8ed6fc585eafe2 +Author: Peng Wu <alexep...@gmail.com> +Date: 2024-01-30 17:37:51 +0800 + + Fix processKeyEvent methods again + +M src/PYEditor.cc +M src/PYEnglishEditor.cc +M src/PYExtEditor.cc +M src/PYFallbackEditor.cc +M src/PYPDoublePinyinEditor.cc +M src/PYPFullPinyinEditor.cc +M src/PYPPhoneticEditor.cc +M src/PYPPinyinEditor.cc +M src/PYPSuggestionEditor.cc +M src/PYPunctEditor.cc +M src/PYTableEditor.cc + +commit 5fe4e0f08cf1bf4199900d35383eacee197c08a7 +Author: Peng Wu <alexep...@gmail.com> +Date: 2024-01-26 10:52:20 +0800 + + Fix processKeyEvent method + +M src/PYPBopomofoEditor.cc + +commit cf33a2c289f7676a36954bdcf700a9d0086d6886 +Author: Florian Weimer <fwei...@redhat.com> +Date: 2024-01-21 14:35:27 +0100 + + Lua plugin: Add pointer casts for C89 compatibility + + This addresses a build failure with GCC 14. + +M lua/lua-plugin-init.c + +commit f19b22952c084823e68fea61c9125fe41c224c2a +Author: Peng Wu <alexep...@gmail.com> +Date: 2023-12-15 12:26:42 +0800 + + Update NEWS + +M NEWS + +commit 54567daeccce435cc796da5706e413ae8ac98f42 +Author: Peng Wu <alexep...@gmail.com> +Date: 2023-12-15 12:25:33 +0800 + + Bump version 1.15.6 + +M configure.ac + +commit 48269b7667a124af29d41f2be4e21a00e2f3fa80 +Author: Peng Wu <alexep...@gmail.com> +Date: 2023-12-06 12:01:34 +0800 + + Fix processAccelKeyEvent method + +M src/PYPBopomofoEngine.cc +M src/PYPPinyinEngine.cc + commit fb2ace4ba4cace96e10d85970c42a7ebc04070ae Author: Peng Wu <alexep...@gmail.com> Date: 2023-11-27 14:12:27 +0800 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/NEWS new/ibus-libpinyin-1.15.7/NEWS --- old/ibus-libpinyin-1.15.5/NEWS 2023-11-27 07:07:16.000000000 +0100 +++ new/ibus-libpinyin-1.15.7/NEWS 2024-01-31 02:59:03.000000000 +0100 @@ -1,3 +1,9 @@ +version 1.15.7 +* bug fixes + +version 1.15.6 +* bug fixes + version 1.15.5 * bug fixes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/aclocal.m4 new/ibus-libpinyin-1.15.7/aclocal.m4 --- old/ibus-libpinyin-1.15.5/aclocal.m4 2023-11-27 08:03:41.000000000 +0100 +++ new/ibus-libpinyin-1.15.7/aclocal.m4 2024-02-01 05:14:50.000000000 +0100 @@ -109,8 +109,8 @@ ] ) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 11 (pkg-config-0.29.1) +# pkg.m4 - Macros to locate and use pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) dnl Copyright © 2004 Scott James Remnant <sc...@netsplit.com>. dnl Copyright © 2012-2015 Dan Nicholson <dbn.li...@gmail.com> @@ -152,7 +152,7 @@ dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -197,7 +197,7 @@ dnl PKG_CHECK_MODULES(), but does not set variables or print errors. dnl dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -dnl only at the first occurence in configure.ac, so if the first place +dnl only at the first occurrence in configure.ac, so if the first place dnl it's called might be skipped (such as if it is within an "if", you dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], @@ -253,7 +253,7 @@ AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -263,17 +263,17 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - m4_default([$4], [AC_MSG_ERROR( + m4_default([$4], [AC_MSG_ERROR( [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -284,8 +284,8 @@ _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -295,10 +295,10 @@ To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl ]) else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - $3 + $3 fi[]dnl ])dnl PKG_CHECK_MODULES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/config.guess new/ibus-libpinyin-1.15.7/config.guess --- old/ibus-libpinyin-1.15.5/config.guess 2023-11-27 08:03:41.000000000 +0100 +++ new/ibus-libpinyin-1.15.7/config.guess 2024-02-01 05:14:51.000000000 +0100 @@ -1,10 +1,10 @@ #!/usr/bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2022 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-05-25' +timestamp='2023-06-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -47,7 +47,7 @@ usage="\ Usage: $0 [OPTION] -Output the configuration name of the system \`$me' is run on. +Output the configuration name of the system '$me' is run on. Options: -h, --help print this help, then exit @@ -60,13 +60,13 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" -Try \`$me --help' for more information." +Try '$me --help' for more information." # Parse command line while test $# -gt 0 ; do @@ -102,8 +102,8 @@ # temporary files to be created and, as you can see below, it is a # headache to deal with in a portable fashion. -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. +# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still +# use 'HOST_CC' if defined, but it is deprecated. # Portable tmp directory creation inspired by the Autoconf team. @@ -459,7 +459,7 @@ UNAME_RELEASE=`uname -v` ;; esac - # Japanese Language versions have a version number like `4.1.3-JL'. + # Japanese Language versions have a version number like '4.1.3-JL'. SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` GUESS=sparc-sun-sunos$SUN_REL ;; @@ -966,6 +966,12 @@ GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC ;; + x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-pc-managarm-mlibc" + ;; + *:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" + ;; *:Minix:*:*) GUESS=$UNAME_MACHINE-unknown-minix ;; @@ -1036,7 +1042,7 @@ k1om:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; - loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + loongarch32:Linux:*:* | loongarch64:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; m32r*:Linux:*:*) @@ -1191,7 +1197,7 @@ GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION ;; i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility + # If we were able to find 'uname', then EMX Unix compatibility # is probably installed. GUESS=$UNAME_MACHINE-pc-os2-emx ;; @@ -1332,7 +1338,7 @@ GUESS=ns32k-sni-sysv fi ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort # says <richard.m.bar...@ccmail.census.gov> GUESS=i586-unisys-sysv4 ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/config.sub new/ibus-libpinyin-1.15.7/config.sub --- old/ibus-libpinyin-1.15.5/config.sub 2023-11-27 08:03:41.000000000 +0100 +++ new/ibus-libpinyin-1.15.7/config.sub 2024-02-01 05:14:51.000000000 +0100 @@ -1,10 +1,10 @@ #!/usr/bin/sh # Configuration validation subroutine script. -# Copyright 1992-2022 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-01-03' +timestamp='2023-06-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -76,13 +76,13 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" -Try \`$me --help' for more information." +Try '$me --help' for more information." # Parse command line while test $# -gt 0 ; do @@ -130,7 +130,7 @@ # Separate into logical components for further validation case $1 in *-*-*-*-*) - echo Invalid configuration \`"$1"\': more than four components >&2 + echo "Invalid configuration '$1': more than four components" >&2 exit 1 ;; *-*-*-*) @@ -145,7 +145,7 @@ nto-qnx* | linux-* | uclinux-uclibc* \ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ - | storm-chaos* | os2-emx* | rtmk-nova*) + | storm-chaos* | os2-emx* | rtmk-nova* | managarm-*) basic_machine=$field1 basic_os=$maybe_os ;; @@ -943,7 +943,7 @@ EOF IFS=$saved_IFS ;; - # We use `pc' rather than `unknown' + # We use 'pc' rather than 'unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. i*86 | x86_64) @@ -1075,7 +1075,7 @@ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) cpu=i586 ;; - pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*) + pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*) cpu=i686 ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) @@ -1207,7 +1207,7 @@ | k1om \ | le32 | le64 \ | lm32 \ - | loongarch32 | loongarch64 | loongarchx32 \ + | loongarch32 | loongarch64 \ | m32c | m32r | m32rle \ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ @@ -1285,7 +1285,7 @@ ;; *) - echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 + echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognized" 1>&2 exit 1 ;; esac @@ -1341,6 +1341,10 @@ kernel=linux os=`echo "$basic_os" | sed -e 's|linux|gnu|'` ;; + managarm*) + kernel=managarm + os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'` + ;; *) kernel= os=$basic_os @@ -1754,7 +1758,7 @@ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ - | fiwix* ) + | fiwix* | mlibc* ) ;; # This one is extra strict with allowed versions sco3.2v2 | sco3.2v[4-9]* | sco5v6*) @@ -1762,8 +1766,11 @@ ;; none) ;; + kernel* ) + # Restricted further below + ;; *) - echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 + echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2 exit 1 ;; esac @@ -1772,14 +1779,24 @@ # (given a valid OS), if there is a kernel. case $kernel-$os in linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ - | linux-musl* | linux-relibc* | linux-uclibc* ) + | linux-musl* | linux-relibc* | linux-uclibc* | linux-mlibc* ) ;; uclinux-uclibc* ) ;; - -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) + managarm-mlibc* | managarm-kernel* ) + ;; + -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* ) # These are just libc implementations, not actual OSes, and thus # require a kernel. - echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 + echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2 + exit 1 + ;; + -kernel* ) + echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2 + exit 1 + ;; + *-kernel* ) + echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2 exit 1 ;; kfreebsd*-gnu* | kopensolaris*-gnu*) @@ -1796,7 +1813,7 @@ # Blank kernel with real OS is always fine. ;; *-*) - echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 + echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2 exit 1 ;; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/configure new/ibus-libpinyin-1.15.7/configure --- old/ibus-libpinyin-1.15.5/configure 2023-11-27 08:03:41.000000000 +0100 +++ new/ibus-libpinyin-1.15.7/configure 2024-02-01 05:14:51.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for ibus-libpinyin 1.15.5. +# Generated by GNU Autoconf 2.71 for ibus-libpinyin 1.15.7. # # Report bugs to <https://github.com/libpinyin/ibus-libpinyin/issues/new>. # @@ -622,8 +622,8 @@ # Identity of this package. PACKAGE_NAME='ibus-libpinyin' PACKAGE_TARNAME='ibus-libpinyin' -PACKAGE_VERSION='1.15.5' -PACKAGE_STRING='ibus-libpinyin 1.15.5' +PACKAGE_VERSION='1.15.7' +PACKAGE_STRING='ibus-libpinyin 1.15.7' PACKAGE_BUGREPORT='https://github.com/libpinyin/ibus-libpinyin/issues/new' PACKAGE_URL='' @@ -1479,7 +1479,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ibus-libpinyin 1.15.5 to adapt to many kinds of systems. +\`configure' configures ibus-libpinyin 1.15.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1550,7 +1550,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ibus-libpinyin 1.15.5:";; + short | recursive ) echo "Configuration of ibus-libpinyin 1.15.7:";; esac cat <<\_ACEOF @@ -1725,7 +1725,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ibus-libpinyin configure 1.15.5 +ibus-libpinyin configure 1.15.7 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2181,7 +2181,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ibus-libpinyin $as_me 1.15.5, which was +It was created by ibus-libpinyin $as_me 1.15.7, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3669,7 +3669,7 @@ # Define the identity of the package. PACKAGE='ibus-libpinyin' - VERSION='1.15.5' + VERSION='1.15.7' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -5241,9 +5241,9 @@ # define PACKAGE_VERSION_* variables - PACKAGE_VERSION_MAJOR=$(echo 1.15.5 | cut -d'.' -f1) - PACKAGE_VERSION_MINOR=$(echo 1.15.5 | cut -d'.' -f2) - PACKAGE_VERSION_MICRO=$(echo 1.15.5 | cut -d'.' -f3) + PACKAGE_VERSION_MAJOR=$(echo 1.15.7 | cut -d'.' -f1) + PACKAGE_VERSION_MINOR=$(echo 1.15.7 | cut -d'.' -f2) + PACKAGE_VERSION_MICRO=$(echo 1.15.7 | cut -d'.' -f3) @@ -5253,7 +5253,7 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking nano version" >&5 printf %s "checking nano version... " >&6; } - NANO=$(echo 1.15.5 | cut -d'.' -f4) + NANO=$(echo 1.15.7 | cut -d'.' -f4) if test x"$NANO" = x || test "x$NANO" = "x0" ; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5 @@ -18529,8 +18529,12 @@ fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IBUS" >&5 -printf %s "checking for IBUS... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for + ibus-1.0 >= 1.5.11 +" >&5 +printf %s "checking for + ibus-1.0 >= 1.5.11 +... " >&6; } if test -n "$IBUS_CFLAGS"; then pkg_cv_IBUS_CFLAGS="$IBUS_CFLAGS" @@ -18582,7 +18586,7 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -18591,18 +18595,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - IBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " + IBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " ibus-1.0 >= 1.5.11 " 2>&1` else - IBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " + IBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " ibus-1.0 >= 1.5.11 " 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$IBUS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$IBUS_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements ( + as_fn_error $? "Package requirements ( ibus-1.0 >= 1.5.11 ) were not met: @@ -18615,9 +18619,9 @@ and IBUS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -18630,8 +18634,8 @@ To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details" "$LINENO" 5; } else - IBUS_CFLAGS=$pkg_cv_IBUS_CFLAGS - IBUS_LIBS=$pkg_cv_IBUS_LIBS + IBUS_CFLAGS=$pkg_cv_IBUS_CFLAGS + IBUS_LIBS=$pkg_cv_IBUS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -18640,8 +18644,12 @@ # check sqlite pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SQLITE" >&5 -printf %s "checking for SQLITE... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for + sqlite3 +" >&5 +printf %s "checking for + sqlite3 +... " >&6; } if test -n "$SQLITE_CFLAGS"; then pkg_cv_SQLITE_CFLAGS="$SQLITE_CFLAGS" @@ -18693,7 +18701,7 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -18702,18 +18710,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SQLITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " + SQLITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " sqlite3 " 2>&1` else - SQLITE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " + SQLITE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " sqlite3 " 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SQLITE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SQLITE_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements ( + as_fn_error $? "Package requirements ( sqlite3 ) were not met: @@ -18726,9 +18734,9 @@ and SQLITE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -18741,8 +18749,8 @@ To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details" "$LINENO" 5; } else - SQLITE_CFLAGS=$pkg_cv_SQLITE_CFLAGS - SQLITE_LIBS=$pkg_cv_SQLITE_LIBS + SQLITE_CFLAGS=$pkg_cv_SQLITE_CFLAGS + SQLITE_LIBS=$pkg_cv_SQLITE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -18799,8 +18807,12 @@ pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBPINYIN" >&5 -printf %s "checking for LIBPINYIN... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for + libpinyin >= 2.7.91 +" >&5 +printf %s "checking for + libpinyin >= 2.7.91 +... " >&6; } if test -n "$LIBPINYIN_CFLAGS"; then pkg_cv_LIBPINYIN_CFLAGS="$LIBPINYIN_CFLAGS" @@ -18852,7 +18864,7 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -18861,18 +18873,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBPINYIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " + LIBPINYIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " libpinyin >= 2.7.91 " 2>&1` else - LIBPINYIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " + LIBPINYIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " libpinyin >= 2.7.91 " 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBPINYIN_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBPINYIN_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements ( + as_fn_error $? "Package requirements ( libpinyin >= 2.7.91 ) were not met: @@ -18885,9 +18897,9 @@ and LIBPINYIN_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -18900,11 +18912,11 @@ To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details" "$LINENO" 5; } else - LIBPINYIN_CFLAGS=$pkg_cv_LIBPINYIN_CFLAGS - LIBPINYIN_LIBS=$pkg_cv_LIBPINYIN_LIBS + LIBPINYIN_CFLAGS=$pkg_cv_LIBPINYIN_CFLAGS + LIBPINYIN_LIBS=$pkg_cv_LIBPINYIN_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - enable_libpinyin=yes + enable_libpinyin=yes fi LIBPINYIN_DATADIR=`$PKG_CONFIG --variable=pkgdatadir libpinyin` @@ -19675,8 +19687,8 @@ # check opencc pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OPENCC" >&5 -printf %s "checking for OPENCC... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for opencc >= 1.0.0" >&5 +printf %s "checking for opencc >= 1.0.0... " >&6; } if test -n "$OPENCC_CFLAGS"; then pkg_cv_OPENCC_CFLAGS="$OPENCC_CFLAGS" @@ -19716,7 +19728,7 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -19725,14 +19737,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - OPENCC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "opencc >= 1.0.0" 2>&1` + OPENCC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "opencc >= 1.0.0" 2>&1` else - OPENCC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "opencc >= 1.0.0" 2>&1` + OPENCC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "opencc >= 1.0.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$OPENCC_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$OPENCC_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (opencc >= 1.0.0) were not met: + as_fn_error $? "Package requirements (opencc >= 1.0.0) were not met: $OPENCC_PKG_ERRORS @@ -19743,9 +19755,9 @@ and OPENCC_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -19758,8 +19770,8 @@ To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details" "$LINENO" 5; } else - OPENCC_CFLAGS=$pkg_cv_OPENCC_CFLAGS - OPENCC_LIBS=$pkg_cv_OPENCC_LIBS + OPENCC_CFLAGS=$pkg_cv_OPENCC_CFLAGS + OPENCC_LIBS=$pkg_cv_OPENCC_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -22036,8 +22048,8 @@ # Checks for GSettings. pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GIO2" >&5 -printf %s "checking for GIO2... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gio-2.0 >= 2.26.0" >&5 +printf %s "checking for gio-2.0 >= 2.26.0... " >&6; } if test -n "$GIO2_CFLAGS"; then pkg_cv_GIO2_CFLAGS="$GIO2_CFLAGS" @@ -22077,7 +22089,7 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -22086,14 +22098,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GIO2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0 >= 2.26.0" 2>&1` + GIO2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0 >= 2.26.0" 2>&1` else - GIO2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0 >= 2.26.0" 2>&1` + GIO2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0 >= 2.26.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$GIO2_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$GIO2_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gio-2.0 >= 2.26.0) were not met: + as_fn_error $? "Package requirements (gio-2.0 >= 2.26.0) were not met: $GIO2_PKG_ERRORS @@ -22104,9 +22116,9 @@ and GIO2_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -22119,8 +22131,8 @@ To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details" "$LINENO" 5; } else - GIO2_CFLAGS=$pkg_cv_GIO2_CFLAGS - GIO2_LIBS=$pkg_cv_GIO2_LIBS + GIO2_CFLAGS=$pkg_cv_GIO2_CFLAGS + GIO2_LIBS=$pkg_cv_GIO2_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -22415,8 +22427,12 @@ # check lua pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 -printf %s "checking for LUA... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for + lua >= 5.1 +" >&5 +printf %s "checking for + lua >= 5.1 +... " >&6; } if test -n "$LUA_CFLAGS"; then pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" @@ -22468,7 +22484,7 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -22477,27 +22493,27 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " + LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " lua >= 5.1 " 2>&1` else - LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " + LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " lua >= 5.1 " 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LUA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LUA_PKG_ERRORS" >&5 - has_lua_extension=no + has_lua_extension=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - has_lua_extension=no + has_lua_extension=no else - LUA_CFLAGS=$pkg_cv_LUA_CFLAGS - LUA_LIBS=$pkg_cv_LUA_LIBS + LUA_CFLAGS=$pkg_cv_LUA_CFLAGS + LUA_LIBS=$pkg_cv_LUA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -22507,8 +22523,12 @@ then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 -printf %s "checking for LUA... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for + lua5.1 + " >&5 +printf %s "checking for + lua5.1 + ... " >&6; } if test -n "$LUA_CFLAGS"; then pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" @@ -22560,7 +22580,7 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -22569,27 +22589,27 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " + LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " lua5.1 " 2>&1` else - LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " + LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " lua5.1 " 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LUA_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LUA_PKG_ERRORS" >&5 - enable_lua_extension=no + enable_lua_extension=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - enable_lua_extension=no + enable_lua_extension=no else - LUA_CFLAGS=$pkg_cv_LUA_CFLAGS - LUA_LIBS=$pkg_cv_LUA_LIBS + LUA_CFLAGS=$pkg_cv_LUA_CFLAGS + LUA_LIBS=$pkg_cv_LUA_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -22620,8 +22640,8 @@ # check soup pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBSOUP" >&5 -printf %s "checking for LIBSOUP... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsoup-3.0 >= 3.0" >&5 +printf %s "checking for libsoup-3.0 >= 3.0... " >&6; } if test -n "$LIBSOUP_CFLAGS"; then pkg_cv_LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS" @@ -22661,7 +22681,7 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -22670,14 +22690,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsoup-3.0 >= 3.0" 2>&1` + LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsoup-3.0 >= 3.0" 2>&1` else - LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsoup-3.0 >= 3.0" 2>&1` + LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsoup-3.0 >= 3.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBSOUP_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBSOUP_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libsoup-3.0 >= 3.0) were not met: + as_fn_error $? "Package requirements (libsoup-3.0 >= 3.0) were not met: $LIBSOUP_PKG_ERRORS @@ -22688,9 +22708,9 @@ and LIBSOUP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -22703,8 +22723,8 @@ To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details" "$LINENO" 5; } else - LIBSOUP_CFLAGS=$pkg_cv_LIBSOUP_CFLAGS - LIBSOUP_LIBS=$pkg_cv_LIBSOUP_LIBS + LIBSOUP_CFLAGS=$pkg_cv_LIBSOUP_CFLAGS + LIBSOUP_LIBS=$pkg_cv_LIBSOUP_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -22715,8 +22735,8 @@ # check json-glib pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for JSONGLIB" >&5 -printf %s "checking for JSONGLIB... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for json-glib-1.0 >= 1.0" >&5 +printf %s "checking for json-glib-1.0 >= 1.0... " >&6; } if test -n "$JSONGLIB_CFLAGS"; then pkg_cv_JSONGLIB_CFLAGS="$JSONGLIB_CFLAGS" @@ -22756,7 +22776,7 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -22765,14 +22785,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - JSONGLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "json-glib-1.0 >= 1.0" 2>&1` + JSONGLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "json-glib-1.0 >= 1.0" 2>&1` else - JSONGLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json-glib-1.0 >= 1.0" 2>&1` + JSONGLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json-glib-1.0 >= 1.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$JSONGLIB_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$JSONGLIB_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (json-glib-1.0 >= 1.0) were not met: + as_fn_error $? "Package requirements (json-glib-1.0 >= 1.0) were not met: $JSONGLIB_PKG_ERRORS @@ -22783,9 +22803,9 @@ and JSONGLIB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -22798,8 +22818,8 @@ To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details" "$LINENO" 5; } else - JSONGLIB_CFLAGS=$pkg_cv_JSONGLIB_CFLAGS - JSONGLIB_LIBS=$pkg_cv_JSONGLIB_LIBS + JSONGLIB_CFLAGS=$pkg_cv_JSONGLIB_CFLAGS + JSONGLIB_LIBS=$pkg_cv_JSONGLIB_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -23426,7 +23446,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ibus-libpinyin $as_me 1.15.5, which was +This file was extended by ibus-libpinyin $as_me 1.15.7, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23494,7 +23514,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -ibus-libpinyin config.status 1.15.5 +ibus-libpinyin config.status 1.15.7 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/configure.ac new/ibus-libpinyin-1.15.7/configure.ac --- old/ibus-libpinyin-1.15.5/configure.ac 2023-11-27 07:11:22.000000000 +0100 +++ new/ibus-libpinyin-1.15.7/configure.ac 2024-01-31 02:56:47.000000000 +0100 @@ -22,7 +22,7 @@ m4_define([ibus_released], [1]) m4_define([ibus_major_version], [1]) m4_define([ibus_minor_version], [15]) -m4_define([ibus_micro_version], [5]) +m4_define([ibus_micro_version], [7]) m4_define(ibus_maybe_datestamp, m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/lua/lua-plugin-init.c new/ibus-libpinyin-1.15.7/lua/lua-plugin-init.c --- old/ibus-libpinyin-1.15.5/lua/lua-plugin-init.c 2020-06-16 09:29:42.000000000 +0200 +++ new/ibus-libpinyin-1.15.7/lua/lua-plugin-init.c 2024-01-22 07:04:48.000000000 +0100 @@ -409,7 +409,7 @@ gunichar2 * str = g_utf8_to_utf16(s, l, NULL, &written, NULL); /* not includes trailing-zero */ - luaL_addlstring(&buf, str, written * sizeof(gunichar2)); + luaL_addlstring(&buf, (const char *)str, written * sizeof(gunichar2)); luaL_pushresult(&buf); g_free(str); @@ -419,7 +419,7 @@ static int ime_utf16_to_utf8(lua_State* L){ size_t l; - const gunichar2 * s = luaL_checklstring(L, 1, &l); + const gunichar2 * s = (const gunichar2 *)luaL_checklstring(L, 1, &l); luaL_Buffer buf; luaL_buffinit(L, &buf); Binary files old/ibus-libpinyin-1.15.5/po/fr.gmo and new/ibus-libpinyin-1.15.7/po/fr.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/po/fr.po new/ibus-libpinyin-1.15.7/po/fr.po --- old/ibus-libpinyin-1.15.5/po/fr.po 2023-07-17 10:11:08.000000000 +0200 +++ new/ibus-libpinyin-1.15.7/po/fr.po 2024-02-01 04:32:43.000000000 +0100 @@ -7,14 +7,15 @@ # Xiao Weixuan <veyx.s...@gmail.com>, 2020. # Julien Humbert <julro...@gmail.com>, 2020, 2021. # grimst <grimait...@gmail.com>, 2023. +# Damien Pou <dampato+li...@ik.me>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://github.com/libpinyin/ibus-libpinyin/issues/"; "new\n" "POT-Creation-Date: 2022-04-12 15:07+0800\n" -"PO-Revision-Date: 2023-03-24 15:20+0000\n" -"Last-Translator: grimst <grimait...@gmail.com>\n" +"PO-Revision-Date: 2024-01-16 13:37+0000\n" +"Last-Translator: Damien Pou <dampato+li...@ik.me>\n" "Language-Team: French <https://translate.fedoraproject.org/projects/"; "ibus-libpinyin/main/fr/>\n" "Language: fr\n" @@ -22,7 +23,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 4.15.2\n" +"X-Generator: Weblate 5.3.1\n" #: src/PYMain.cc:111 msgid "Libpinyin input method" @@ -132,9 +133,8 @@ msgstr "Veuillez utiliser «â¯hspnzâ¯Â» pour saisir." #: src/PYTableEditor.cc:294 -#, fuzzy msgid "Please use table code to input." -msgstr "Veuillez utiliser le code de la table lors de la saisie." +msgstr "Veuillez utiliser le code de la table pour la saisie." #: setup/main2.py:471 msgid "Please choose a file" @@ -608,7 +608,6 @@ msgstr "Orientation des candidats" #: setup/ibus-libpinyin-preferences.ui:2220 -#, fuzzy msgid "<b>Input Modes</b>" msgstr "<b>Mode de saisie</b>" @@ -669,7 +668,6 @@ msgstr "<b>Dictionnaire utilisateur</b>" #: setup/ibus-libpinyin-preferences.ui:2487 -#, fuzzy msgid "User Table" msgstr "Table utilisateur" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/setup/config.py new/ibus-libpinyin-1.15.7/setup/config.py --- old/ibus-libpinyin-1.15.5/setup/config.py 2023-11-27 08:03:45.000000000 +0100 +++ new/ibus-libpinyin-1.15.7/setup/config.py 2024-02-01 05:14:54.000000000 +0100 @@ -24,7 +24,7 @@ gettext.install("ibus-libpinyin") def get_version(): - return "1.15.5" + return "1.15.7" def get_longname(): return _("Intelligent Pinyin") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/src/PYEditor.cc new/ibus-libpinyin-1.15.7/src/PYEditor.cc --- old/ibus-libpinyin-1.15.5/src/PYEditor.cc 2023-07-17 10:11:08.000000000 +0200 +++ new/ibus-libpinyin-1.15.7/src/PYEditor.cc 2024-01-30 10:02:01.000000000 +0100 @@ -36,6 +36,9 @@ gboolean Editor::processKeyEvent (guint keyval, guint keycode, guint modifiers) { + if (modifiers & IBUS_MOD4_MASK) + return FALSE; + modifiers &= (IBUS_CONTROL_MASK | IBUS_MOD1_MASK | IBUS_SUPER_MASK | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/src/PYEnglishEditor.cc new/ibus-libpinyin-1.15.7/src/PYEnglishEditor.cc --- old/ibus-libpinyin-1.15.5/src/PYEnglishEditor.cc 2023-07-17 10:11:08.000000000 +0200 +++ new/ibus-libpinyin-1.15.7/src/PYEnglishEditor.cc 2024-01-30 10:02:26.000000000 +0100 @@ -44,6 +44,9 @@ gboolean EnglishEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers) { + if (modifiers & IBUS_MOD4_MASK) + return FALSE; + //IBUS_SHIFT_MASK is removed. modifiers &= (IBUS_CONTROL_MASK | IBUS_MOD1_MASK | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/src/PYExtEditor.cc new/ibus-libpinyin-1.15.7/src/PYExtEditor.cc --- old/ibus-libpinyin-1.15.5/src/PYExtEditor.cc 2023-07-17 10:11:08.000000000 +0200 +++ new/ibus-libpinyin-1.15.7/src/PYExtEditor.cc 2024-01-30 10:03:10.000000000 +0100 @@ -165,6 +165,9 @@ gboolean ExtEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers) { + if (modifiers & IBUS_MOD4_MASK) + return FALSE; + //IBUS_SHIFT_MASK is removed. modifiers &= (IBUS_CONTROL_MASK | IBUS_MOD1_MASK | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/src/PYFallbackEditor.cc new/ibus-libpinyin-1.15.7/src/PYFallbackEditor.cc --- old/ibus-libpinyin-1.15.5/src/PYFallbackEditor.cc 2021-03-09 02:12:41.000000000 +0100 +++ new/ibus-libpinyin-1.15.7/src/PYFallbackEditor.cc 2024-01-30 10:03:38.000000000 +0100 @@ -216,6 +216,9 @@ gboolean FallbackEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers) { + if (modifiers & IBUS_MOD4_MASK) + return FALSE; + gboolean retval = FALSE; modifiers &= (IBUS_CONTROL_MASK | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/src/PYPBopomofoEditor.cc new/ibus-libpinyin-1.15.7/src/PYPBopomofoEditor.cc --- old/ibus-libpinyin-1.15.5/src/PYPBopomofoEditor.cc 2021-01-28 04:05:32.000000000 +0100 +++ new/ibus-libpinyin-1.15.7/src/PYPBopomofoEditor.cc 2024-01-30 10:08:14.000000000 +0100 @@ -191,6 +191,9 @@ BopomofoEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers) { + if (modifiers & IBUS_MOD4_MASK) + return FALSE; + modifiers &= (IBUS_SHIFT_MASK | IBUS_CONTROL_MASK | IBUS_MOD1_MASK | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/src/PYPBopomofoEngine.cc new/ibus-libpinyin-1.15.7/src/PYPBopomofoEngine.cc --- old/ibus-libpinyin-1.15.5/src/PYPBopomofoEngine.cc 2023-07-17 10:11:08.000000000 +0200 +++ new/ibus-libpinyin-1.15.7/src/PYPBopomofoEngine.cc 2023-11-29 04:50:46.000000000 +0100 @@ -106,7 +106,8 @@ * we will let client applications to handle release key event */ return FALSE; } else { - return TRUE; + /* Always return FALSE for the IBUS_RELEASE_MASK. */ + return FALSE; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/src/PYPCloudCandidates.cc new/ibus-libpinyin-1.15.7/src/PYPCloudCandidates.cc --- old/ibus-libpinyin-1.15.5/src/PYPCloudCandidates.cc 2023-07-17 10:11:08.000000000 +0200 +++ new/ibus-libpinyin-1.15.7/src/PYPCloudCandidates.cc 2024-01-31 02:50:27.000000000 +0100 @@ -310,7 +310,7 @@ gchar *getRequestString (const gchar *pinyin, gint number) { assert (m_input_source == CLOUD_INPUT_SOURCE_BAIDU); - const char *BAIDU_URL_TEMPLATE = "http://olime.baidu.com/py?input=%s&inputtype=py&bg=0&ed=%d&result=hanzi&resultcoding=utf-8&ch_en=1&clientinfo=web&version=1";; + const char *BAIDU_URL_TEMPLATE = "https://olime.baidu.com/py?input=%s&inputtype=py&bg=0&ed=%d&result=hanzi&resultcoding=utf-8&ch_en=1&clientinfo=web&version=1";; return g_strdup_printf (BAIDU_URL_TEMPLATE, pinyin, number); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/src/PYPDoublePinyinEditor.cc new/ibus-libpinyin-1.15.7/src/PYPDoublePinyinEditor.cc --- old/ibus-libpinyin-1.15.5/src/PYPDoublePinyinEditor.cc 2023-07-17 10:11:08.000000000 +0200 +++ new/ibus-libpinyin-1.15.7/src/PYPDoublePinyinEditor.cc 2024-01-30 10:04:11.000000000 +0100 @@ -88,6 +88,9 @@ DoublePinyinEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers) { + if (modifiers & IBUS_MOD4_MASK) + return FALSE; + /* handle ';' key */ if (G_UNLIKELY (keyval == IBUS_semicolon)) { if (cmshm_filter (modifiers) == 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/src/PYPFullPinyinEditor.cc new/ibus-libpinyin-1.15.7/src/PYPFullPinyinEditor.cc --- old/ibus-libpinyin-1.15.5/src/PYPFullPinyinEditor.cc 2023-08-23 08:51:16.000000000 +0200 +++ new/ibus-libpinyin-1.15.7/src/PYPFullPinyinEditor.cc 2024-01-30 10:04:29.000000000 +0100 @@ -70,6 +70,9 @@ guint keycode, guint modifiers) { + if (modifiers & IBUS_MOD4_MASK) + return FALSE; + /* handle 'A' - 'Z' key */ if (G_UNLIKELY (IBUS_A <= keyval && keyval <= IBUS_Z)) { if (cmshm_filter (modifiers) == 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/src/PYPPhoneticEditor.cc new/ibus-libpinyin-1.15.7/src/PYPPhoneticEditor.cc --- old/ibus-libpinyin-1.15.5/src/PYPPhoneticEditor.cc 2023-07-17 10:11:08.000000000 +0200 +++ new/ibus-libpinyin-1.15.7/src/PYPPhoneticEditor.cc 2024-01-30 10:04:51.000000000 +0100 @@ -201,6 +201,9 @@ gboolean PhoneticEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers) { + if (modifiers & IBUS_MOD4_MASK) + return FALSE; + return FALSE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/src/PYPPinyinEditor.cc new/ibus-libpinyin-1.15.7/src/PYPPinyinEditor.cc --- old/ibus-libpinyin-1.15.5/src/PYPPinyinEditor.cc 2023-07-17 10:11:08.000000000 +0200 +++ new/ibus-libpinyin-1.15.7/src/PYPPinyinEditor.cc 2024-01-30 10:05:21.000000000 +0100 @@ -172,6 +172,9 @@ PinyinEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers) { + if (modifiers & IBUS_MOD4_MASK) + return FALSE; + modifiers &= (IBUS_SHIFT_MASK | IBUS_CONTROL_MASK | IBUS_MOD1_MASK | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/src/PYPPinyinEngine.cc new/ibus-libpinyin-1.15.7/src/PYPPinyinEngine.cc --- old/ibus-libpinyin-1.15.5/src/PYPPinyinEngine.cc 2023-08-23 09:15:22.000000000 +0200 +++ new/ibus-libpinyin-1.15.7/src/PYPPinyinEngine.cc 2023-11-28 09:09:05.000000000 +0100 @@ -200,7 +200,8 @@ * we will let client applications to handle release key event */ return FALSE; } else { - return TRUE; + /* Always return FALSE for the IBUS_RELEASE_MASK. */ + return FALSE; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/src/PYPSuggestionEditor.cc new/ibus-libpinyin-1.15.7/src/PYPSuggestionEditor.cc --- old/ibus-libpinyin-1.15.5/src/PYPSuggestionEditor.cc 2023-07-17 10:11:08.000000000 +0200 +++ new/ibus-libpinyin-1.15.7/src/PYPSuggestionEditor.cc 2024-01-30 10:05:39.000000000 +0100 @@ -62,6 +62,9 @@ gboolean SuggestionEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers) { + if (modifiers & IBUS_MOD4_MASK) + return FALSE; + //IBUS_SHIFT_MASK is removed. modifiers &= (IBUS_CONTROL_MASK | IBUS_MOD1_MASK | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/src/PYPunctEditor.cc new/ibus-libpinyin-1.15.7/src/PYPunctEditor.cc --- old/ibus-libpinyin-1.15.5/src/PYPunctEditor.cc 2023-07-17 10:11:08.000000000 +0200 +++ new/ibus-libpinyin-1.15.7/src/PYPunctEditor.cc 2024-01-30 10:05:55.000000000 +0100 @@ -145,6 +145,9 @@ gboolean PunctEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers) { + if (modifiers & IBUS_MOD4_MASK) + return FALSE; + modifiers &= (IBUS_SHIFT_MASK | IBUS_CONTROL_MASK | IBUS_MOD1_MASK | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/src/PYTableEditor.cc new/ibus-libpinyin-1.15.7/src/PYTableEditor.cc --- old/ibus-libpinyin-1.15.5/src/PYTableEditor.cc 2023-07-17 10:11:08.000000000 +0200 +++ new/ibus-libpinyin-1.15.7/src/PYTableEditor.cc 2024-01-30 10:06:19.000000000 +0100 @@ -47,6 +47,9 @@ gboolean TableEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers) { + if (modifiers & IBUS_MOD4_MASK) + return FALSE; + //IBUS_SHIFT_MASK is removed. modifiers &= (IBUS_CONTROL_MASK | IBUS_MOD1_MASK | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.15.5/src/libpinyin.xml.in new/ibus-libpinyin-1.15.7/src/libpinyin.xml.in --- old/ibus-libpinyin-1.15.5/src/libpinyin.xml.in 2023-11-27 08:03:44.000000000 +0100 +++ new/ibus-libpinyin-1.15.7/src/libpinyin.xml.in 2024-02-01 05:14:54.000000000 +0100 @@ -4,7 +4,7 @@ <name>org.freedesktop.IBus.Libpinyin</name> <description>Libpinyin Component</description> <exec>${libexecdir}/ibus-engine-libpinyin --ibus</exec> - <version>1.15.5</version> + <version>1.15.7</version> <author>Peng Wu <alexep...@gmail.com></author> <license>GPL</license> <homepage>https://github.com/libpinyin/ibus-libpinyin</homepage>
