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 2022-02-15 23:57:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx5-lua (Old) and /work/SRC/openSUSE:Factory/.fcitx5-lua.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx5-lua" Tue Feb 15 23:57:17 2022 rev:2 rq:954430 version:5.0.5 Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx5-lua/fcitx5-lua.changes 2022-02-09 20:39:30.426420039 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx5-lua.new.1956/fcitx5-lua.changes 2022-02-15 23:57:38.736273042 +0100 @@ -1,0 +2,7 @@ +Mon Feb 14 11:18:11 UTC 2022 - Marguerite Su <i...@marguerite.su> + +- add fcitx5-lua-5.0.5-soname.patch + * dlopen liblua.so.5.4 intead of liblua5.4.so + that comes from devel package + +------------------------------------------------------------------- New: ---- fcitx5-lua-5.0.5-soname.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx5-lua.spec ++++++ --- /var/tmp/diff_new_pack.tvVG5M/_old 2022-02-15 23:57:39.160274212 +0100 +++ /var/tmp/diff_new_pack.tvVG5M/_new 2022-02-15 23:57:39.164274223 +0100 @@ -1,7 +1,7 @@ # # spec file for package fcitx5-lua # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,6 +23,8 @@ License: LGPL-2.1-or-later URL: https://github.com/fcitx/fcitx5-lua Source: https://download.fcitx-im.org/fcitx5/%{name}/%{name}-%{version}.tar.xz +#PATCH-FIX-UPSTREAM dlopen liblua.so.5.4 +Patch: %{name}-5.0.5-soname.patch BuildRequires: cmake BuildRequires: extra-cmake-modules BuildRequires: fcitx5-devel @@ -50,6 +52,7 @@ %prep %setup -q +%patch -p1 %build %cmake ++++++ fcitx5-lua-5.0.5-soname.patch ++++++ diff -urN fcitx5-lua-5.0.5/CMakeLists.txt fcitx5-lua-5.0.5.new/CMakeLists.txt --- fcitx5-lua-5.0.5/CMakeLists.txt 2021-05-04 23:20:57.951634200 +0800 +++ fcitx5-lua-5.0.5.new/CMakeLists.txt 2022-02-14 22:12:37.904355085 +0800 @@ -33,6 +33,27 @@ endif() endif() +function(_RESOLVE_LIBRARY_PATH _FILE_NAME _LIBRARY_PATH) + if (CMAKE_OBJDUMP) + execute_process ( + COMMAND ${CMAKE_OBJDUMP} -p "${_LIBRARY_PATH}" + RESULT_VARIABLE STATUS + OUTPUT_VARIABLE OBJDUMP_RESULT + ERROR_QUIET + ) + string(REGEX REPLACE ".*SONAME +([^ ]+)\n.*$" "\\1" SONAME_OUT "${OBJDUMP_RESULT}") + if (SONAME_OUT) + set(_FILE_NAME_OUT "${SONAME_OUT}") + endif () + endif() + if (NOT _FILE_NAME_OUT) + get_filename_component(_FILE_NAME_OUT "${_LIBRARY_PATH}" NAME) + endif() + set(${_FILE_NAME} ${_FILE_NAME_OUT} PARENT_SCOPE) +endfunction() + +_RESOLVE_LIBRARY_PATH(LUA_LIBRARY_PATH ${LUA_LIBRARY}) + configure_file(config.h.in config.h) include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_definitions(-DFCITX_GETTEXT_DOMAIN=\"fcitx5-lua\") diff -urN fcitx5-lua-5.0.5/config.h.in fcitx5-lua-5.0.5.new/config.h.in --- fcitx5-lua-5.0.5/config.h.in 2020-05-17 13:02:03.974142800 +0800 +++ fcitx5-lua-5.0.5.new/config.h.in 2022-02-14 22:12:37.904355085 +0800 @@ -7,7 +7,7 @@ #ifndef _FCITX5_LUA_CONFIG_H_ #define _FCITX5_LUA_CONFIG_H_ -#cmakedefine LUA_LIBRARY "@LUA_LIBRARY@" +#cmakedefine LUA_LIBRARY_PATH "@LUA_LIBRARY_PATH@" #cmakedefine USE_DLOPEN #endif // _FCITX5_LUA_CONFIG_H_ diff -urN fcitx5-lua-5.0.5/src/addonloader/luaaddonloader.h fcitx5-lua-5.0.5.new/src/addonloader/luaaddonloader.h --- fcitx5-lua-5.0.5/src/addonloader/luaaddonloader.h 2021-03-23 08:10:19.809094400 +0800 +++ fcitx5-lua-5.0.5.new/src/addonloader/luaaddonloader.h 2022-02-14 22:22:02.031855049 +0800 @@ -22,7 +22,7 @@ AddonInstance *load(const AddonInfo &info, AddonManager *manager) override; private: - Library luaLibrary_{LUA_LIBRARY}; + Library luaLibrary_{LUA_LIBRARY_PATH}; }; class LuaAddonLoaderAddon : public AddonInstance {
