Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package fcitx5-sayura for openSUSE:Leap:16.0
checked in at 2025-07-15 17:55:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:16.0/fcitx5-sayura (Old)
and /work/SRC/openSUSE:Leap:16.0/.fcitx5-sayura.new.7373 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx5-sayura"
Tue Jul 15 17:55:10 2025 rev:2 rq:1293347 version:5.1.4
Changes:
--------
--- /work/SRC/openSUSE:Leap:16.0/fcitx5-sayura/fcitx5-sayura.changes
2025-03-19 11:42:46.327769686 +0100
+++ /work/SRC/openSUSE:Leap:16.0/.fcitx5-sayura.new.7373/fcitx5-sayura.changes
2025-07-15 17:55:51.096386138 +0200
@@ -1,0 +2,12 @@
+Sun Jun 22 04:15:34 UTC 2025 - Marguerite Su <i...@marguerite.su>
+
+- update to 5.1.4
+ * fix build with cmake 4.0.0
+
+-------------------------------------------------------------------
+Wed Jan 29 07:16:12 UTC 2025 - Marguerite Su <i...@marguerite.su>
+
+- update to 5.1.3
+ * use addon factory v2
+
+-------------------------------------------------------------------
Old:
----
fcitx5-sayura-5.1.2.tar.zst
New:
----
fcitx5-sayura-5.1.4.tar.zst
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fcitx5-sayura.spec ++++++
--- /var/tmp/diff_new_pack.k7rPia/_old 2025-07-15 17:55:51.332395996 +0200
+++ /var/tmp/diff_new_pack.k7rPia/_new 2025-07-15 17:55:51.336396162 +0200
@@ -1,7 +1,7 @@
#
# spec file for package fcitx5-sayura
#
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: fcitx5-sayura
-Version: 5.1.2
+Version: 5.1.4
Release: 0
Summary: Sinhala input method for Fcitx5
License: GPL-2.0-or-later
@@ -26,7 +26,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: pkgconfig
BuildRequires: zstd
@@ -44,6 +48,9 @@
%setup -q
%build
+%if 0%{?suse_version} < 1550
+export CXX=%{_bindir}/g++-13
+%endif
%cmake
%make_build
++++++ fcitx5-sayura-5.1.2.tar.zst -> fcitx5-sayura-5.1.4.tar.zst ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-sayura-5.1.2/.github/workflows/check.yml
new/fcitx5-sayura-5.1.4/.github/workflows/check.yml
--- old/fcitx5-sayura-5.1.2/.github/workflows/check.yml 2024-04-22
09:58:12.000000000 +0200
+++ new/fcitx5-sayura-5.1.4/.github/workflows/check.yml 2025-06-16
08:26:09.000000000 +0200
@@ -1,5 +1,4 @@
name: CI
-
on:
push:
branches:
@@ -7,10 +6,21 @@
pull_request:
branches:
- master
-
jobs:
+ clang-format:
+ name: Check clang-format
+ runs-on: ubuntu-latest
+ container: archlinux:latest
+ steps:
+ - name: Install dependencies
+ run: |
+ pacman -Syu --noconfirm git clang diffutils
+ git config --global --add safe.directory $GITHUB_WORKSPACE
+ - uses: actions/checkout@v4
+ - uses: fcitx/github-actions@clang-format
check:
name: Build and test
+ needs: clang-format
runs-on: ubuntu-latest
container: archlinux:latest
strategy:
@@ -37,20 +47,15 @@
uses: actions/cache@v4
with:
path: 'fcitx5/**/*.tar.*'
- key: ${{ runner.os }}-${{
hashFiles('fcitx5/src/modules/spell/CMakeLists.txt') }}
+ key: ${{ runner.os }}-${{
hashFiles('fcitx5/src/modules/spell/CMakeLists.txt')
+ }}
- name: Build and Install fcitx5
uses: fcitx/github-actions@cmake
with:
path: fcitx5
cmake-option: >-
- -DENABLE_KEYBOARD=Off
- -DENABLE_X11=Off
- -DENABLE_WAYLAND=Off
- -DENABLE_ENCHANT=Off
- -DENABLE_DBUS=Off
- -DENABLE_SERVER=Off
- -DENABLE_EMOJI=Off
- -DUSE_SYSTEMD=Off
+ -DENABLE_KEYBOARD=Off -DENABLE_X11=Off -DENABLE_WAYLAND=Off
-DENABLE_ENCHANT=Off
+ -DENABLE_DBUS=Off -DENABLE_SERVER=Off -DENABLE_EMOJI=Off
-DUSE_SYSTEMD=Off
- uses: actions/checkout@v4
with:
path: fcitx5-sayura
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-sayura-5.1.2/CMakeLists.txt
new/fcitx5-sayura-5.1.4/CMakeLists.txt
--- old/fcitx5-sayura-5.1.2/CMakeLists.txt 2024-04-22 09:58:12.000000000
+0200
+++ new/fcitx5-sayura-5.1.4/CMakeLists.txt 2025-06-16 08:26:09.000000000
+0200
@@ -1,5 +1,7 @@
-cmake_minimum_required(VERSION 3.0)
-project(fcitx5-sayura VERSION 5.1.2)
+cmake_minimum_required(VERSION 3.10)
+project(fcitx5-sayura VERSION 5.1.4)
+
+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})
include(FeatureSummary)
@@ -7,7 +9,7 @@
include(ECMUninstallTarget)
find_package(PkgConfig REQUIRED)
-find_package(Fcitx5Core REQUIRED)
+find_package(Fcitx5Core ${REQUIRED_FCITX_VERSION} REQUIRED)
find_package(Gettext REQUIRED)
include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cmake")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/fcitx5-sayura-5.1.2/org.fcitx.Fcitx5.Addon.Sayura.metainfo.xml.in
new/fcitx5-sayura-5.1.4/org.fcitx.Fcitx5.Addon.Sayura.metainfo.xml.in
--- old/fcitx5-sayura-5.1.2/org.fcitx.Fcitx5.Addon.Sayura.metainfo.xml.in
2024-04-22 09:58:12.000000000 +0200
+++ new/fcitx5-sayura-5.1.4/org.fcitx.Fcitx5.Addon.Sayura.metainfo.xml.in
2025-06-16 08:26:09.000000000 +0200
@@ -14,6 +14,8 @@
<url type="vcs-browser">https://github.com/fcitx/fcitx5-sayura</url>
<project_group>Fcitx</project_group>
<releases>
+ <release version="5.1.4" date="2025-06-15"/>
+ <release version="5.1.3" date="2025-01-22"/>
<release version="5.1.2" date="2024-04-22"/>
<release version="5.1.1" date="2023-11-01"/>
<release version="5.1.0" date="2023-08-14"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-sayura-5.1.2/src/CMakeLists.txt
new/fcitx5-sayura-5.1.4/src/CMakeLists.txt
--- old/fcitx5-sayura-5.1.2/src/CMakeLists.txt 2024-04-22 09:58:12.000000000
+0200
+++ new/fcitx5-sayura-5.1.4/src/CMakeLists.txt 2025-06-16 08:26:09.000000000
+0200
@@ -1,4 +1,4 @@
-add_library(sayura MODULE sayura.cpp)
+add_fcitx5_addon(sayura sayura.cpp)
target_link_libraries(sayura Fcitx5::Core)
install(TARGETS sayura DESTINATION "${CMAKE_INSTALL_LIBDIR}/fcitx5")
fcitx5_translate_desktop_file(sayura.conf.in sayura.conf)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-sayura-5.1.2/src/sayura-addon.conf.in.in
new/fcitx5-sayura-5.1.4/src/sayura-addon.conf.in.in
--- old/fcitx5-sayura-5.1.2/src/sayura-addon.conf.in.in 2024-04-22
09:58:12.000000000 +0200
+++ new/fcitx5-sayura-5.1.4/src/sayura-addon.conf.in.in 2025-06-16
08:26:09.000000000 +0200
@@ -5,3 +5,6 @@
Library=libsayura
Type=SharedLibrary
OnDemand=True
+
+[Addon/Dependencies]
+0=core:@REQUIRED_FCITX_VERSION@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-sayura-5.1.2/src/sayura.cpp
new/fcitx5-sayura-5.1.4/src/sayura.cpp
--- old/fcitx5-sayura-5.1.2/src/sayura.cpp 2024-04-22 09:58:12.000000000
+0200
+++ new/fcitx5-sayura-5.1.4/src/sayura.cpp 2025-06-16 08:26:09.000000000
+0200
@@ -6,15 +6,31 @@
*
*/
#include "sayura.h"
-#include <deque>
+#include <array>
+#include <cstddef>
+#include <cstdint>
+#include <fcitx-utils/capabilityflags.h>
+#include <fcitx-utils/key.h>
+#include <fcitx-utils/keysym.h>
#include <fcitx-utils/log.h>
+#include <fcitx-utils/textformatflags.h>
#include <fcitx-utils/utf8.h>
+#include <fcitx/addoninstance.h>
+#include <fcitx/event.h>
#include <fcitx/inputcontext.h>
#include <fcitx/inputcontextmanager.h>
+#include <fcitx/inputmethodentry.h>
#include <fcitx/inputpanel.h>
+#include <fcitx/text.h>
+#include <fcitx/userinterface.h>
+#include <string>
+#include <unordered_map>
+#include <vector>
namespace fcitx {
+namespace {
+
struct SayuraConsonant {
uint32_t character;
uint32_t mahaprana;
@@ -87,7 +103,7 @@
}
template <size_t n>
-const std::unordered_map<uint32_t, SayuraConsonant>
+std::unordered_map<uint32_t, SayuraConsonant>
fillConsonantMap(const std::array<SayuraConsonant, n> &data) {
std::unordered_map<uint32_t, SayuraConsonant> result;
for (const auto &item : data) {
@@ -104,23 +120,25 @@
return result;
}
-static const SayuraConsonant *findConsonant(uint32_t c) {
+const SayuraConsonant *findConsonant(uint32_t c) {
static const auto map = fillConsonantMap(consonants);
return findValue(map, c);
}
-static const SayuraConsonant *findConsonantByKey(KeySym sym) {
+const SayuraConsonant *findConsonantByKey(KeySym sym) {
static const auto map = fillKeyMap(consonants);
return findValue(map, sym);
}
-static const SayuraVowel *findVowelByKey(KeySym sym) {
+const SayuraVowel *findVowelByKey(KeySym sym) {
static const auto map = fillKeyMap(vowels);
return findValue(map, sym);
}
bool isConsonant(uint32_t c) { return (c >= 0x0d9a) && (c <= 0x0dc6); }
+} // namespace
+
class SayuraState : public InputContextProperty {
public:
SayuraState(InputContext &ic) : ic_(&ic) {}
@@ -169,7 +187,7 @@
return;
}
- auto first = findConsonant(buffer_.front());
+ const auto *first = findConsonant(buffer_.front());
if (first) {
switch (consonant.key) {
case FcitxKey_w:
@@ -261,19 +279,20 @@
SayuraEngine::~SayuraEngine() {}
-void SayuraEngine::activate(const InputMethodEntry &, InputContextEvent &) {}
+void SayuraEngine::activate(const InputMethodEntry & /*entry*/,
+ InputContextEvent & /*event*/) {}
-void SayuraEngine::deactivate(const InputMethodEntry &,
+void SayuraEngine::deactivate(const InputMethodEntry & /*entry*/,
InputContextEvent &event) {
- auto state = event.inputContext()->propertyFor(&factory_);
+ auto *state = event.inputContext()->propertyFor(&factory_);
state->commitPreedit();
state->updateUI();
}
void SayuraEngine::keyEvent(const InputMethodEntry &entry, KeyEvent &keyEvent)
{
auto key = keyEvent.key();
- auto ic = keyEvent.inputContext();
- auto state = ic->propertyFor(&factory_);
+ auto *ic = keyEvent.inputContext();
+ auto *state = ic->propertyFor(&factory_);
if (keyEvent.isRelease()) {
return;
}
@@ -298,7 +317,7 @@
if (key.states() != KeyState::NoState) {
return;
}
- auto consonant = findConsonantByKey(key.sym());
+ const auto *consonant = findConsonantByKey(key.sym());
if (consonant) {
state->handleConsonant(*consonant);
state->updateUI();
@@ -306,7 +325,7 @@
return;
}
- auto vowel = findVowelByKey(key.sym());
+ const auto *vowel = findVowelByKey(key.sym());
if (vowel) {
state->handleVowel(*vowel);
state->updateUI();
@@ -322,11 +341,12 @@
state->updateUI();
}
-void SayuraEngine::reset(const InputMethodEntry &, InputContextEvent &event) {
- auto state = event.inputContext()->propertyFor(&factory_);
+void SayuraEngine::reset(const InputMethodEntry & /*entry*/,
+ InputContextEvent &event) {
+ auto *state = event.inputContext()->propertyFor(&factory_);
state->reset();
}
} // namespace fcitx
-FCITX_ADDON_FACTORY(fcitx::SayuraFactory);
+FCITX_ADDON_FACTORY_V2(sayura, fcitx::SayuraFactory);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcitx5-sayura-5.1.2/src/sayura.h
new/fcitx5-sayura-5.1.4/src/sayura.h
--- old/fcitx5-sayura-5.1.2/src/sayura.h 2024-04-22 09:58:12.000000000
+0200
+++ new/fcitx5-sayura-5.1.4/src/sayura.h 2025-06-16 08:26:09.000000000
+0200
@@ -10,7 +10,9 @@
#include <fcitx-utils/i18n.h>
#include <fcitx/addonfactory.h>
+#include <fcitx/addoninstance.h>
#include <fcitx/addonmanager.h>
+#include <fcitx/event.h>
#include <fcitx/inputcontextproperty.h>
#include <fcitx/inputmethodengine.h>
#include <fcitx/instance.h>
@@ -29,7 +31,7 @@
void keyEvent(const InputMethodEntry &entry, KeyEvent &keyEvent) override;
void reset(const InputMethodEntry &entry,
InputContextEvent &event) override;
- void deactivate(const fcitx::InputMethodEntry &,
+ void deactivate(const fcitx::InputMethodEntry & /*entry*/,
fcitx::InputContextEvent &event) override;
private:
