rpm/aegisub
SHA256
1
0
Fork 0
forked from pool/aegisub
Code Pull Requests Activity

Accepting request 689869 from multimedia:apps

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/689869
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aegisub?expand=0&rev=30
This commit is contained in:
Dominique Leuenberger 2019-04-01 10:37:57 +00:00 committed by Git OBS Bridge
commit cfe3a84fb3
9 changed files with 168 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.inc.in.patch
View File

@ -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 @@ Index: Makefile.inc.in
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"

11
aegisub-DataBlockCache-Fix-crash-in-cache-invalidation.patch
View File

@ -8,10 +8,10 @@ Fixes #33
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 @@ index 9fcaf42e7..f2ebfa261 100644
}
/// @brief Obtain a data block from the cache
--
2.20.1

82
aegisub-boost169.patch Normal file
View File

@ -0,0 +1,82 @@
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>

4
aegisub-git-version.patch
View File

@ -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"

4
aegisub-no-optimize.patch
View File

@ -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"

7
aegisub.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Mar 29 13:25:07 UTC 2019 - plater <davejplater@gmail.com>
- 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
-------------------------------------------------------------------
Thu Feb 14 16:09:23 UTC 2019 - Martin Herkt <9+suse@cirno.systems>

20
aegisub.spec
View File

@ -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 @@ Source0: https://github.com/Aegisub/Aegisub/archive/%{_rev}.tar.gz#/aegis
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 - davejplater@gmail.com - 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 - 9@cirno.systems - 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 - davejplater@gmail.com - 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 @@ effects in the subtitles, apart from just basic timed text.
%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')

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)
)

30
remove-vendor-luajit-dependency.patch
View File

@ -3,10 +3,10 @@ Author: Sebastian Reichel <sre@debian.org>
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 @@ Index: header.mk
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 @@ Index: Makefile.inc.in
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 @@ Index: tools/Makefile
-$(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 @@ Index: src/libresrc/Makefile
$(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