Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package fcitx5-lua for openSUSE:Factory 
checked in at 2025-06-23 15:04:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fcitx5-lua (Old)
 and      /work/SRC/openSUSE:Factory/.fcitx5-lua.new.7067 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "fcitx5-lua"

Mon Jun 23 15:04:01 2025 rev:9 rq:1287538 version:5.0.15

Changes:
--------
--- /work/SRC/openSUSE:Factory/fcitx5-lua/fcitx5-lua.changes    2025-01-29 
16:18:01.422493314 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx5-lua.new.7067/fcitx5-lua.changes  
2025-06-23 15:04:37.492111783 +0200
@@ -1,0 +2,6 @@
+Sat Jun 21 08:02:57 UTC 2025 - Marguerite Su <i...@marguerite.su>
+
+- update version 5.0.15
+  * Port to standardpaths
+
+-------------------------------------------------------------------

Old:
----
  fcitx5-lua-5.0.14.tar.zst

New:
----
  fcitx5-lua-5.0.15.tar.zst

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ fcitx5-lua.spec ++++++
--- /var/tmp/diff_new_pack.iVQHdL/_old  2025-06-23 15:04:38.116137817 +0200
+++ /var/tmp/diff_new_pack.iVQHdL/_new  2025-06-23 15:04:38.116137817 +0200
@@ -17,19 +17,24 @@
 
 
 Name:           fcitx5-lua
-Version:        5.0.14
+Version:        5.0.15
 Release:        0
 Summary:        Lua support for fcitx
 License:        LGPL-2.1-or-later
+Group:          System/I18n/Chinese
 URL:            https://github.com/fcitx/fcitx5-lua
 Source:         
https://download.fcitx-im.org/fcitx5/%{name}/%{name}-%{version}.tar.zst
 BuildRequires:  cmake
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fcitx5-devel
-BuildRequires:  gcc-c++
 BuildRequires:  zstd
 Supplements:    fcitx5
 %if 0%{?suse_version} >= 1550
+BuildRequires:  gcc-c++
+%else
+BuildRequires:  gcc13-c++
+%endif
+%if 0%{?suse_version} >= 1550
 BuildRequires:  lua54-devel
 %else
 BuildRequires:  lua53-devel
@@ -53,6 +58,10 @@
 %setup -q
 
 %build
+%if 0%{?suse_version} < 1550
+export CC=%{_bindir}/gcc-13
+export CXX=%{_bindir}/g++-13
+%endif
 %cmake
 %make_build
 

++++++ fcitx5-lua-5.0.14.tar.zst -> fcitx5-lua-5.0.15.tar.zst ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fcitx5-lua-5.0.14/CMakeLists.txt 
new/fcitx5-lua-5.0.15/CMakeLists.txt
--- old/fcitx5-lua-5.0.14/CMakeLists.txt        2025-01-23 00:27:30.000000000 
+0100
+++ new/fcitx5-lua-5.0.15/CMakeLists.txt        2025-06-16 08:25:44.000000000 
+0200
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10)
-project(fcitx5-lua VERSION 5.0.14)
+project(fcitx5-lua VERSION 5.0.15)
 
-set(REQUIRED_FCITX_VERSION 5.1.12)
+set(REQUIRED_FCITX_VERSION 5.1.13)
 find_package(ECM REQUIRED 1.0.0)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" 
${CMAKE_MODULE_PATH})
 
@@ -19,6 +19,10 @@
 option(USE_DLOPEN "Use dlopen to load lua library." On)
 option(ENABLE_TEST "Build Test" On)
 
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
 
include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cmake")
 
 if (NOT TARGET Lua::_LuaLibrary)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/fcitx5-lua-5.0.14/org.fcitx.Fcitx5.Addon.Lua.metainfo.xml.in 
