pool/aegisub
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 689868 from home:plater

Browse Source 
Fix boo#1130889 by fixing aegisub's build against boost 1.69 with aegisub-boost169.patch, reported upstream with patch in issue:
  https://github.com/Aegisub/Aegisub/issues/93

OBS-URL: https://build.opensuse.org/request/show/689868
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=57
This commit is contained in:
Dave Plater
2019-03-29 13:34:01 +00:00
committed by Git OBS Bridge
parent e32a090617
commit 2f7dde443e
9 changed files with 168 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
luabins.patch
View File

@@ -1,7 +1,8 @@
diff -Nur aegisub-3.2.2/libaegisub/lua/modules/lpeg.c new/libaegisub/lua/modules/lpeg.c
--- aegisub-3.2.2/libaegisub/lua/modules/lpeg.c 2014-12-08 01:07:09.000000000 +0100
+++ new/libaegisub/lua/modules/lpeg.c 2017-06-19 12:33:03.929957005 +0200
@@ -2334,7 +2334,7 @@
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) {
}
@@ -10,7 +11,7 @@ diff -Nur aegisub-3.2.2/libaegisub/lua/modules/lpeg.c new/libaegisub/lua/modules
{"match", matchl},
{"print", printpat_l},
{"locale", locale_l},
@@ -2360,7 +2360,7 @@
@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
};
@@ -19,18 +20,20 @@ diff -Nur aegisub-3.2.2/libaegisub/lua/modules/lpeg.c new/libaegisub/lua/modules
{"__add", union_l},
{"__pow", star_l},
{"__sub", diff_l},
diff -Nur aegisub-3.2.2/vendor/luabins/AUTHORS new/vendor/luabins/AUTHORS
--- aegisub-3.2.2/vendor/luabins/AUTHORS 2014-12-08 01:07:09.000000000 +0100
+++ new/vendor/luabins/AUTHORS 2016-12-17 08:09:13.000000000 +0100
@@ -2,3 +2,4 @@
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 <agladysh@gmail.com>
+hanxi <hanxi@gmail.com>
diff -Nur aegisub-3.2.2/vendor/luabins/README.md new/vendor/luabins/README.md
--- aegisub-3.2.2/vendor/luabins/README.md 2014-12-08 01:07:09.000000000 +0100
+++ new/vendor/luabins/README.md 2016-12-17 08:09:13.000000000 +0100
@@ -4,6 +4,8 @@
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.
@@ -39,10 +42,11 @@ diff -Nur aegisub-3.2.2/vendor/luabins/README.md new/vendor/luabins/README.md
On serialization
----------------
diff -Nur aegisub-3.2.2/vendor/luabins/src/luabins.c new/vendor/luabins/src/luabins.c
--- aegisub-3.2.2/vendor/luabins/src/luabins.c 2014-12-08 01:07:09.000000000 +0100
+++ new/vendor/luabins/src/luabins.c 2016-12-17 08:09:13.000000000 +0100
@@ -54,7 +54,7 @@
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 */
@@ -51,10 +55,11 @@ diff -Nur aegisub-3.2.2/vendor/luabins/src/luabins.c new/vendor/luabins/src/luab
{
{ "save", l_save },
{ "load", l_load },
diff -Nur aegisub-3.2.2/vendor/luabins/src/luaheaders.h new/vendor/luabins/src/luaheaders.h
--- aegisub-3.2.2/vendor/luabins/src/luaheaders.h 2014-12-08 01:07:09.000000000 +0100
+++ new/vendor/luabins/src/luaheaders.h 2016-12-17 08:09:13.000000000 +0100
@@ -7,6 +7,16 @@
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 <lua.h>
#include <lauxlib.h>
@@ -71,9 +76,10 @@ diff -Nur aegisub-3.2.2/vendor/luabins/src/luaheaders.h new/vendor/luabins/src/l
#if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
}
#endif
diff -Nur aegisub-3.2.2/vendor/luabins/src/luainternals.h new/vendor/luabins/src/luainternals.h
--- aegisub-3.2.2/vendor/luabins/src/luainternals.h 2014-12-08 01:07:09.000000000 +0100
+++ new/vendor/luabins/src/luainternals.h 2017-06-19 12:26:34.402690003 +0200
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_
@@ -99,7 +105,7 @@ diff -Nur aegisub-3.2.2/vendor/luabins/src/luainternals.h new/vendor/luabins/src
/*
* BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
* WARNING: If your Lua config differs, fix this!
@@ -38,7 +56,6 @@
@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
/*
** max size of array part is 2^MAXBITS
*/
@@ -107,9 +113,10 @@ diff -Nur aegisub-3.2.2/vendor/luabins/src/luainternals.h new/vendor/luabins/src
#if LUAI_BITSINT > 26
#define MAXBITS 26
#else
diff -Nur aegisub-3.2.2/vendor/luabins/src/lualess.c new/vendor/luabins/src/lualess.c
--- aegisub-3.2.2/vendor/luabins/src/lualess.c 1970-01-01 01:00:00.000000000 +0100
+++ new/vendor/luabins/src/lualess.c 2016-12-17 08:09:13.000000000 +0100
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
@@ -143,9 +150,10 @@ diff -Nur aegisub-3.2.2/vendor/luabins/src/lualess.c new/vendor/luabins/src/lual
+ return realloc(ptr, nsize);
+ }
+}
diff -Nur aegisub-3.2.2/vendor/luabins/test/test.lua new/vendor/luabins/test/test.lua
--- aegisub-3.2.2/vendor/luabins/test/test.lua 2014-12-08 01:07:09.000000000 +0100
+++ new/vendor/luabins/test/test.lua 2016-12-17 08:09:13.000000000 +0100
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
@@ -155,7 +163,7 @@ diff -Nur aegisub-3.2.2/vendor/luabins/test/test.lua new/vendor/luabins/test/tes
local randomseed = 1235134892
--local randomseed = os.time()
@@ -145,6 +147,7 @@
@@ -145,6 +147,7 @@ end
-- Test helper functions
-- ----------------------------------------------------------------------------
@@ -163,7 +171,7 @@ diff -Nur aegisub-3.2.2/vendor/luabins/test/test.lua new/vendor/luabins/test/tes
local luabins_local = require 'luabins'
assert(luabins_local == luabins)
@@ -281,7 +284,7 @@
@@ -281,7 +284,7 @@ check_fail_save(
"can't save: unsupported type detected",
coroutine.create(function() end)
)