diff options
| author | root <root@rshg054.dnsready.net> | 2013-09-03 01:52:27 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-09-03 01:52:27 -0700 |
| commit | 3aa73e2018f321c9ccff8eca801b1c2fa9f18fa8 (patch) | |
| tree | 961d6e0475cac3875e6a31b558861367da0c93d8 /community/aegisub | |
| parent | 53939c2b159d972c48fc2f3652408632c71be77b (diff) | |
Tue Sep 3 01:50:53 PDT 2013
Diffstat (limited to 'community/aegisub')
| -rwxr-xr-x | community/aegisub/PKGBUILD | 10 | ||||
| -rw-r--r-- | community/aegisub/wxgtk2.9.5.patch | 33 |
2 files changed, 24 insertions, 19 deletions
diff --git a/community/aegisub/PKGBUILD b/community/aegisub/PKGBUILD index dbeecc2bd..2cc98780c 100755 --- a/community/aegisub/PKGBUILD +++ b/community/aegisub/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 96068 2013-08-19 20:07:28Z eric $ +# $Id: PKGBUILD 96598 2013-09-02 08:35:43Z alucryd $ # 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=2 +pkgrel=3 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') makedepends=('mesa') -install=aegisub.install +install="${pkgname}.install" source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz" 'wxgtk2.9.5.patch') sha256sums=('7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a' - 'b3dc9f094d23e6f38a7a03dc3692056bd9e09095dab8385d7f2fd7c0e73e19d2') + '8aed8aaf4773e4a315f9336d3ea4af2c46b9e84c4e651c202e0a70a6cd9e499c') prepare() { cd ${pkgname}/${pkgname} @@ -29,7 +29,7 @@ build() { 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 + ./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 } diff --git a/community/aegisub/wxgtk2.9.5.patch b/community/aegisub/wxgtk2.9.5.patch index 5c0b805ff..b50fac01b 100644 --- a/community/aegisub/wxgtk2.9.5.patch +++ b/community/aegisub/wxgtk2.9.5.patch @@ -1,14 +1,3 @@ -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() { @@ -31,6 +20,22 @@ index 70c9ea1..f72593d 100644 #endif } --- -1.8.3.4 - +--- a/aegisub/src/menu.cpp ++++ b/aegisub/src/menu.cpp +@@ -457,11 +457,11 @@ namespace menu { + window->Bind(wxEVT_COMMAND_MENU_SELECTED, &CommandManager::OnMenuClick, &menu->cm); + window->SetMenuBar(menu.get()); + +-#ifdef __WXGTK__ +- // GTK silently swallows keypresses for accelerators whose associated +- // menu items are disabled. As we don't update the menu until it's +- // opened, this means that conditional hotkeys don't work if the menu +- // hasn't been opened since they became valid. ++#if defined(__WXGTK__) && !wxCHECK_VERSION(2, 9, 5) ++ // Older versions of wxGTK silently swallow keypresses for accelerators ++ // whose associated menu items are disabled. As we don't update the ++ // menu until it's opened, this means that conditional hotkeys don't ++ // work if the menu hasn't been opened since they became valid. + // + // To work around this, we completely disable accelerators from menu + // item. wxGTK doesn't expose any way to do this other that at wx |