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 2026-10-22 15:49:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx5-lua (Old) and /work/SRC/openSUSE:Factory/.fcitx5-lua.new.2252680 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx5-lua" Thu Oct 22 15:49:07 2026 rev:10 rq:1386556 version:5.0.18 Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx5-lua/fcitx5-lua.changes 2025-06-23 15:04:37.492111783 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx5-lua.new.2252680/fcitx5-lua.changes 2026-10-22 15:50:16.917067081 +0200 @@ -1,0 +2,7 @@ +Sat Oct 17 15:56:16 UTC 2026 - Martin Pluskal <[email protected]> + +- Update to 5.0.18 + * Add support for Lua 5.5 + * Prefer pkg-config over CMake for Lua detection + +------------------------------------------------------------------- Old: ---- fcitx5-lua-5.0.15.tar.zst New: ---- fcitx5-lua-5.0.18.tar.zst ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx5-lua.spec ++++++ --- /var/tmp/diff_new_pack.MqMtTW/_old 2026-10-22 15:50:17.718100660 +0200 +++ /var/tmp/diff_new_pack.MqMtTW/_new 2026-10-22 15:50:17.722100827 +0200 @@ -1,7 +1,7 @@ # # spec file for package fcitx5-lua # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,20 @@ Name: fcitx5-lua -Version: 5.0.15 +Version: 5.0.18 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: pkgconfig BuildRequires: zstd +BuildRequires: pkgconfig(Fcitx5Config) +BuildRequires: pkgconfig(Fcitx5Core) >= 5.1.13 +BuildRequires: pkgconfig(Fcitx5Module) +BuildRequires: pkgconfig(Fcitx5Utils) Supplements: fcitx5 %if 0%{?suse_version} >= 1550 BuildRequires: gcc-c++ @@ -35,12 +38,14 @@ BuildRequires: gcc13-c++ %endif %if 0%{?suse_version} >= 1550 -BuildRequires: lua54-devel +BuildRequires: pkgconfig(lua) +BuildRequires: pkgconfig(lua5.4) %else -BuildRequires: lua53-devel +BuildRequires: pkgconfig(lua) +BuildRequires: pkgconfig(lua5.3) %endif %if 0%{?suse_version} <= 1520 -BuildRequires: appstream-glib-devel +BuildRequires: pkgconfig(appstream-glib) %endif %description @@ -48,7 +53,6 @@ %package devel Summary: Development files for fcitx5-lua -Group: Development/Libraries/C and C++ Requires: %{name} = %{version} %description devel ++++++ fcitx5-lua-5.0.15.tar.zst -> fcitx5-lua-5.0.18.tar.zst ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-lua-5.0.15/CMakeLists.txt new/fcitx5-lua-5.0.18/CMakeLists.txt --- old/fcitx5-lua-5.0.15/CMakeLists.txt 2025-06-16 08:25:44.000000000 +0200 +++ new/fcitx5-lua-5.0.18/CMakeLists.txt 2026-09-06 04:40:09.000000000 +0200 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10) -project(fcitx5-lua VERSION 5.0.15) +project(fcitx5-lua VERSION 5.0.18) set(REQUIRED_FCITX_VERSION 5.1.13) find_package(ECM REQUIRED 1.0.0) @@ -9,8 +9,38 @@ include(GNUInstallDirs) include(ECMSetupVersion) include(ECMUninstallTarget) +find_package(PkgConfig REQUIRED) + +# Prefer pkg-config over cmake Lua +pkg_check_modules(PcLua IMPORTED_TARGET "lua>=5.3") +unset(FCITX_LUA_LIBRARY_PATH) +if (TARGET PkgConfig::PcLua) + set(LUA_TARGET PkgConfig::PcLua) + set(FCITX_LUA_HEADER_DIRS ${PcLua_INCLUDE_DIRS}) + get_target_property(FCITX_PC_LUA_LIBRARY_PATHS PkgConfig::PcLua INTERFACE_LINK_LIBRARIES) + foreach(FCITX_PC_LUA_LIBRARY_PATH IN LISTS FCITX_PC_LUA_LIBRARY_PATHS) + get_filename_component(FCITX_PC_LUA_LIBRARY_FILENAME "${FCITX_PC_LUA_LIBRARY_PATH}" NAME) + if (FCITX_PC_LUA_LIBRARY_FILENAME MATCHES "lua") + set(FCITX_LUA_LIBRARY_PATH ${FCITX_PC_LUA_LIBRARY_PATH}) + break() + endif() + endforeach() + if (NOT FCITX_LUA_LIBRARY_PATH) + list(GET FCITX_PC_LUA_LIBRARY_PATHS 0 FCITX_LUA_LIBRARY_PATH) + endif() +else() + find_package(Lua 5.3 REQUIRED) + if (NOT TARGET ImportedLuaLib) + add_library(ImportedLuaLib UNKNOWN IMPORTED ${LUA_LIBRARY}) + set_target_properties(ImportedLuaLib PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES ${LUA_INCLUDE_DIR} + IMPORTED_LOCATION ${LUA_LIBRARY}) + endif() + set(LUA_TARGET ImportedLuaLib) + set(FCITX_LUA_HEADER_DIRS ${LUA_INCLUDE_DIR}) + set(FCITX_LUA_LIBRARY_PATH ${LUA_LIBRARY}) +endif() -find_package(Lua 5.3 REQUIRED) find_package(Fcitx5Core ${REQUIRED_FCITX_VERSION} REQUIRED) find_package(Gettext REQUIRED) find_package(Pthread REQUIRED) @@ -29,12 +59,9 @@ if (USE_DLOPEN) add_library(Lua::_LuaLibrary IMPORTED INTERFACE) set_target_properties(Lua::_LuaLibrary PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES ${LUA_INCLUDE_DIR}) + INTERFACE_INCLUDE_DIRECTORIES ${FCITX_LUA_HEADER_DIRS}) else() - add_library(Lua::_LuaLibrary UNKNOWN IMPORTED ${LUA_LIBRARY}) - set_target_properties(Lua::_LuaLibrary PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES ${LUA_INCLUDE_DIR} - IMPORTED_LOCATION ${LUA_LIBRARY}) + add_library(Lua::_LuaLibrary ALIAS ${LUA_TARGET}) endif() endif() @@ -58,12 +85,12 @@ endfunction() if(USE_DLOPEN) - _RESOLVE_LIBRARY_PATH(LUA_LIBRARY_PATH ${LUA_LIBRARY}) + _RESOLVE_LIBRARY_PATH(LUA_LIBRARY_PATH ${FCITX_LUA_LIBRARY_PATH}) endif() configure_file(config.h.in config.h) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -add_definitions(-DFCITX_GETTEXT_DOMAIN=\"fcitx5-lua\") +add_definitions("-DFCITX_GETTEXT_DOMAIN=\"fcitx5-lua\"") fcitx5_add_i18n_definition() add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-lua-5.0.15/README.md new/fcitx5-lua-5.0.18/README.md --- old/fcitx5-lua-5.0.15/README.md 2025-06-16 08:25:44.000000000 +0200 +++ new/fcitx5-lua-5.0.18/README.md 2026-09-06 04:40:09.000000000 +0200 @@ -2,7 +2,7 @@ ===================================================== Lua support for fcitx. -[](https://jenkins.fcitx-im.org/job/fcitx5-lua/) +[](https://jenkins.fcitx-im.org/job/fcitx5-lua/) [Documentation](https://fcitx.github.io/fcitx5-lua/index.html) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-lua-5.0.15/config.h.in new/fcitx5-lua-5.0.18/config.h.in --- old/fcitx5-lua-5.0.15/config.h.in 2025-06-16 08:25:44.000000000 +0200 +++ new/fcitx5-lua-5.0.18/config.h.in 2026-09-06 04:40:09.000000000 +0200 @@ -7,7 +7,23 @@ #ifndef _FCITX5_LUA_CONFIG_H_ #define _FCITX5_LUA_CONFIG_H_ + #cmakedefine LUA_LIBRARY_PATH "@LUA_LIBRARY_PATH@" #cmakedefine USE_DLOPEN +#ifdef USE_DLOPEN +#include <fcitx-utils/library.h> +#else +#include <cstddef> +#endif + +namespace fcitx { +#ifdef USE_DLOPEN +using LibraryPtr = fcitx::Library*; +#else +using LibraryPtr = std::nullptr_t; +#endif + +} + #endif // _FCITX5_LUA_CONFIG_H_ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-lua-5.0.15/org.fcitx.Fcitx5.Addon.Lua.metainfo.xml.in new/fcitx5-lua-5.0.18/org.fcitx.Fcitx5.Addon.Lua.metainfo.xml.in --- old/fcitx5-lua-5.0.15/org.fcitx.Fcitx5.Addon.Lua.metainfo.xml.in 2025-06-16 08:25:44.000000000 +0200 +++ new/fcitx5-lua-5.0.18/org.fcitx.Fcitx5.Addon.Lua.metainfo.xml.in 2026-09-06 04:40:09.000000000 +0200 @@ -14,6 +14,9 @@ <url type="vcs-browser">https://github.com/fcitx/fcitx5-lua</url> <project_group>Fcitx</project_group> <releases> + <release version="5.0.18" date="2026-09-05"/> + <release version="5.0.17" date="2026-06-19"/> + <release version="5.0.16" date="2026-03-17"/> <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"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-lua-5.0.15/po/LINGUAS new/fcitx5-lua-5.0.18/po/LINGUAS --- old/fcitx5-lua-5.0.15/po/LINGUAS 2025-06-16 08:25:44.000000000 +0200 +++ new/fcitx5-lua-5.0.18/po/LINGUAS 2026-09-06 04:40:09.000000000 +0200 @@ -4,5 +4,6 @@ ja ko ru +sv zh_CN zh_TW diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-lua-5.0.15/po/sv.po new/fcitx5-lua-5.0.18/po/sv.po --- old/fcitx5-lua-5.0.15/po/sv.po 1970-01-01 01:00:00.000000000 +0100 +++ new/fcitx5-lua-5.0.18/po/sv.po 2026-09-06 04:40:09.000000000 +0200 @@ -0,0 +1,38 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the fcitx5-lua package. +# +# Translators: +# Daniel Nylander <[email protected]>, 2026 +# +msgid "" +msgstr "" +"Project-Id-Version: fcitx5-lua\n" +"Report-Msgid-Bugs-To: [email protected]\n" +"POT-Creation-Date: 2026-09-04 20:22+0000\n" +"PO-Revision-Date: 2020-04-01 16:17+0000\n" +"Last-Translator: Daniel Nylander <[email protected]>, 2026\n" +"Language-Team: Swedish (https://app.transifex.com/fcitx/teams/12005/sv/)\n" +"Language: sv\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/addonloader/luaaddonloader.conf.in:3 +#: src/addonloader/luaaddonloader.conf.in.in:2 +msgid "Lua Addon Loader" +msgstr "Laddare för Lua-tillägg" + +#: src/addonloader/luaaddonloader.conf.in:4 +#: src/addonloader/luaaddonloader.conf.in.in:3 +msgid "Lua Addon support" +msgstr "Stöd för Lua-tillägg" + +#: src/imeapi/imeapi.conf.in:3 src/imeapi/imeapi.conf.in.in:2 +msgid "Lua IME API" +msgstr "Lua-API för inmatningsmetoder" + +#: src/imeapi/imeapi.conf.in:4 src/imeapi/imeapi.conf.in.in:3 +msgid "Lua IME API support" +msgstr "Stöd för Lua-API för inmatningsmetoder" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-lua-5.0.15/src/addonloader/base.lua new/fcitx5-lua-5.0.18/src/addonloader/base.lua --- old/fcitx5-lua-5.0.15/src/addonloader/base.lua 2025-06-16 08:25:44.000000000 +0200 +++ new/fcitx5-lua-5.0.18/src/addonloader/base.lua 2026-09-06 04:40:09.000000000 +0200 @@ -82,7 +82,8 @@ local function dump(o) if type(o) == 'table' then local s = '{ ' - for k,v in pairs(o) do + for _k,v in pairs(o) do + local k = _k if type(k) ~= 'number' then k = '"'..k..'"' end s = s .. '['..k..'] = ' .. dump(v) .. ',' end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-lua-5.0.15/src/addonloader/luaaddon.cpp new/fcitx5-lua-5.0.18/src/addonloader/luaaddon.cpp --- old/fcitx5-lua-5.0.15/src/addonloader/luaaddon.cpp 2025-06-16 08:25:44.000000000 +0200 +++ new/fcitx5-lua-5.0.18/src/addonloader/luaaddon.cpp 2026-09-06 04:40:09.000000000 +0200 @@ -5,11 +5,11 @@ * */ #include "luaaddon.h" +#include "config.h" #include "luaaddonstate.h" #include "luahelper.h" #include <exception> #include <fcitx-config/rawconfig.h> -#include <fcitx-utils/library.h> #include <fcitx/addoninfo.h> #include <fcitx/inputcontext.h> #include <memory> @@ -18,7 +18,7 @@ namespace fcitx { -LuaAddon::LuaAddon(Library *luaLibrary, const AddonInfo &info, +LuaAddon::LuaAddon(LibraryPtr luaLibrary, const AddonInfo &info, AddonManager *manager) : instance_(manager->instance()), name_(info.uniqueName()), library_(info.library()), state_(std::make_unique<LuaAddonState>( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-lua-5.0.15/src/addonloader/luaaddon.h new/fcitx5-lua-5.0.18/src/addonloader/luaaddon.h --- old/fcitx5-lua-5.0.15/src/addonloader/luaaddon.h 2025-06-16 08:25:44.000000000 +0200 +++ new/fcitx5-lua-5.0.18/src/addonloader/luaaddon.h 2026-09-06 04:40:09.000000000 +0200 @@ -7,11 +7,11 @@ #ifndef _FCITX5_LUA_ADDONLOADER_LUAADDON_H_ #define _FCITX5_LUA_ADDONLOADER_LUAADDON_H_ +#include "config.h" #include "luaaddon_public.h" #include "luaaddonstate.h" #include "luahelper.h" #include <fcitx-config/rawconfig.h> -#include <fcitx-utils/library.h> #include <fcitx/addoninfo.h> #include <fcitx/addoninstance.h> #include <fcitx/addonmanager.h> @@ -25,7 +25,8 @@ class LuaAddon : public AddonInstance { public: - LuaAddon(Library *luaLibrary, const AddonInfo &info, AddonManager *manager); + LuaAddon(LibraryPtr luaLibrary, const AddonInfo &info, + AddonManager *manager); void reloadConfig() override; @@ -39,7 +40,7 @@ const std::string library_; std::unique_ptr<LuaAddonState> state_; - Library *luaLibrary_; + LibraryPtr luaLibrary_; }; } // namespace fcitx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-lua-5.0.15/src/addonloader/luaaddonloader.cpp new/fcitx5-lua-5.0.18/src/addonloader/luaaddonloader.cpp --- old/fcitx5-lua-5.0.15/src/addonloader/luaaddonloader.cpp 2025-06-16 08:25:44.000000000 +0200 +++ new/fcitx5-lua-5.0.18/src/addonloader/luaaddonloader.cpp 2026-09-06 04:40:09.000000000 +0200 @@ -5,12 +5,10 @@ * */ #include "luaaddonloader.h" -#include "config.h" #include "luaaddon.h" #include "luahelper.h" #include "luastate.h" #include <exception> -#include <fcitx-utils/library.h> #include <fcitx/addoninfo.h> #include <fcitx/addoninstance.h> #include <fcitx/addonmanager.h> @@ -52,7 +50,7 @@ } // Create test state to ensure the function can be resolved. - LuaState testState(luaLibrary_.get()); + LuaState testState(luaLibrary()); } AddonInstance *LuaAddonLoader::load(const AddonInfo &info, @@ -65,7 +63,7 @@ if (info.category() == AddonCategory::Module) { try { auto addon = - std::make_unique<LuaAddon>(luaLibrary_.get(), info, manager); + std::make_unique<LuaAddon>(luaLibrary(), info, manager); return addon.release(); } catch (const std::exception &e) { FCITX_LUA_ERROR() << "Loading lua addon " << info.uniqueName() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-lua-5.0.15/src/addonloader/luaaddonloader.h new/fcitx5-lua-5.0.18/src/addonloader/luaaddonloader.h --- old/fcitx5-lua-5.0.15/src/addonloader/luaaddonloader.h 2025-06-16 08:25:44.000000000 +0200 +++ new/fcitx5-lua-5.0.18/src/addonloader/luaaddonloader.h 2026-09-06 04:40:09.000000000 +0200 @@ -7,14 +7,17 @@ #ifndef _FCITX5_LUA_ADDONLOADER_LUAADDONLOADER_H_ #define _FCITX5_LUA_ADDONLOADER_LUAADDONLOADER_H_ -#include <fcitx-utils/library.h> +#include "config.h" #include <fcitx/addonfactory.h> #include <fcitx/addoninfo.h> #include <fcitx/addoninstance.h> #include <fcitx/addonloader.h> -#include <memory> #include <string> +#ifdef USE_DLOPEN +#include <memory> +#endif + namespace fcitx { class LuaAddonLoader : public AddonLoader { @@ -23,8 +26,14 @@ std::string type() const override { return "Lua"; } AddonInstance *load(const AddonInfo &info, AddonManager *manager) override; +#ifdef USE_DLOPEN + LibraryPtr luaLibrary() const { return luaLibrary_.get(); } + private: std::unique_ptr<Library> luaLibrary_; +#else + LibraryPtr luaLibrary() const { return nullptr; } +#endif }; class LuaAddonLoaderAddon : public AddonInstance { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-lua-5.0.15/src/addonloader/luaaddonstate.cpp new/fcitx5-lua-5.0.18/src/addonloader/luaaddonstate.cpp --- old/fcitx5-lua-5.0.15/src/addonloader/luaaddonstate.cpp 2025-06-16 08:25:44.000000000 +0200 +++ new/fcitx5-lua-5.0.18/src/addonloader/luaaddonstate.cpp 2026-09-06 04:40:09.000000000 +0200 @@ -13,7 +13,6 @@ #include <cstdint> #include <fcitx-config/rawconfig.h> #include <fcitx-utils/handlertable.h> -#include <fcitx-utils/library.h> #include <fcitx-utils/standardpaths.h> #include <fcitx-utils/stringutils.h> #include <fcitx-utils/trackableobject.h> @@ -122,7 +121,7 @@ } // namespace -LuaAddonState::LuaAddonState(Library *luaLibrary, const std::string &name, +LuaAddonState::LuaAddonState(LibraryPtr luaLibrary, const std::string &name, const std::string &library, AddonManager *manager) : instance_(manager->instance()), state_(std::make_unique<LuaState>(luaLibrary)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-lua-5.0.15/src/addonloader/luaaddonstate.h new/fcitx5-lua-5.0.18/src/addonloader/luaaddonstate.h --- old/fcitx5-lua-5.0.15/src/addonloader/luaaddonstate.h 2025-06-16 08:25:44.000000000 +0200 +++ new/fcitx5-lua-5.0.18/src/addonloader/luaaddonstate.h 2026-09-06 04:40:09.000000000 +0200 @@ -7,12 +7,12 @@ #ifndef _FCITX5_LUA_ADDONLOADER_LUAADDONSTATE_H_ #define _FCITX5_LUA_ADDONLOADER_LUAADDONSTATE_H_ +#include "config.h" #include "luahelper.h" #include "luastate.h" #include <exception> #include <fcitx-config/rawconfig.h> #include <fcitx-utils/handlertable.h> -#include <fcitx-utils/library.h> #include <fcitx-utils/macros.h> #include <fcitx-utils/signals.h> #include <fcitx-utils/stringutils.h> @@ -97,7 +97,7 @@ class LuaAddonState { public: - LuaAddonState(Library *luaLibrary, const std::string &name, + LuaAddonState(LibraryPtr luaLibrary, const std::string &name, const std::string &library, AddonManager *manager); operator LuaState *() { return state_.get(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-lua-5.0.15/src/addonloader/luafunc.h new/fcitx5-lua-5.0.18/src/addonloader/luafunc.h --- old/fcitx5-lua-5.0.15/src/addonloader/luafunc.h 2025-06-16 08:25:44.000000000 +0200 +++ new/fcitx5-lua-5.0.18/src/addonloader/luafunc.h 2026-09-06 04:40:09.000000000 +0200 @@ -1,4 +1,8 @@ +#ifdef luaL_openlibs +FOREACH_LUA_FUNCTION(luaL_openselectedlibs) +#else FOREACH_LUA_FUNCTION(luaL_openlibs) +#endif FOREACH_LUA_FUNCTION(luaL_requiref) #ifdef lua_newuserdata FOREACH_LUA_FUNCTION(lua_newuserdatauv) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-lua-5.0.15/src/addonloader/luastate.cpp new/fcitx5-lua-5.0.18/src/addonloader/luastate.cpp --- old/fcitx5-lua-5.0.15/src/addonloader/luastate.cpp 2025-06-16 08:25:44.000000000 +0200 +++ new/fcitx5-lua-5.0.18/src/addonloader/luastate.cpp 2026-09-06 04:40:09.000000000 +0200 @@ -7,7 +7,6 @@ #include "luastate.h" #include "config.h" #include "luahelper.h" -#include <fcitx-utils/library.h> #include <stdexcept> #ifdef USE_DLOPEN @@ -19,7 +18,7 @@ #define FILL_LUA_API(FUNCTION) FUNCTION##_ = GET_LUA_API(FUNCTION) namespace fcitx { -LuaState::LuaState(Library *library) +LuaState::LuaState(LibraryPtr library) : luaLibrary_(library), state_(nullptr, _fcitx_lua_close) { // Resolve all required lua function first. #define FOREACH_LUA_FUNCTION(NAME) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-lua-5.0.15/src/addonloader/luastate.h new/fcitx5-lua-5.0.18/src/addonloader/luastate.h --- old/fcitx5-lua-5.0.15/src/addonloader/luastate.h 2025-06-16 08:25:44.000000000 +0200 +++ new/fcitx5-lua-5.0.18/src/addonloader/luastate.h 2026-09-06 04:40:09.000000000 +0200 @@ -7,8 +7,8 @@ #ifndef _FCITX5_LUA_ADDONLOADER_LUASTATE_H_ #define _FCITX5_LUA_ADDONLOADER_LUASTATE_H_ +#include "config.h" #include "luastate_details.h" -#include <fcitx-utils/library.h> #include <functional> #include <lua.hpp> // IWYU pragma: export #include <memory> @@ -17,7 +17,7 @@ struct LuaState { public: - LuaState(Library *library); + LuaState(LibraryPtr library); #define FOREACH_LUA_FUNCTION DEFINE_LUA_API_FUNCTION #include "luafunc.h" @@ -29,7 +29,7 @@ } private: - Library *luaLibrary_; + LibraryPtr luaLibrary_ [[maybe_unused]]; #define FOREACH_LUA_FUNCTION DECLARE_LUA_FUNCTION_PTR #include "luafunc.h"