new/fcitx5-lua-5.0.15/org.fcitx.Fcitx5.Addon.Lua.metainfo.xml.in
--- old/fcitx5-lua-5.0.14/org.fcitx.Fcitx5.Addon.Lua.metainfo.xml.in    
2025-01-23 00:27:30.000000000 +0100
+++ new/fcitx5-lua-5.0.15/org.fcitx.Fcitx5.Addon.Lua.metainfo.xml.in    
2025-06-16 08:25:44.000000000 +0200
@@ -14,6 +14,7 @@
   <url type="vcs-browser">https://github.com/fcitx/fcitx5-lua</url>
   <project_group>Fcitx</project_group>
   <releases>
+    <release version="5.0.15" date="2025-06-15"/>
     <release version="5.0.14" date="2025-01-22"/>
     <release version="5.0.13" date="2024-04-22"/>
     <release version="5.0.12" date="2024-01-02"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fcitx5-lua-5.0.14/src/addonloader/luaaddonstate.cpp 
new/fcitx5-lua-5.0.15/src/addonloader/luaaddonstate.cpp
--- old/fcitx5-lua-5.0.14/src/addonloader/luaaddonstate.cpp     2025-01-23 
00:27:30.000000000 +0100
+++ new/fcitx5-lua-5.0.15/src/addonloader/luaaddonstate.cpp     2025-06-16 
08:25:44.000000000 +0200
@@ -14,7 +14,7 @@
 #include <fcitx-config/rawconfig.h>
 #include <fcitx-utils/handlertable.h>
 #include <fcitx-utils/library.h>
-#include <fcitx-utils/standardpath.h>
+#include <fcitx-utils/standardpaths.h>
 #include <fcitx-utils/stringutils.h>
 #include <fcitx-utils/trackableobject.h>
 #include <fcitx-utils/utf8.h>
@@ -23,6 +23,7 @@
 #include <fcitx/inputcontext.h>
 #include <fcitx/instance.h>
 #include <fcntl.h>
+#include <filesystem>
 #include <functional>
 #include <memory>
 #include <stdexcept>
@@ -129,8 +130,8 @@
         throw std::runtime_error("Failed to create lua state.");
     }
 
