Tue Aug 20 02:14:51 PDT 2013

2 files changed, 55 insertions, 9 deletions

diff --git a/community/aegisub/PKGBUILD b/community/aegisub/PKGBUILD
index de1403d0b..dbeecc2bd 100755
--- a/community/aegisub/PKGBUILD
+++ b/community/aegisub/PKGBUILD
@@ -1,32 +1,42 @@
-# $Id: PKGBUILD 93876 2013-07-11 16:18:40Z alucryd $
+# $Id: PKGBUILD 96068 2013-08-19 20:07:28Z eric $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: kozec <kozec@kozec.com>
 # Contributor: Limao Luo <luolimao+AUR@gmail.com>
 
 pkgname=aegisub
 pkgver=3.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A general-purpose subtitle editor with ASS/SSA support"
 arch=('i686' 'x86_64')
 url="http://www.aegisub.org"
 license=('GPL' 'BSD')
-depends=('desktop-file-utils' 'ffmpegsource' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9' 'hicolor-icon-theme')
+depends=('desktop-file-utils' 'ffmpegsource' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9')
 makedepends=('mesa')
 install=aegisub.install
-source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a')
+source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz"
+        'wxgtk2.9.5.patch')
+sha256sums=('7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a'
+            'b3dc9f094d23e6f38a7a03dc3692056bd9e09095dab8385d7f2fd7c0e73e19d2')
+
+prepare() {
+  cd ${pkgname}/${pkgname}
+
+  patch -Np2 -i ../../wxgtk2.9.5.patch
+}
 
 build() {
-  cd "${srcdir}"/${pkgname}/${pkgname}
+  cd ${pkgname}/${pkgname}
 
-  ACLOCAL=aclocal AUTOMAKE=automake ./autogen.sh --prefix=/usr --without-{portaudio,openal,oss} --with-wxdir=/usr/include/wx-2.9 --with-wx-config=/usr/bin/wx-config-2.9
+  export ACLOCAL=aclocal
+  export AUTOMAKE=automake
+  ./autogen.sh --prefix=/usr --without-{portaudio,openal,oss} --with-wxdir=/usr/include/wx-2.9 --with-wx-config=/usr/bin/wx-config-2.9
   make
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}/${pkgname}
+  cd ${pkgname}/${pkgname}
 
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="${pkgdir}" install
 
 # License
   install -dm 755 "${pkgdir}"/usr/share/licenses/aegisub
diff --git a/community/aegisub/wxgtk2.9.5.patch b/community/aegisub/wxgtk2.9.5.patch
new file mode 100644
index 000000000..5c0b805ff
--- /dev/null
+++ b/community/aegisub/wxgtk2.9.5.patch
@@ -0,0 +1,36 @@
+From ca8036d425bf59020b476259e7857e8c67ebb6ba Mon Sep 17 00:00:00 2001
+From: Maxime Gauduin <alucryd@gmail.com>
+Date: Mon, 12 Aug 2013 05:20:41 +0200
+Subject: [PATCH] wxStandardPaths is protected as of wxgtk 2.9.5
+
+---
+ aegisub/src/utils.cpp | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/aegisub/src/utils.cpp b/aegisub/src/utils.cpp
+index 70c9ea1..f72593d 100644
+--- a/aegisub/src/utils.cpp
++++ b/aegisub/src/utils.cpp
+@@ -121,8 +121,7 @@ void RestartAegisub() {
+ 	config::opt->Flush();
+ 
+ #if defined(__WXMSW__)
+-	wxStandardPaths stand;
+-	wxExecute("\"" + stand.GetExecutablePath() + "\"");
++	wxExecute("\"" + wxStandardPaths::Get().GetExecutablePath() + "\"");
+ #elif defined(__WXMAC__)
+ 	std::string bundle_path = agi::util::OSX_GetBundlePath();
+ 	std::string helper_path = agi::util::OSX_GetBundleAuxillaryExecutablePath("restart-helper");
+@@ -132,8 +131,7 @@ void RestartAegisub() {
+ 	LOG_I("util/restart/exec") << exec;
+ 	wxExecute(exec);
+ #else
+-	wxStandardPaths stand;
+-	wxExecute(stand.GetExecutablePath());
++	wxExecute(wxStandardPaths::Get().GetExecutablePath());
+ #endif
+ }
+ 
+-- 
+1.8.3.4
+