Hello community, here is the log from the commit of package aegisub for openSUSE:Factory checked in at 2020-05-02 22:18:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aegisub (Old) and /work/SRC/openSUSE:Factory/.aegisub.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aegisub" Sat May 2 22:18:57 2020 rev:33 rq:799624 version:3.2.2+git20191006 Changes: -------- --- /work/SRC/openSUSE:Factory/aegisub/aegisub.changes 2020-05-01 11:11:18.303580196 +0200 +++ /work/SRC/openSUSE:Factory/.aegisub.new.2738/aegisub.changes 2020-05-02 22:18:59.536744057 +0200 @@ -1,0 +2,8 @@ +Thu Apr 30 12:49:32 UTC 2020 - Dave Plater <davejpla...@gmail.com> + +- Replaced luabins.patch with luaL_Reg-not-luaL_reg.patch sent + upstream via https://github.com/Aegisub/Aegisub/issues/182 +- Removed spec file generated git_version.h, it's not needed when + git metadata is present. + +------------------------------------------------------------------- Old: ---- luabins.patch New: ---- luaL_Reg-not-luaL_reg.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aegisub.spec ++++++ --- /var/tmp/diff_new_pack.hI5zt1/_old 2020-05-02 22:19:02.120749470 +0200 +++ /var/tmp/diff_new_pack.hI5zt1/_new 2020-05-02 22:19:02.124749479 +0200 @@ -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 @@ 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 @@ -64,11 +65,6 @@ %prep %autosetup -p1 -tee build/git_version.h << "EOF" -#define BUILD_GIT_VERSION_NUMBER 9010 -#define BUILD_GIT_VERSION_STRING "%{version}" -#define TAGGED_RELEASE 0 -EOF cp %{SOURCE99} . %build ++++++ _service ++++++ --- /var/tmp/diff_new_pack.hI5zt1/_old 2020-05-02 22:19:02.168749571 +0200 +++ /var/tmp/diff_new_pack.hI5zt1/_new 2020-05-02 22:19:02.168749571 +0200 @@ -1,20 +1,24 @@ +<!-- Downloads master with .git to allow aegisub to create git_version.h --> <services> <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/Aegisub/Aegisub.git</param> <param name="scm">git</param> - <param name="exclude">.git</param> + <param name="submodules">disable</param> + <param name="package-meta">yes</param> + <param name="changesgenerate">enable</param> + <param name="exclude">.git/objects</param> <param name="exclude">vendor/boost</param> <param name="exclude">vendor/ffmpeg</param> <param name="exclude">vendor/ffms2</param> <param name="exclude">vendor/fftw</param> <param name="exclude">vendor/freetype2</param> <param name="exclude">vendor/googletest</param> + <param name="exclude">vendor/hunspell</param> <param name="exclude">vendor/icu</param> <param name="exclude">vendor/libass</param> <param name="exclude">vendor/uchardet</param> <param name="exclude">vendor/wxWidgets</param> <param name="versionformat">3.2.2+git%cd</param> - <param name="revision">master</param> <param name="filename">aegisub</param> </service> <service name="recompress" mode="disabled"> ++++++ aegisub-3.2.2+git20191006.tar.xz ++++++ ++++ 46144 lines of diff (skipped) ++++++ luaL_Reg-not-luaL_reg.patch ++++++ 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 },
