Aegisub: fix with make 4.3, wxwidgets fix
This commit is contained in:
parent
d7247fed83
commit
3815cbd10e
|
@ -0,0 +1,23 @@
|
|||
From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
|
||||
From: wangqr <wangqr@wangqr.tk>
|
||||
Date: Mon, 17 Feb 2020 14:42:07 +0800
|
||||
Subject: [PATCH] Use target name without directory in $*_OBJ macro
|
||||
|
||||
Fix Aegisub/Aegisub#171
|
||||
---
|
||||
Makefile.target | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.target b/Makefile.target
|
||||
index 516ef3c24..5c4c5d259 100644
|
||||
--- Makefile.target
|
||||
+++ Makefile.target
|
||||
@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
|
||||
# Libraries contain all object files they depend on (but they may depend on other files)
|
||||
# Not using libtool on OS X because it has an unsilenceable warning about a
|
||||
# compatibility issue with BSD 4.3 (wtf)
|
||||
-lib%.a: $$($$*_OBJ)
|
||||
+lib%.a: $$($$(*F)_OBJ)
|
||||
@$(BIN_MKDIR_P) $(dir $@)
|
||||
$(BIN_AR) cru $@ $(filter %.o,$^)
|
||||
$(BIN_RANLIB) $@
|
|
@ -0,0 +1,24 @@
|
|||
From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
|
||||
From: wangqr <wangqr@wangqr.tk>
|
||||
Date: Thu, 6 Jun 2019 15:24:40 -0400
|
||||
Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
|
||||
|
||||
As they are used internally by Layout and should not be called
|
||||
directly.
|
||||
---
|
||||
src/frame_main.cpp | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/src/frame_main.cpp b/src/frame_main.cpp
|
||||
index b35c32960..df115b27c 100644
|
||||
--- src/frame_main.cpp
|
||||
+++ src/frame_main.cpp
|
||||
@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
|
||||
TopSizer->Show(videoBox, showVideo, true);
|
||||
ToolsSizer->Show(audioBox, showAudio, true);
|
||||
|
||||
- MainSizer->CalcMin();
|
||||
- MainSizer->RecalcSizes();
|
||||
MainSizer->Layout();
|
||||
Layout();
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'Aegisub'
|
||||
pkgname=Aegisub
|
||||
version=3.2.2
|
||||
revision=10
|
||||
revision=11
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-update-checker --with-alsa --with-ffms2
|
||||
--with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
|
||||
|
|
Loading…
Reference in New Issue