-    auto path = StandardPath::global().locate(
-        StandardPath::Type::PkgData,
+    auto path = StandardPaths::global().locate(
+        StandardPathsType::PkgData,
         stringutils::joinPath("lua", name, library));
     if (path.empty()) {
         throw std::runtime_error("Couldn't find lua source.");
@@ -178,7 +179,7 @@
     };
     luaL_requiref(state_, "fcitx.core", open_fcitx_core, false);
     luaL_requiref(state_, "fcitx", open_fcitx, false);
-    if (int rv = luaL_loadfile(state_, path.data()); rv != 0) {
+    if (int rv = luaL_loadfile(state_, path.string().c_str()); rv != 0) {
         LuaPError(rv, "luaL_loadfilex() failed");
         LuaPrintError(*this);
         throw std::runtime_error("Failed to load lua source.");
@@ -473,11 +474,14 @@
 LuaAddonState::standardPathLocateImpl(int type, const char *path,
                                       const char *suffix) {
     std::vector<std::string> result;
-    auto files = StandardPath::global().multiOpen(
-        static_cast<StandardPath::Type>(type), path, O_RDONLY,
-        filter::Suffix(suffix));
+    auto files = StandardPaths::global().locate(
+        static_cast<StandardPathsType>(type), path,
+        [suffix](const std::filesystem::path &file) {
+            return file.string().ends_with(suffix);
+        });
+    result.reserve(files.size());
     for (const auto &file : files) {
-        result.push_back(file.second.path());
+        result.push_back(file.second.string());
     }
     return {std::move(result)};
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fcitx5-lua-5.0.14/test/testlua.cpp 
new/fcitx5-lua-5.0.15/test/testlua.cpp
--- old/fcitx5-lua-5.0.14/test/testlua.cpp      2025-01-23 00:27:30.000000000 
+0100
+++ new/fcitx5-lua-5.0.15/test/testlua.cpp      2025-06-16 08:25:44.000000000 
+0200
@@ -8,26 +8,35 @@
 #include "testdir.h"
 #include "testfrontend_public.h"
 #include "testim_public.h"
+#include <cassert>
+#include <cstdint>
+#include <cstring>
+#include <fcitx-config/rawconfig.h>
 #include <fcitx-utils/eventdispatcher.h>
+#include <fcitx-utils/key.h>
+#include <fcitx-utils/keysym.h>
 #include <fcitx-utils/log.h>
-#include <fcitx-utils/standardpath.h>
+#include <fcitx-utils/macros.h>
+#include <fcitx-utils/standardpaths.h>
 #include <fcitx-utils/testing.h>
 #include <fcitx/addonmanager.h>
+#include <fcitx/event.h>
+#include <fcitx/inputmethodgroup.h>
 #include <fcitx/inputmethodmanager.h>
 #include <fcitx/instance.h>
-#include <iostream>
+#include <string>
 #include <thread>
 
 using namespace fcitx;
 
 void scheduleEvent(EventDispatcher *dispatcher, Instance *instance) {
     dispatcher->schedule([instance]() {
-        auto luaaddonloader =
+        auto *luaaddonloader =
             instance->addonManager().addon("luaaddonloader", true);
         FCITX_ASSERT(luaaddonloader);
-        auto luaaddon = instance->addonManager().addon("testlua");
+        auto *luaaddon = instance->addonManager().addon("testlua");
         FCITX_ASSERT(luaaddon);
-        auto imeapi = instance->addonManager().addon("imeapi");
+        auto *imeapi = instance->addonManager().addon("imeapi");
         FCITX_ASSERT(imeapi);
     });
     dispatcher->schedule([dispatcher, instance]() {
@@ -39,9 +48,9 @@
         group.setDefaultInputMethod("testim");
         instance->inputMethodManager().setGroup(group);
 
-        auto testfrontend = instance->addonManager().addon("testfrontend");
-        auto testim = instance->addonManager().addon("testim");
-        auto luaaddon = instance->addonManager().addon("testlua");
+        auto *testfrontend = instance->addonManager().addon("testfrontend");
+        auto *testim = instance->addonManager().addon("testim");
+        auto *luaaddon = instance->addonManager().addon("testlua");
         testim->call<ITestIM::setHandler>(
             [](const InputMethodEntry &, KeyEvent &keyEvent) {
                 if (keyEvent.key().states() != KeyState::NoState ||
@@ -56,7 +65,7 @@
             });
         auto uuid =
             testfrontend->call<ITestFrontend::createInputContext>("testapp");
-        auto ic = instance->inputContextManager().findByUUID(uuid);
+        auto *ic = instance->inputContextManager().findByUUID(uuid);
         FCITX_ASSERT(ic);
 
         // Test with the converter in test.lua
@@ -125,11 +134,10 @@
 void runInstance() {}
 
 int main() {
-    setupTestingEnvironment(
-        TESTING_BINARY_DIR,
-        {"src/addonloader", StandardPath::fcitxPath("addondir")},
+    setupTestingEnvironmentPath(
+        TESTING_BINARY_DIR, {"bin"},
         {"test", TESTING_SOURCE_DIR "/test",
-         StandardPath::fcitxPath("pkgdatadir", "testing")});
+         StandardPaths::fcitxPath("pkgdatadir", "testing")});
 
     fcitx::Log::setLogRule("default=5,lua=5");
     char arg0[] = "testlua";
@@ -137,8 +145,6 @@
     char arg2[] = "--enable=testim,testfrontend,luaaddonloader,imeapi,testlua";
     char *argv[] = {arg0, arg1, arg2};
     Instance instance(FCITX_ARRAY_SIZE(argv), argv);
-    setenv("FCITX_DATA_HOME", "/Invalid/Path", 1);
-    setenv("FCITX_CONFIG_HOME", "/Invalid/Path", 1);
     instance.addonManager().registerDefaultLoader(nullptr);
     EventDispatcher dispatcher;
     dispatcher.attach(&instance.eventLoop());

Reply via email to