From e6a1dc73694c89d030604e4845a007f36aeb661226713b80ac6dc21cd634478d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 18 Jul 2015 11:16:01 +0000 Subject: [PATCH 1/2] Accepting request 317310 from home:MargueriteSu:branches:multimedia:libs OBS-URL: https://build.opensuse.org/request/show/317310 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libquvi?expand=0&rev=20 --- libquvi-0.9.4-lua-5.2.patch | 22 ++++++++++++++++++++++ libquvi.changes | 7 +++++++ libquvi.spec | 3 +++ 3 files changed, 32 insertions(+) create mode 100644 libquvi-0.9.4-lua-5.2.patch diff --git a/libquvi-0.9.4-lua-5.2.patch b/libquvi-0.9.4-lua-5.2.patch new file mode 100644 index 0000000..d76dd7d --- /dev/null +++ b/libquvi-0.9.4-lua-5.2.patch @@ -0,0 +1,22 @@ +Index: libquvi-0.9.4/src/lua/init.c +=================================================================== +--- libquvi-0.9.4.orig/src/lua/init.c ++++ libquvi-0.9.4/src/lua/init.c +@@ -80,10 +80,17 @@ QuviError l_init(_quvi_t q) + return (QUVI_ERROR_LUA_INIT); + + luaL_openlibs(q->handle.lua); ++#if LUA_VERSION_NM < 502 + luaL_register(q->handle.lua, "quvi", quvi_reg_meth); + luaL_register(q->handle.lua, "quvi.http", quvi_http_reg_meth); + luaL_register(q->handle.lua, "quvi.crypto", quvi_crypto_reg_meth); + luaL_register(q->handle.lua, "quvi.base64", quvi_base64_reg_meth); ++#else ++ luaL_newlib(q->handle.lua, quvi_reg_meth); ++ luaL_newlib(q->handle.lua, quvi_http_reg_meth); ++ luaL_newlib(q->handle.lua, quvi_crypto_reg_meth); ++ luaL_newlib(q->handle.lua, quvi_base64_reg_meth); ++#endif + + return (QUVI_OK); + } diff --git a/libquvi.changes b/libquvi.changes index 1222585..6b07567 100644 --- a/libquvi.changes +++ b/libquvi.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Jul 18 02:45:31 UTC 2015 - i@marguerite.su + +- add patch: libquvi-0.9.5-lua-5.2.patch + * compatibility w/ lua 5.2+ + * luaL_register replaced by luaL_newlib + ------------------------------------------------------------------- Tue Mar 10 13:00:17 CET 2015 - sbrabec@suse.cz diff --git a/libquvi.spec b/libquvi.spec index b84b807..df13ad3 100644 --- a/libquvi.spec +++ b/libquvi.spec @@ -29,6 +29,8 @@ Source: http://sourceforge.net/projects/quvi/files/0.9/libquvi/libquvi-0 Source1: %{name}.rpmlintrc # PATCH-FEATURE-OPENSUSE libquvi-stable-build-date.patch sbrabec@suse.cz -- Don't embed build date. Triggers rebuild. Patch0: %{name}-stable-build-date.patch +# PATCH-FIX-UPSTREAM marguerite@opensuse.org -- compatibility for lua 5.2+ +Patch1: %{name}-%{version}-lua-5.2.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -74,6 +76,7 @@ if test -f %{_sourcedir}/%{name}.changes ; then echo "timestamp for BUILD_TIME" >stamp-build-time touch -d "$(sed -n '2s/ - .*$//p' <%{_sourcedir}/%{name}.changes)" stamp-build-time fi +%patch1 -p1 %build export CFLAGS="%{optflags} -DLUA_COMPAT_MODULE" From e21527bee7fa8a6c48986a4ccb5bbc5d8a28b3b87c82279ffc12ae753dedcd4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 14 Aug 2015 08:08:00 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libquvi?expand=0&rev=21 --- libquvi.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libquvi.changes b/libquvi.changes index 6b07567..c3928a3 100644 --- a/libquvi.changes +++ b/libquvi.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Sat Jul 18 02:45:31 UTC 2015 - i@marguerite.su -- add patch: libquvi-0.9.5-lua-5.2.patch +- add patch: libquvi-0.9.4-lua-5.2.patch * compatibility w/ lua 5.2+ * luaL_register replaced by luaL_newlib