From 021ad16f55e46221f5fc2956c4d0da164a89147c159ad193e94c265a2ee0bc30 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Thu, 30 Apr 2020 12:53:51 +0000 Subject: [PATCH] Accepting request 799225 from home:plater - Replaced luabins.patch with luaL_Reg-not-luaL_reg.patch sent upstream via https://github.com/Aegisub/Aegisub/issues/182 OBS-URL: https://build.opensuse.org/request/show/799225 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=66 --- _service | 2 +- aegisub-3.2.2+git20180710.tar.gz | 3 - aegisub-boost169.patch | 82 -------------- aegisub-git-version.patch | 8 -- aegisub.changes | 6 + aegisub.spec | 5 +- luaL_Reg-not-luaL_reg.patch | 35 ++++++ luabins.patch | 182 ------------------------------- 8 files changed, 45 insertions(+), 278 deletions(-) delete mode 100644 aegisub-3.2.2+git20180710.tar.gz delete mode 100644 aegisub-boost169.patch delete mode 100644 aegisub-git-version.patch create mode 100644 luaL_Reg-not-luaL_reg.patch delete mode 100644 luabins.patch diff --git a/_service b/_service index b97fe2d..6b79367 100644 --- a/_service +++ b/_service @@ -14,7 +14,7 @@ vendor/uchardet vendor/wxWidgets 3.2.2+git%cd - master + 6f546951b4f004da16ce19ba638bf3eedefb9f31 aegisub diff --git a/aegisub-3.2.2+git20180710.tar.gz b/aegisub-3.2.2+git20180710.tar.gz deleted file mode 100644 index 3aef80d..0000000 --- a/aegisub-3.2.2+git20180710.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d18be11ff7ec128b86316d6a9fa015a176b1a0b92bf3fd886f5f501d00d6a7f1 -size 7473463 diff --git a/aegisub-boost169.patch b/aegisub-boost169.patch deleted file mode 100644 index 7b75d3f..0000000 --- a/aegisub-boost169.patch +++ /dev/null @@ -1,82 +0,0 @@ -Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/colour_button.cpp -=================================================================== ---- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/colour_button.cpp 2018-07-10 00:06:51.000000000 +0200 -+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/colour_button.cpp 2019-03-29 13:05:42.776195551 +0200 -@@ -18,8 +18,16 @@ - - #include "dialogs.h" - -+#if BOOST_VERSION >= 106900 -+ -+#include -+ -+#else -+ - #include - -+#endif -+ - AGI_DEFINE_EVENT(EVT_COLOR, agi::Color); - - ColourButton::ColourButton(wxWindow *parent, wxSize const& size, bool alpha, agi::Color col, wxValidator const& validator) -Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/video_provider_dummy.cpp -=================================================================== ---- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/video_provider_dummy.cpp 2018-07-10 00:06:51.000000000 +0200 -+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/video_provider_dummy.cpp 2019-03-29 13:07:20.480135858 +0200 -@@ -45,8 +45,16 @@ - #include - #include - #include -+#if BOOST_VERSION >= 106900 -+ -+#include -+ -+#else -+ - #include - -+#endif -+ - DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern) - : framecount(frames) - , fps(fps) -Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/video_frame.cpp -=================================================================== ---- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/video_frame.cpp 2018-07-10 00:06:51.000000000 +0200 -+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/video_frame.cpp 2019-03-29 13:08:04.509911568 +0200 -@@ -16,7 +16,15 @@ - - #include "video_frame.h" - -+#if BOOST_VERSION >= 106900 -+ -+#include -+ -+#else -+ - #include -+ -+#endif - #include - - namespace { -Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/subtitles_provider_libass.cpp -=================================================================== ---- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/subtitles_provider_libass.cpp 2018-07-10 00:06:51.000000000 +0200 -+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/subtitles_provider_libass.cpp 2019-03-29 13:08:57.240038186 +0200 -@@ -46,7 +46,15 @@ - #include - - #include -+#if BOOST_VERSION >= 106900 -+ -+#include -+ -+#else -+ - #include -+ -+#endif - #include - #include - diff --git a/aegisub-git-version.patch b/aegisub-git-version.patch deleted file mode 100644 index 66da4e3..0000000 --- a/aegisub-git-version.patch +++ /dev/null @@ -1,8 +0,0 @@ -Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/build/git_version.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/build/git_version.h 2019-03-29 13:17:45.073329657 +0200 -@@ -0,0 +1,3 @@ -+#define BUILD_GIT_VERSION_NUMBER 83736 -+#define BUILD_GIT_VERSION_STRING "3.2.2+git20180710" -+#define TAGGED_RELEASE 0 diff --git a/aegisub.changes b/aegisub.changes index e89079a..2ec1f65 100644 --- a/aegisub.changes +++ b/aegisub.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 30 12:49:32 UTC 2020 - Dave Plater + +- Replaced luabins.patch with luaL_Reg-not-luaL_reg.patch sent + upstream via https://github.com/Aegisub/Aegisub/issues/182 + ------------------------------------------------------------------- Wed Apr 29 10:48:36 UTC 2020 - Luigi Baldoni diff --git a/aegisub.spec b/aegisub.spec index 4a8a311..70d1f01 100644 --- a/aegisub.spec +++ b/aegisub.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -29,7 +29,8 @@ Source100: %{name}-rpmlintrc Patch1: Makefile.inc.in.patch Patch2: remove-vendor-luajit-dependency.patch Patch3: aegisub-no-optimize.patch -Patch4: luabins.patch +Patch4: luaL_Reg-not-luaL_reg.patch +#luabins.patch # PATCH-FIX-UPSTREAM aegisub-fix_build_with_make4.3.patch Patch8: aegisub-fix_build_with_make4.3.patch BuildRequires: automake diff --git a/luaL_Reg-not-luaL_reg.patch b/luaL_Reg-not-luaL_reg.patch new file mode 100644 index 0000000..6fb1670 --- /dev/null +++ b/luaL_Reg-not-luaL_reg.patch @@ -0,0 +1,35 @@ +diff --git a/libaegisub/lua/modules/lpeg.c b/libaegisub/lua/modules/lpeg.c +index 8d67335ab..5261c2061 100644 +--- a/libaegisub/lua/modules/lpeg.c ++++ b/libaegisub/lua/modules/lpeg.c +@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) { + } + + +-static struct luaL_reg pattreg[] = { ++static struct luaL_Reg pattreg[] = { + {"match", matchl}, + {"print", printpat_l}, + {"locale", locale_l}, +@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = { + }; + + +-static struct luaL_reg metapattreg[] = { ++static struct luaL_Reg metapattreg[] = { + {"__add", union_l}, + {"__pow", star_l}, + {"__sub", diff_l}, +diff --git a/vendor/luabins/src/luabins.c b/vendor/luabins/src/luabins.c +index 60668213f..35b177629 100644 +--- a/vendor/luabins/src/luabins.c ++++ b/vendor/luabins/src/luabins.c +@@ -54,7 +54,7 @@ static int l_load(lua_State * L) + } + + /* luabins Lua module API */ +-static const struct luaL_reg R[] = ++static const struct luaL_Reg R[] = + { + { "save", l_save }, + { "load", l_load }, diff --git a/luabins.patch b/luabins.patch deleted file mode 100644 index 0666cdd..0000000 --- a/luabins.patch +++ /dev/null @@ -1,182 +0,0 @@ -Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/libaegisub/lua/modules/lpeg.c -=================================================================== ---- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/libaegisub/lua/modules/lpeg.c 2018-07-10 00:06:51.000000000 +0200 -+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/libaegisub/lua/modules/lpeg.c 2019-03-29 13:17:41.817198250 +0200 -@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) { - } - - --static struct luaL_reg pattreg[] = { -+static struct luaL_Reg pattreg[] = { - {"match", matchl}, - {"print", printpat_l}, - {"locale", locale_l}, -@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = { - }; - - --static struct luaL_reg metapattreg[] = { -+static struct luaL_Reg metapattreg[] = { - {"__add", union_l}, - {"__pow", star_l}, - {"__sub", diff_l}, -Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/AUTHORS -=================================================================== ---- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/vendor/luabins/AUTHORS 2018-07-10 00:06:51.000000000 +0200 -+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/AUTHORS 2019-03-29 13:17:41.817198250 +0200 -@@ -2,3 +2,4 @@ Luabins authors: - ---------------- - - Alexander Gladysh -+hanxi -Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/README.md -=================================================================== ---- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/vendor/luabins/README.md 2018-07-10 00:06:51.000000000 +0200 -+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/README.md 2019-03-29 13:17:41.817198250 +0200 -@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib - Allows to save tuples of primitive Lua types into binary chunks - and to load saved data back. - -+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts. -+ - On serialization - ---------------- - -Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/luabins.c -=================================================================== ---- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/vendor/luabins/src/luabins.c 2018-07-10 00:06:51.000000000 +0200 -+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/luabins.c 2019-03-29 13:17:41.817198250 +0200 -@@ -54,7 +54,7 @@ static int l_load(lua_State * L) - } - - /* luabins Lua module API */ --static const struct luaL_reg R[] = -+static const struct luaL_Reg R[] = - { - { "save", l_save }, - { "load", l_load }, -Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/luaheaders.h -=================================================================== ---- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/vendor/luabins/src/luaheaders.h 2018-07-10 00:06:51.000000000 +0200 -+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/luaheaders.h 2019-03-29 13:17:41.817198250 +0200 -@@ -7,6 +7,16 @@ extern "C" { - - #include - #include -+ -+#if !defined LUA_VERSION_NUM -+#define luaL_Reg luaL_reg -+#endif -+ -+#if LUA_VERSION_NUM > 501 -+#define luaL_register(L,n,R) (luaL_newlib(L,R)) -+#define lua_objlen(L,i) lua_rawlen(L, (i)) -+#endif -+ - #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP) - } - #endif -Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/luainternals.h -=================================================================== ---- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/vendor/luabins/src/luainternals.h 2018-07-10 00:06:51.000000000 +0200 -+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/luainternals.h 2019-03-29 13:17:41.817198250 +0200 -@@ -7,6 +7,24 @@ - #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_ - #define LUABINS_LUAINTERNALS_H_INCLUDED_ - -+#ifndef LUAI_BITSINT -+/* -+* LUAI_BITSINT defines the number of bits in an int. -+* CHANGE here if Lua cannot automatically detect the number of bits of -+* your machine. Probably you do not need to change this. -+* -+* avoid overflows in comparison */ -+#if INT_MAX-20 < 32760 -+#define LUAI_BITSINT 16 -+#elif INT_MAX > 2147483640L -+/* int has at least 32 bits */ -+#define LUAI_BITSINT 32 -+#else -+#error "you must define LUA_BITSINT with number of bits in an integer" -+#endif -+ -+#endif // ifndef LUAI_BITSINT -+ - /* - * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h - * WARNING: If your Lua config differs, fix this! -@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x); - /* - ** max size of array part is 2^MAXBITS - */ --#define LUAI_BITSINT 32 - #if LUAI_BITSINT > 26 - #define MAXBITS 26 - #else -Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/lualess.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/lualess.c 2019-03-29 13:17:41.817198250 +0200 -@@ -0,0 +1,32 @@ -+/* -+* lualess.h -+* Lua-related definitions for lua-less builds (based on Lua manual) -+* See copyright notice in luabins.h -+*/ -+ -+#include -+ -+/* -+* lua_Alloc-compatible allocator to use in Lua-less applications -+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual. -+*/ -+void * lbs_simplealloc( -+ void * ud, -+ void * ptr, -+ size_t osize, -+ size_t nsize -+ ) -+{ -+ (void) ud; -+ (void) osize; /* not used */ -+ -+ if (nsize == 0) -+ { -+ free(ptr); -+ return NULL; -+ } -+ else -+ { -+ return realloc(ptr, nsize); -+ } -+} -Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/test/test.lua -=================================================================== ---- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/vendor/luabins/test/test.lua 2018-07-10 00:06:51.000000000 +0200 -+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/test/test.lua 2019-03-29 13:17:41.817198250 +0200 -@@ -6,6 +6,8 @@ - - package.cpath = "./?.so;"..package.cpath - -+local pack = pack or table.pack -+local unpack = unpack or table.unpack - local randomseed = 1235134892 - --local randomseed = os.time() - -@@ -145,6 +147,7 @@ end - -- Test helper functions - -- ---------------------------------------------------------------------------- - -+luabins = require 'luabins' - local luabins_local = require 'luabins' - assert(luabins_local == luabins) - -@@ -281,7 +284,7 @@ check_fail_save( - "can't save: unsupported type detected", - coroutine.create(function() end) - ) --check_fail_save("can't save: unsupported type detected", newproxy()) -+check_fail_save("can't save: unsupported type detected", function()end) - - print("---> basic table tests") -