Date: Friday, July 31, 2020 @ 19:11:55 Author: felixonmars Revision: 666328
archrelease: copy trunk to community-testing-x86_64 Added: fcitx5-lua/repos/community-testing-x86_64/PKGBUILD (from rev 666327, fcitx5-lua/trunk/PKGBUILD) fcitx5-lua/repos/community-testing-x86_64/unbreak-lua54.patch (from rev 666327, fcitx5-lua/trunk/unbreak-lua54.patch) Deleted: fcitx5-lua/repos/community-testing-x86_64/PKGBUILD ---------------------+ PKGBUILD | 59 +++++++++++++++++++++++++++----------------------- unbreak-lua54.patch | 18 +++++++++++++++ 2 files changed, 51 insertions(+), 26 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-07-31 19:11:37 UTC (rev 666327) +++ PKGBUILD 2020-07-31 19:11:55 UTC (rev 666328) @@ -1,26 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> - -pkgname=fcitx5-lua -pkgver=0.0.0.20200610 -_commit=8ad9929af4ac7eada792a2f4a4c42f0be078c6ad -pkgrel=1 -pkgdesc="Lua support for Fcitx 5" -arch=('x86_64') -url="https://github.com/fcitx/fcitx5-lua" -license=('GPL') -depends=('fcitx5' 'lua53') -makedepends=('extra-cmake-modules') -source=("https://github.com/fcitx/fcitx5-lua/archive/$_commit/fcitx5-lua-$_commit.tar.gz") -sha512sums=('77cfc8084b00a8e306bc52441d43c36fb2bd5456b70bb2133e3752f3fc6f8ae7fadd32dbf4e4c9ccb9b55b10db1708be01c2ecaa60332e22d58966193b9b774a') - -build(){ - cd $pkgname-$_commit - - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib . - make -} - -package() { - cd $pkgname-$_commit - make DESTDIR="$pkgdir" install -} Copied: fcitx5-lua/repos/community-testing-x86_64/PKGBUILD (from rev 666327, fcitx5-lua/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-07-31 19:11:55 UTC (rev 666328) @@ -0,0 +1,33 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +pkgname=fcitx5-lua +pkgver=0.0.0.20200728 +_commit=17c57a79a550a1f94b12a3279e6014ce0f8f1b4e +pkgrel=1 +pkgdesc="Lua support for Fcitx 5" +arch=('x86_64') +url="https://github.com/fcitx/fcitx5-lua" +license=('GPL') +depends=('fcitx5' 'lua') +makedepends=('extra-cmake-modules' 'ninja') +source=("https://github.com/fcitx/fcitx5-lua/archive/$_commit/fcitx5-lua-$_commit.tar.gz" + unbreak-lua54.patch) +sha512sums=('62b694d7406028031eb11bef6350c5c78d46a2a3778a1dbb72608500618e42e64643566c8b06ae7bcf928ccc0db8ff13f284750eef5070cc9343cef717c46bbc' + '74b1fa15c36fd7a58c259fba85876a451d4ca0b154585162235b9ae16a015368da0b9c97d88c591a6cb03cd20357a5b450a6073cc68c8cf8730ed12298401dfa') + +prepare() { + cd $pkgname-$_commit + patch -Rp1 -i ../unbreak-lua54.patch +} + +build(){ + cd $pkgname-$_commit + + cmake -GNinja -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib . + ninja +} + +package() { + cd $pkgname-$_commit + DESTDIR="$pkgdir" ninja install +} Copied: fcitx5-lua/repos/community-testing-x86_64/unbreak-lua54.patch (from rev 666327, fcitx5-lua/trunk/unbreak-lua54.patch) =================================================================== --- unbreak-lua54.patch (rev 0) +++ unbreak-lua54.patch 2020-07-31 19:11:55 UTC (rev 666328) @@ -0,0 +1,18 @@ +diff --git a/src/addonloader/luahelper.h b/src/addonloader/luahelper.h +index 6c57851..0452e6b 100644 +--- a/src/addonloader/luahelper.h ++++ b/src/addonloader/luahelper.h +@@ -91,13 +91,6 @@ constexpr char kLuaModuleName[] = "__fcitx_luaaddon"; + + LuaAddonState *GetLuaAddonState(lua_State *lua); + +-// These functions are required for GetLuaAddonState. +-extern decltype(&::lua_getglobal) _fcitx_lua_getglobal; +-extern decltype(&::lua_touserdata) _fcitx_lua_touserdata; +-extern decltype(&::lua_settop) _fcitx_lua_settop; +-extern decltype(&::lua_close) _fcitx_lua_close; +-extern decltype(&::luaL_newstate) _fcitx_luaL_newstate; +- + FCITX_DECLARE_LOG_CATEGORY(lua_log); + #define FCITX_LUA_INFO() FCITX_LOGC(::fcitx::lua_log, Info) + #define FCITX_LUA_WARN() FCITX_LOGC(::fcitx::lua_log, Warn)