[arch-commits] Commit in aegisub/trunk (PKGBUILD wxgtk2.9.5.patch)

[Maxime Gauduin]

    Date: Monday, September 2, 2013 @ 10:35:25
  Author: alucryd
Revision: 96597

FS#36641: aegisub 3.0.4-3

Modified:
  aegisub/trunk/PKGBUILD
  aegisub/trunk/wxgtk2.9.5.patch

------------------+
 PKGBUILD         |    8 ++++----
 wxgtk2.9.5.patch |   33 +++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-02 07:16:12 UTC (rev 96596)
+++ PKGBUILD	2013-09-02 08:35:25 UTC (rev 96597)
@@ -5,7 +5,7 @@
 
 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"
@@ -12,11 +12,11 @@
 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 @@
 
   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
 }
 

Modified: wxgtk2.9.5.patch
===================================================================
--- wxgtk2.9.5.patch	2013-09-02 07:16:12 UTC (rev 96596)
+++ wxgtk2.9.5.patch	2013-09-02 08:35:25 UTC (rev 96597)
@@ -1,14 +1,3 @@
-From ca8036d425bf59020b476259e7857e8c67ebb6ba Mon Sep 17 00:00:00 2001
-From: Maxime Gauduin <alucryd at 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 @@
  #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