Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package fcitx5-rime for openSUSE:Factory
checked in at 2025-06-23 15:04:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fcitx5-rime (Old)
and /work/SRC/openSUSE:Factory/.fcitx5-rime.new.7067 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx5-rime"
Mon Jun 23 15:04:21 2025 rev:13 rq:1287706 version:5.1.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/fcitx5-rime/fcitx5-rime.changes 2025-01-06
16:06:01.527774757 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx5-rime.new.7067/fcitx5-rime.changes
2025-06-23 15:05:30.542324991 +0200
@@ -1,0 +2,6 @@
+Fri Jun 20 13:52:36 UTC 2025 - Marguerite Su <i...@marguerite.su>
+
+- update to 5.1.10
+ * Make notification less verbose.
+
+-------------------------------------------------------------------
Old:
----
fcitx5-rime-5.1.9.tar.zst
New:
----
fcitx5-rime-5.1.10.tar.zst
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fcitx5-rime.spec ++++++
--- /var/tmp/diff_new_pack.w0J1g7/_old 2025-06-23 15:05:31.382360037 +0200
+++ /var/tmp/diff_new_pack.w0J1g7/_new 2025-06-23 15:05:31.386360204 +0200
@@ -17,7 +17,7 @@
Name: fcitx5-rime
-Version: 5.1.9
+Version: 5.1.10
Release: 0
Summary: RIME support for Fcitx5
License: LGPL-2.1-or-later
@@ -29,7 +29,11 @@
BuildRequires: cmake
BuildRequires: extra-cmake-modules
BuildRequires: fcitx5-devel
+%if 0%{?suse_version} >= 1550
BuildRequires: gcc-c++
+%else
+BuildRequires: gcc13-c++
+%endif
BuildRequires: hicolor-icon-theme
BuildRequires: librime-devel
BuildRequires: pkgconfig
@@ -50,7 +54,11 @@
%patch -P 0 -p1
%build
+%if 0%{?suse_version} == 1500
+%cmake -DCMAKE_CXX_COMPILER=%{_bindir}/g++-13
+%else
%cmake
+%endif
%make_build
%install
++++++ fcitx5-rime-5.1.9.tar.zst -> fcitx5-rime-5.1.10.tar.zst ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-rime-5.1.9/CMakeLists.txt
new/fcitx5-rime-5.1.10/CMakeLists.txt
--- old/fcitx5-rime-5.1.9/CMakeLists.txt 2024-10-08 21:49:05.000000000
+0200
+++ new/fcitx5-rime-5.1.10/CMakeLists.txt 2025-01-23 00:27:38.000000000
+0100
@@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 3.6.0)
-project(fcitx5-rime VERSION 5.1.9)
+project(fcitx5-rime VERSION 5.1.10)
+
+set(REQUIRED_FCITX_VERSION 5.1.12)
find_package(ECM 1.0.0 REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
${CMAKE_MODULE_PATH})
@@ -10,7 +12,7 @@
include(ECMUninstallTarget)
find_package(Gettext REQUIRED)
-find_package(Fcitx5Core 5.1.11 REQUIRED)
+find_package(Fcitx5Core ${REQUIRED_FCITX_VERSION} REQUIRED)
find_package(Fcitx5Module REQUIRED COMPONENTS Notifications)
find_package(PkgConfig REQUIRED)
find_package(Pthread REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/fcitx5-rime-5.1.9/org.fcitx.Fcitx5.Addon.Rime.metainfo.xml.in
new/fcitx5-rime-5.1.10/org.fcitx.Fcitx5.Addon.Rime.metainfo.xml.in
--- old/fcitx5-rime-5.1.9/org.fcitx.Fcitx5.Addon.Rime.metainfo.xml.in
2024-10-08 21:49:05.000000000 +0200
+++ new/fcitx5-rime-5.1.10/org.fcitx.Fcitx5.Addon.Rime.metainfo.xml.in
2025-01-23 00:27:38.000000000 +0100
@@ -14,6 +14,7 @@
<url type="vcs-browser">https://github.com/fcitx/fcitx5-rime</url>
<project_group>Fcitx</project_group>
<releases>
+ <release version="5.1.10" date="2025-01-22"/>
<release version="5.1.9" date="2024-10-08"/>
<release version="5.1.8" date="2024-06-01"/>
<release version="5.1.7" date="2024-05-30"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-rime-5.1.9/src/CMakeLists.txt
new/fcitx5-rime-5.1.10/src/CMakeLists.txt
--- old/fcitx5-rime-5.1.9/src/CMakeLists.txt 2024-10-08 21:49:05.000000000
+0200
+++ new/fcitx5-rime-5.1.10/src/CMakeLists.txt 2025-01-23 00:27:38.000000000
+0100
@@ -4,6 +4,7 @@
rimecandidate.cpp
rimesession.cpp
rimeaction.cpp
+ rimefactory.cpp
)
set(RIME_LINK_LIBRARIES
@@ -22,7 +23,7 @@
add_definitions(-DFCITX_RIME_NO_DBUS)
endif()
-add_library(rime MODULE ${RIME_SOURCES})
+add_fcitx5_addon(rime ${RIME_SOURCES})
target_link_libraries(rime ${RIME_LINK_LIBRARIES})
install(TARGETS rime DESTINATION "${CMAKE_INSTALL_LIBDIR}/fcitx5")
fcitx5_translate_desktop_file(rime.conf.in rime.conf)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-rime-5.1.9/src/rime-addon.conf.in.in
new/fcitx5-rime-5.1.10/src/rime-addon.conf.in.in
--- old/fcitx5-rime-5.1.9/src/rime-addon.conf.in.in 2024-10-08
21:49:05.000000000 +0200
+++ new/fcitx5-rime-5.1.10/src/rime-addon.conf.in.in 2025-01-23
00:27:38.000000000 +0100
@@ -4,12 +4,12 @@
Category=InputMethod
Version=@PROJECT_VERSION@
Library=export:librime
-Type=SharedLibrary
+Type=@FCITX_ADDON_TYPE@
OnDemand=True
Configurable=True
[Addon/Dependencies]
-0=core:5.1.0
+0=core:@REQUIRED_FCITX_VERSION@
[Addon/OptionalDependencies]
0=notifications
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-rime-5.1.9/src/rimeaction.cpp
new/fcitx5-rime-5.1.10/src/rimeaction.cpp
--- old/fcitx5-rime-5.1.9/src/rimeaction.cpp 2024-10-08 21:49:05.000000000
+0200
+++ new/fcitx5-rime-5.1.10/src/rimeaction.cpp 2025-01-23 00:27:38.000000000
+0100
@@ -18,7 +18,7 @@
#include <utility>
#include <vector>
-namespace fcitx {
+namespace fcitx::rime {
namespace {
@@ -161,4 +161,4 @@
std::string SelectAction::optionLabel(InputContext *ic) {
return shortText(ic);
}
-} // namespace fcitx
+} // namespace fcitx::rime
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-rime-5.1.9/src/rimeaction.h
new/fcitx5-rime-5.1.10/src/rimeaction.h
--- old/fcitx5-rime-5.1.9/src/rimeaction.h 2024-10-08 21:49:05.000000000
+0200
+++ new/fcitx5-rime-5.1.10/src/rimeaction.h 2025-01-23 00:27:38.000000000
+0100
@@ -15,7 +15,7 @@
#include <string_view>
#include <vector>
-namespace fcitx {
+namespace fcitx::rime {
class RimeEngine;
@@ -82,6 +82,6 @@
Menu menu_;
};
-} // namespace fcitx
+} // namespace fcitx::rime
#endif // _FCITX_RIMEENGINE_H_
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-rime-5.1.9/src/rimecandidate.cpp
new/fcitx5-rime-5.1.10/src/rimecandidate.cpp
--- old/fcitx5-rime-5.1.9/src/rimecandidate.cpp 2024-10-08 21:49:05.000000000
+0200
+++ new/fcitx5-rime-5.1.10/src/rimecandidate.cpp 2025-01-23
00:27:38.000000000 +0100
@@ -13,7 +13,7 @@
#include <rime_api.h>
#include <stdexcept>
-namespace fcitx {
+namespace fcitx::rime {
RimeCandidateWord::RimeCandidateWord(RimeEngine *engine,
const RimeCandidate &candidate, KeySym
sym,
@@ -205,4 +205,4 @@
api->highlight_candidate(session, index);
}
#endif
-} // namespace fcitx
+} // namespace fcitx::rime
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-rime-5.1.9/src/rimecandidate.h
new/fcitx5-rime-5.1.10/src/rimecandidate.h
--- old/fcitx5-rime-5.1.9/src/rimecandidate.h 2024-10-08 21:49:05.000000000
+0200
+++ new/fcitx5-rime-5.1.10/src/rimecandidate.h 2025-01-23 00:27:38.000000000
+0100
@@ -14,7 +14,7 @@
#include <memory>
#include <vector>
-namespace fcitx {
+namespace fcitx::rime {
class RimeCandidateWord : public CandidateWord {
public:
@@ -129,6 +129,6 @@
mutable std::vector<std::unique_ptr<RimeGlobalCandidateWord>>
globalCandidateWords_;
};
-} // namespace fcitx
+} // namespace fcitx::rime
#endif // _FCITX_RIMECANDIDATE_H_
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-rime-5.1.9/src/rimeengine.cpp
new/fcitx5-rime-5.1.10/src/rimeengine.cpp
--- old/fcitx5-rime-5.1.9/src/rimeengine.cpp 2024-10-08 21:49:05.000000000
+0200
+++ new/fcitx5-rime-5.1.10/src/rimeengine.cpp 2025-01-23 00:27:38.000000000
+0100
@@ -47,9 +47,9 @@
#include <utility>
#include <vector>
-FCITX_DEFINE_LOG_CATEGORY(rime, "rime");
+FCITX_DEFINE_LOG_CATEGORY(rime_log, "rime");
-namespace fcitx {
+namespace fcitx::rime {
namespace {
@@ -261,7 +261,7 @@
// make librime only log to stderr
//
https://github.com/rime/librime/commit/6d1b9b65de4e7784a68a17d10a3e5c900e4fd511
fcitx_rime_traits.log_dir = "";
- switch (rime().logLevel()) {
+ switch (rime_log().logLevel()) {
case NoLog:
fcitx_rime_traits.min_log_level = 4;
break;
@@ -792,6 +792,4 @@
}
}
-} // namespace fcitx
-
-FCITX_ADDON_FACTORY(fcitx::RimeEngineFactory)
+} // namespace fcitx::rime
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-rime-5.1.9/src/rimeengine.h
new/fcitx5-rime-5.1.10/src/rimeengine.h
--- old/fcitx5-rime-5.1.9/src/rimeengine.h 2024-10-08 21:49:05.000000000
+0200
+++ new/fcitx5-rime-5.1.10/src/rimeengine.h 2025-01-23 00:27:38.000000000
+0100
@@ -24,7 +24,6 @@
#include <fcitx-utils/standardpath.h>
#include <fcitx-utils/stringutils.h>
#include <fcitx/action.h>
-#include <fcitx/addonfactory.h>
#include <fcitx/addoninstance.h>
#include <fcitx/addonmanager.h>
#include <fcitx/event.h>
@@ -47,7 +46,7 @@
#include "rimeservice.h"
#endif
-namespace fcitx {
+namespace fcitx::rime {
class RimeState;
class RimeOptionAction;
@@ -89,7 +88,7 @@
Option<bool> preeditCursorPositionAtBeginning{
this, "PreeditCursorPositionAtBeginning",
_("Fix embedded preedit cursor at the beginning of the preedit"),
- !isAndroid() && !isApple()};
+ !isAndroid() && !isApple() && !isEmscripten()};
OptionWithAnnotation<SwitchInputMethodBehavior,
SwitchInputMethodBehaviorI18NAnnotation>
switchInputMethodBehavior{
@@ -234,19 +233,11 @@
std::thread::id mainThreadId_ = std::this_thread::get_id();
RimeState *currentKeyEventState_ = nullptr;
};
+} // namespace fcitx::rime
-class RimeEngineFactory : public AddonFactory {
-public:
- AddonInstance *create(AddonManager *manager) override {
- registerDomain("fcitx5-rime", FCITX_INSTALL_LOCALEDIR);
- return new RimeEngine(manager->instance());
- }
-};
-} // namespace fcitx
-
-FCITX_DECLARE_LOG_CATEGORY(rime);
+FCITX_DECLARE_LOG_CATEGORY(rime_log);
-#define RIME_DEBUG() FCITX_LOGC(rime, Debug)
-#define RIME_ERROR() FCITX_LOGC(rime, Error)
+#define RIME_DEBUG() FCITX_LOGC(rime_log, Debug)
+#define RIME_ERROR() FCITX_LOGC(rime_log, Error)
#endif // _FCITX_RIMEENGINE_H_
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-rime-5.1.9/src/rimefactory.cpp
new/fcitx5-rime-5.1.10/src/rimefactory.cpp
--- old/fcitx5-rime-5.1.9/src/rimefactory.cpp 1970-01-01 01:00:00.000000000
+0100
+++ new/fcitx5-rime-5.1.10/src/rimefactory.cpp 2025-01-23 00:27:38.000000000
+0100
@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: 2024-2024 CSSlayer <wen...@gmail.com>
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
+#include "rimefactory.h"
+#include "rimeengine.h"
+#include <fcitx-utils/i18n.h>
+
+namespace fcitx::rime {
+
+AddonInstance *RimeEngineFactory::create(AddonManager *manager) {
+ registerDomain("fcitx5-rime", FCITX_INSTALL_LOCALEDIR);
+ return new RimeEngine(manager->instance());
+}
+
+} // namespace fcitx::rime
+
+FCITX_ADDON_FACTORY_V2(rime, fcitx::rime::RimeEngineFactory)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-rime-5.1.9/src/rimefactory.h
new/fcitx5-rime-5.1.10/src/rimefactory.h
--- old/fcitx5-rime-5.1.9/src/rimefactory.h 1970-01-01 01:00:00.000000000
+0100
+++ new/fcitx5-rime-5.1.10/src/rimefactory.h 2025-01-23 00:27:38.000000000
+0100
@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: 2024-2024 CSSlayer <wen...@gmail.com>
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+#ifndef _FCITX_RIMEFACTORY_H_
+#define _FCITX_RIMEFACTORY_H_
+
+#include <fcitx/addonfactory.h>
+
+namespace fcitx::rime {
+
+class RimeEngineFactory : public AddonFactory {
+public:
+ AddonInstance *create(AddonManager *manager) override;
+};
+
+} // namespace fcitx::rime
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-rime-5.1.9/src/rimeservice.cpp
new/fcitx5-rime-5.1.10/src/rimeservice.cpp
--- old/fcitx5-rime-5.1.9/src/rimeservice.cpp 2024-10-08 21:49:05.000000000
+0200
+++ new/fcitx5-rime-5.1.10/src/rimeservice.cpp 2025-01-23 00:27:38.000000000
+0100
@@ -9,7 +9,7 @@
#include "rimeengine.h"
#include "rimestate.h"
-namespace fcitx {
+namespace fcitx::rime {
RimeService::RimeService(RimeEngine *engine) : engine_(engine) {
auto dbus = engine->dbus();
@@ -84,4 +84,4 @@
return schemas;
}
-} // namespace fcitx
+} // namespace fcitx::rime
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-rime-5.1.9/src/rimeservice.h
new/fcitx5-rime-5.1.10/src/rimeservice.h
--- old/fcitx5-rime-5.1.9/src/rimeservice.h 2024-10-08 21:49:05.000000000
+0200
+++ new/fcitx5-rime-5.1.10/src/rimeservice.h 2025-01-23 00:27:38.000000000
+0100
@@ -10,7 +10,7 @@
#include <fcitx-utils/dbus/message.h>
#include <fcitx-utils/dbus/objectvtable.h>
-namespace fcitx {
+namespace fcitx::rime {
class RimeEngine;
class RimeState;
@@ -36,6 +36,6 @@
RimeEngine *engine_;
};
-} // namespace fcitx
+} // namespace fcitx::rime
#endif // _FCITX5_RIME_RIMESERVICE_H_
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-rime-5.1.9/src/rimesession.cpp
new/fcitx5-rime-5.1.10/src/rimesession.cpp
--- old/fcitx5-rime-5.1.9/src/rimesession.cpp 2024-10-08 21:49:05.000000000
+0200
+++ new/fcitx5-rime-5.1.10/src/rimesession.cpp 2025-01-23 00:27:38.000000000
+0100
@@ -20,7 +20,7 @@
#include <tuple>
#include <utility>
-namespace fcitx {
+namespace fcitx::rime {
RimeSessionHolder::RimeSessionHolder(RimeSessionPool *pool,
const std::string &program)
@@ -148,4 +148,4 @@
assert(count > 0);
}
-} // namespace fcitx
+} // namespace fcitx::rime
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-rime-5.1.9/src/rimesession.h
new/fcitx5-rime-5.1.10/src/rimesession.h
--- old/fcitx5-rime-5.1.9/src/rimesession.h 2024-10-08 21:49:05.000000000
+0200
+++ new/fcitx5-rime-5.1.10/src/rimesession.h 2025-01-23 00:27:38.000000000
+0100
@@ -17,7 +17,7 @@
#include <tuple>
#include <unordered_map>
-namespace fcitx {
+namespace fcitx::rime {
class RimeEngine;
class RimeSessionPool;
@@ -66,6 +66,6 @@
std::unordered_map<std::string, std::weak_ptr<RimeSessionHolder>>
sessions_;
};
-} // namespace fcitx
+} // namespace fcitx::rime
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-rime-5.1.9/src/rimestate.cpp
new/fcitx5-rime-5.1.10/src/rimestate.cpp
--- old/fcitx5-rime-5.1.9/src/rimestate.cpp 2024-10-08 21:49:05.000000000
+0200
+++ new/fcitx5-rime-5.1.10/src/rimestate.cpp 2025-01-23 00:27:38.000000000
+0100
@@ -38,7 +38,7 @@
#include <utility>
#include <vector>
-namespace fcitx {
+namespace fcitx::rime {
namespace {
@@ -620,4 +620,4 @@
engine_->instance()->showCustomInputMethodInformation(&ic_, labels);
}
}
-} // namespace fcitx
+} // namespace fcitx::rime
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-rime-5.1.9/src/rimestate.h
new/fcitx5-rime-5.1.10/src/rimestate.h
--- old/fcitx5-rime-5.1.9/src/rimestate.h 2024-10-08 21:49:05.000000000
+0200
+++ new/fcitx5-rime-5.1.10/src/rimestate.h 2025-01-23 00:27:38.000000000
+0100
@@ -20,7 +20,7 @@
#define RIME_ASCII_MODE "ascii_mode"
-namespace fcitx {
+namespace fcitx::rime {
class RimeEngine;
@@ -72,6 +72,6 @@
std::vector<std::string> savedOptions_;
std::vector<std::string> changedOptions_;
};
-} // namespace fcitx
+} // namespace fcitx::rime
#endif // _FCITX_RIMESTATE_H_
