Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package fcitx5-chewing for openSUSE:Factory
checked in at 2025-01-29 16:17:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fcitx5-chewing (Old)
and /work/SRC/openSUSE:Factory/.fcitx5-chewing.new.2316 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx5-chewing"
Wed Jan 29 16:17:32 2025 rev:11 rq:1241093 version:5.1.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/fcitx5-chewing/fcitx5-chewing.changes
2025-01-12 11:28:47.226543618 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx5-chewing.new.2316/fcitx5-chewing.changes
2025-01-29 16:18:04.730630500 +0100
@@ -1,0 +2,7 @@
+Wed Jan 29 06:59:56 UTC 2025 - Marguerite Su <i...@marguerite.su>
+
+- update to 5.1.7
+ * Use addon factory v2
+ * Do not include keysymgen.h
+
+-------------------------------------------------------------------
Old:
----
fcitx5-chewing-5.1.6.tar.zst
New:
----
fcitx5-chewing-5.1.7.tar.zst
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fcitx5-chewing.spec ++++++
--- /var/tmp/diff_new_pack.MABkOU/_old 2025-01-29 16:18:05.546664340 +0100
+++ /var/tmp/diff_new_pack.MABkOU/_new 2025-01-29 16:18:05.546664340 +0100
@@ -17,7 +17,7 @@
Name: fcitx5-chewing
-Version: 5.1.6
+Version: 5.1.7
Release: 0
Summary: Chewing Wrapper for Fcitx5
License: GPL-2.0-or-later
++++++ fcitx5-chewing-5.1.6.tar.zst -> fcitx5-chewing-5.1.7.tar.zst ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-chewing-5.1.6/CMakeLists.txt
new/fcitx5-chewing-5.1.7/CMakeLists.txt
--- old/fcitx5-chewing-5.1.6/CMakeLists.txt 2024-10-08 21:48:27.000000000
+0200
+++ new/fcitx5-chewing-5.1.7/CMakeLists.txt 2025-01-23 00:27:18.000000000
+0100
@@ -1,11 +1,12 @@
cmake_minimum_required(VERSION 3.6)
-project(fcitx5-chewing VERSION 5.1.6)
+project(fcitx5-chewing VERSION 5.1.7)
+set(REQUIRED_FCITX_VERSION 5.1.12)
find_package(ECM REQUIRED 1.0.0)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
${CMAKE_MODULE_PATH})
find_package(PkgConfig REQUIRED)
-find_package(Fcitx5Core 5.1.9 REQUIRED)
+find_package(Fcitx5Core ${REQUIRED_FCITX_VERSION} REQUIRED)
find_package(Fcitx5Module REQUIRED COMPONENTS TestFrontend)
find_package(Gettext REQUIRED)
include(FeatureSummary)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/fcitx5-chewing-5.1.6/org.fcitx.Fcitx5.Addon.Chewing.metainfo.xml.in
new/fcitx5-chewing-5.1.7/org.fcitx.Fcitx5.Addon.Chewing.metainfo.xml.in
--- old/fcitx5-chewing-5.1.6/org.fcitx.Fcitx5.Addon.Chewing.metainfo.xml.in
2024-10-08 21:48:27.000000000 +0200
+++ new/fcitx5-chewing-5.1.7/org.fcitx.Fcitx5.Addon.Chewing.metainfo.xml.in
2025-01-23 00:27:18.000000000 +0100
@@ -14,6 +14,7 @@
<url type="vcs-browser">https://github.com/fcitx/fcitx5-chewing</url>
<project_group>Fcitx</project_group>
<releases>
+ <release version="5.1.7" date="2025-01-22"/>
<release version="5.1.6" date="2024-10-08"/>
<release version="5.1.5" date="2024-06-12"/>
<release version="5.1.4" date="2024-05-30"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-chewing-5.1.6/src/CMakeLists.txt
new/fcitx5-chewing-5.1.7/src/CMakeLists.txt
--- old/fcitx5-chewing-5.1.6/src/CMakeLists.txt 2024-10-08 21:48:27.000000000
+0200
+++ new/fcitx5-chewing-5.1.7/src/CMakeLists.txt 2025-01-23 00:27:18.000000000
+0100
@@ -1,7 +1,7 @@
set(CHEWING_SOURCES
eim.cpp
)
-add_library(chewing MODULE ${CHEWING_SOURCES})
+add_fcitx5_addon(chewing ${CHEWING_SOURCES})
target_link_libraries(chewing Fcitx5::Core Fcitx5::Config ${CHEWING_TARGET})
target_compile_definitions(chewing PRIVATE
FCITX_GETTEXT_DOMAIN=\"fcitx5-chewing\")
fcitx5_add_i18n_definition(TARGETS chewing)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-chewing-5.1.6/src/chewing-addon.conf.in.in
new/fcitx5-chewing-5.1.7/src/chewing-addon.conf.in.in
--- old/fcitx5-chewing-5.1.6/src/chewing-addon.conf.in.in 2024-10-08
21:48:27.000000000 +0200
+++ new/fcitx5-chewing-5.1.7/src/chewing-addon.conf.in.in 2025-01-23
00:27:18.000000000 +0100
@@ -8,6 +8,9 @@
Configurable=True
Library=libchewing
+[Addon/Dependencies]
+0=core:@REQUIRED_FCITX_VERSION@
+
[Addon/OptionalDependencies]
0=chttrans
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-chewing-5.1.6/src/eim.cpp
new/fcitx5-chewing-5.1.7/src/eim.cpp
--- old/fcitx5-chewing-5.1.6/src/eim.cpp 2024-10-08 21:48:27.000000000
+0200
+++ new/fcitx5-chewing-5.1.7/src/eim.cpp 2025-01-23 00:27:18.000000000
+0100
@@ -6,8 +6,10 @@
*
*/
#include "eim.h"
+#include <chewing.h>
#include <cstdarg>
-#include <fcitx-utils/keysymgen.h>
+#include <cstdio>
+#include <fcitx-utils/keysym.h>
#include <fcitx-utils/log.h>
#include <fcitx-utils/utf8.h>
#include <fcitx/candidatelist.h>
@@ -20,6 +22,7 @@
#include <fcitx/userinterfacemanager.h>
#include <memory>
#include <utility>
+#include <vector>
FCITX_DEFINE_LOG_CATEGORY(chewing_log, "chewing");
#define CHEWING_DEBUG() FCITX_LOGC(chewing_log, Debug)
@@ -445,7 +448,8 @@
CHEWING_DEBUG() << "KeyEvent: " << keyEvent.key().toString();
if (handleCandidateKeyEvent(keyEvent)) {
- return keyEvent.filterAndAccept();
+ keyEvent.filterAndAccept();
+ return;
}
if (keyEvent.key().check(FcitxKey_space)) {
@@ -462,7 +466,8 @@
// Workaround a bug in libchewing fixed in 2017 but never has
// stable release.
if (zuin.size() >= 9) {
- return keyEvent.filterAndAccept();
+ keyEvent.filterAndAccept();
+ return;
}
}
chewing_handle_Default(ctx, scan_code);
@@ -476,7 +481,8 @@
if ((chewing_buffer_Check(ctx)) == 0 &&
(chewing_bopomofo_Check(ctx) == 0)) {
keyEvent.filterAndAccept();
- return reset(entry, keyEvent);
+ reset(entry, keyEvent);
+ return;
}
} else if (keyEvent.key().check(FcitxKey_Escape)) {
chewing_handle_Esc(ctx);
@@ -489,7 +495,8 @@
if ((chewing_buffer_Check(ctx)) == 0 &&
(chewing_bopomofo_Check(ctx) == 0)) {
keyEvent.filterAndAccept();
- return reset(entry, keyEvent);
+ reset(entry, keyEvent);
+ return;
}
} else if (keyEvent.key().check(FcitxKey_Up)) {
chewing_handle_Up(ctx);
@@ -659,4 +666,4 @@
} // namespace fcitx
-FCITX_ADDON_FACTORY(fcitx::ChewingEngineFactory);
+FCITX_ADDON_FACTORY_V2(chewing, fcitx::ChewingEngineFactory);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-chewing-5.1.6/src/eim.h
new/fcitx5-chewing-5.1.7/src/eim.h
--- old/fcitx5-chewing-5.1.6/src/eim.h 2024-10-08 21:48:27.000000000 +0200
+++ new/fcitx5-chewing-5.1.7/src/eim.h 2025-01-23 00:27:18.000000000 +0100
@@ -8,20 +8,26 @@
#define _FCITX5_CHEWING_EIM_H_
#include <chewing.h>
+#include <cstddef>
#include <fcitx-config/configuration.h>
#include <fcitx-config/enum.h>
#include <fcitx-config/iniparser.h>
#include <fcitx-config/option.h>
#include <fcitx-config/rawconfig.h>
#include <fcitx-utils/i18n.h>
+#include <fcitx-utils/misc.h>
#include <fcitx-utils/trackableobject.h>
#include <fcitx/addonfactory.h>
+#include <fcitx/addoninstance.h>
#include <fcitx/addonmanager.h>
#include <fcitx/candidatelist.h>
#include <fcitx/event.h>
#include <fcitx/inputcontext.h>
#include <fcitx/inputmethodengine.h>
#include <fcitx/instance.h>
+#include <fcitx/text.h>
+#include <string>
+#include <vector>
namespace fcitx {
@@ -122,7 +128,7 @@
}
private:
- static inline std::vector<ChewingLayout> supportedLayouts() {
+ static std::vector<ChewingLayout> supportedLayouts() {
std::vector<ChewingLayout> supported = {ChewingLayout::Default};
auto defaultNum = chewing_KBStr2Num(builtin_keymaps[0]);
for (size_t i = 1; i < ChewingLayoutI18NAnnotation::enumLength; i++) {
