Hello community, here is the log from the commit of package aegisub for openSUSE:Factory checked in at 2019-04-01 12:37:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aegisub (Old) and /work/SRC/openSUSE:Factory/.aegisub.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aegisub" Mon Apr 1 12:37:57 2019 rev:30 rq:689869 version:3.2.2+git20180710 Changes: -------- --- /work/SRC/openSUSE:Factory/aegisub/aegisub.changes 2019-02-15 10:04:18.287588880 +0100 +++ /work/SRC/openSUSE:Factory/.aegisub.new.25356/aegisub.changes 2019-04-01 12:38:03.773905981 +0200 @@ -1,0 +2,7 @@ +Fri Mar 29 13:25:07 UTC 2019 - plater <[email protected]> + +- 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 + +------------------------------------------------------------------- New: ---- aegisub-boost169.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aegisub.spec ++++++ --- /var/tmp/diff_new_pack.K8rhOt/_old 2019-04-01 12:38:09.297908639 +0200 +++ /var/tmp/diff_new_pack.K8rhOt/_new 2019-04-01 12:38:09.301908642 +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 https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -30,18 +30,21 @@ Source99: changelog.txt Patch1: Makefile.inc.in.patch Patch2: remove-vendor-luajit-dependency.patch -Patch4: aegisub-no-optimize.patch -Patch5: luabins.patch +Patch3: aegisub-no-optimize.patch +Patch4: luabins.patch #PATCH-FIX-OPENSUSE - [email protected] - aegisub-git-version.patch - Create git_version.h which is missing in git. -Patch7: aegisub-git-version.patch +Patch5: aegisub-git-version.patch #PATCH-FIX-UPSTREAM - [email protected] - aegisub-DataBlockCache-Fix-crash-in-cache-invalidation.patch - Fixes undefined behavior e.g. when scrolling the audio view in spectrogram mode. -Patch8: aegisub-DataBlockCache-Fix-crash-in-cache-invalidation.patch +Patch6: aegisub-DataBlockCache-Fix-crash-in-cache-invalidation.patch +#PATCH-FIX-UPSTREAM - [email protected] - aegisub-boost169.patch - Fixes build with boost 1.69 where boost/gil/gil_all.hpp is moved to -boost169.patch +Patch7: aegisub-boost169.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: intltool BuildRequires: libboost_chrono-devel BuildRequires: libboost_filesystem-devel +BuildRequires: libboost_headers-devel BuildRequires: libboost_locale-devel BuildRequires: libboost_regex-devel BuildRequires: libboost_system-devel @@ -68,12 +71,7 @@ %prep %setup -q -n %{gitname}-%{_rev} -%patch1 -p0 -%patch2 -p0 -%patch4 -p1 -%patch5 -p1 -%patch7 -%patch8 -p1 +%autopatch -p1 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/version.cpp FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') ++++++ Makefile.inc.in.patch ++++++ --- /var/tmp/diff_new_pack.K8rhOt/_old 2019-04-01 12:38:09.325908653 +0200 +++ /var/tmp/diff_new_pack.K8rhOt/_new 2019-04-01 12:38:09.325908653 +0200 @@ -1,7 +1,7 @@ -Index: Makefile.inc.in +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/Makefile.inc.in =================================================================== ---- Makefile.inc.in.orig 2018-07-10 00:06:51.000000000 +0200 -+++ Makefile.inc.in 2018-08-29 16:34:31.015394700 +0200 +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/Makefile.inc.in 2018-07-10 00:06:51.000000000 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/Makefile.inc.in 2019-03-29 13:17:21.692386078 +0200 @@ -29,7 +29,7 @@ CXXFLAGS = @CXXFLAGS@ CPPFLAGS = @CPPFLAGS@ CFLAGS_DEP = -MMD -MP @@ -11,10 +11,10 @@ INSTALL_FLAGS = -m 644 LIB_SHARED_LINK = -shared -Wl,-soname -Wl,$(LIB_SHARED_FULL) LIB_SHARED_LINK_OSX = -dynamiclib -Wl,-undefined -Wl,dynamic_lookup -compatibility_version $(LIB_VERSION) -current_version $(LIB_VERSION) -Wl,-single_module -mmacosx-version-min=10.8 -install_name ${CURDIR}/$(LIB_SHARED_FULL) -Index: configure.ac +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/configure.ac =================================================================== ---- configure.ac.orig 2018-07-10 00:06:51.000000000 +0200 -+++ configure.ac 2018-08-29 16:36:51.024739116 +0200 +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/configure.ac 2018-07-10 00:06:51.000000000 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/configure.ac 2019-03-29 13:17:21.692386078 +0200 @@ -136,7 +136,7 @@ AS_IF([test x$enable_compiler_flags != x CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g" CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g" ++++++ aegisub-DataBlockCache-Fix-crash-in-cache-invalidation.patch ++++++ --- /var/tmp/diff_new_pack.K8rhOt/_old 2019-04-01 12:38:09.345908663 +0200 +++ /var/tmp/diff_new_pack.K8rhOt/_new 2019-04-01 12:38:09.345908663 +0200 @@ -8,10 +8,10 @@ src/block_cache.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/block_cache.h b/src/block_cache.h -index 9fcaf42e7..f2ebfa261 100644 ---- a/src/block_cache.h -+++ b/src/block_cache.h +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/block_cache.h +=================================================================== +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/block_cache.h 2018-07-10 00:06:51.000000000 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/block_cache.h 2019-03-29 13:17:48.209456221 +0200 @@ -150,8 +150,8 @@ public: } @@ -23,6 +23,3 @@ } /// @brief Obtain a data block from the cache --- -2.20.1 - ++++++ aegisub-boost169.patch ++++++ 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 <boost/gil.hpp> + +#else + #include <boost/gil/gil_all.hpp> +#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 <boost/algorithm/string/predicate.hpp> #include <boost/filesystem/path.hpp> #include <libaegisub/format.h> +#if BOOST_VERSION >= 106900 + +#include <boost/gil.hpp> + +#else + #include <boost/gil/gil_all.hpp> +#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 <boost/gil.hpp> + +#else + #include <boost/gil/gil_all.hpp> + +#endif #include <wx/image.h> 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 <libaegisub/util.h> #include <atomic> +#if BOOST_VERSION >= 106900 + +#include <boost/gil.hpp> + +#else + #include <boost/gil/gil_all.hpp> + +#endif #include <memory> #include <mutex> ++++++ aegisub-git-version.patch ++++++ --- /var/tmp/diff_new_pack.K8rhOt/_old 2019-04-01 12:38:09.361908671 +0200 +++ /var/tmp/diff_new_pack.K8rhOt/_new 2019-04-01 12:38:09.361908671 +0200 @@ -1,7 +1,7 @@ -Index: build/git_version.h +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/build/git_version.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ build/git_version.h 2018-08-29 16:47:48.929842452 +0200 ++++ 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" ++++++ aegisub-no-optimize.patch ++++++ --- /var/tmp/diff_new_pack.K8rhOt/_old 2019-04-01 12:38:09.369908674 +0200 +++ /var/tmp/diff_new_pack.K8rhOt/_new 2019-04-01 12:38:09.373908676 +0200 @@ -1,8 +1,8 @@ =================================================================== Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/configure.ac =================================================================== ---- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/configure.ac 2018-08-29 16:36:51.024739116 +0200 -+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/configure.ac 2018-08-29 16:46:24.326615179 +0200 +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/configure.ac 2019-03-29 13:17:21.692386078 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/configure.ac 2019-03-29 13:17:38.925081533 +0200 @@ -145,8 +145,8 @@ AS_IF([test x$enable_compiler_flags != x CFLAGS="$CFLAGS -O0" CXXFLAGS="$CXXFLAGS -O0" ++++++ luabins.patch ++++++ --- /var/tmp/diff_new_pack.K8rhOt/_old 2019-04-01 12:38:09.397908688 +0200 +++ /var/tmp/diff_new_pack.K8rhOt/_new 2019-04-01 12:38:09.397908688 +0200 @@ -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 @@ {"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 @@ {"__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 <[email protected]> +hanxi <[email protected]> -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 @@ 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 @@ { { "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 @@ #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 @@ /* * 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 @@ #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 @@ + 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 @@ local randomseed = 1235134892 --local randomseed = os.time() -@@ -145,6 +147,7 @@ +@@ -145,6 +147,7 @@ end -- Test helper functions -- ---------------------------------------------------------------------------- @@ -163,7 +171,7 @@ 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) ) ++++++ remove-vendor-luajit-dependency.patch ++++++ --- /var/tmp/diff_new_pack.K8rhOt/_old 2019-04-01 12:38:09.405908691 +0200 +++ /var/tmp/diff_new_pack.K8rhOt/_new 2019-04-01 12:38:09.405908691 +0200 @@ -3,10 +3,10 @@ Forwarded: not-needed Last-Update: 2014-08-06 -Index: header.mk +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/header.mk =================================================================== ---- header.mk.orig 2018-08-29 16:09:52.447078198 +0200 -+++ header.mk 2018-08-29 16:13:15.670809749 +0200 +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/header.mk 2018-07-10 00:06:51.000000000 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/header.mk 2019-03-29 13:17:35.252933339 +0200 @@ -13,7 +13,6 @@ subdirs := \ tests \ tools \ @@ -15,10 +15,10 @@ subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs))) -Index: Makefile.inc.in +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/Makefile.inc.in =================================================================== ---- Makefile.inc.in.orig 2018-08-29 16:10:05.587577013 +0200 -+++ Makefile.inc.in 2018-08-29 16:14:01.836568832 +0200 +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/Makefile.inc.in 2019-03-29 13:17:21.692386078 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/Makefile.inc.in 2019-03-29 13:17:35.252933339 +0200 @@ -79,7 +79,7 @@ CFLAGS_ICONV = @ICONV_CFLAGS@ CFLAGS_ICU = @ICU_I18N_CFLAGS@ CFLAGS_LIBASS = @LIBASS_CFLAGS@ @@ -45,10 +45,10 @@ endif FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@ -Index: tools/Makefile +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/tools/Makefile =================================================================== ---- tools/Makefile.orig 2018-08-29 16:09:52.447078198 +0200 -+++ tools/Makefile 2018-08-29 16:13:15.690810512 +0200 +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/tools/Makefile 2018-07-10 00:06:51.000000000 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/tools/Makefile 2019-03-29 13:17:35.252933339 +0200 @@ -12,6 +12,4 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I PROGRAM += $(d)repack-thes-dict @@ -56,10 +56,10 @@ -$(TOP)tools/respack.lua: $(shell command -v "$(BIN_LUA)") - include $(TOP)Makefile.target -Index: src/libresrc/Makefile +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/libresrc/Makefile =================================================================== ---- src/libresrc/Makefile.orig 2018-08-29 16:09:52.447078198 +0200 -+++ src/libresrc/Makefile 2018-08-29 16:13:15.690810512 +0200 +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/libresrc/Makefile 2018-07-10 00:06:51.000000000 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/libresrc/Makefile 2019-03-29 13:17:35.252933339 +0200 @@ -10,7 +10,7 @@ resrc_OBJ := \ $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp @@ -69,10 +69,10 @@ $(d)bitmap.cpp: $(d)bitmap.h $(d)default_config.cpp: $(d)default_config.h -Index: tools/respack.lua +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/tools/respack.lua =================================================================== ---- tools/respack.lua.orig 2018-08-29 16:09:52.447078198 +0200 -+++ tools/respack.lua 2018-08-29 16:13:15.690810512 +0200 +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/tools/respack.lua 2018-07-10 00:06:51.000000000 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/tools/respack.lua 2019-03-29 13:17:35.252933339 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env luajit +#!/usr/bin/lua
