Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=33ff23f6768e5f9f479507915372adae2880994a
commit 33ff23f6768e5f9f479507915372adae2880994a Author: kikadf <[email protected]> Date: Thu Nov 7 08:26:37 2013 +0100 aegisub-3.0.4-2-x86_64 * Rebuild with wxwidget-2.9.5 diff --git a/source/xapps-extra/aegisub/FrugalBuild b/source/xapps-extra/aegisub/FrugalBuild index 1352b89..0ce2883 100644 --- a/source/xapps-extra/aegisub/FrugalBuild +++ b/source/xapps-extra/aegisub/FrugalBuild @@ -1,20 +1,24 @@ # Compiling Time: 2.88 SBU # Maintainer: kikadf <[email protected]> +options+=('asneeded') + pkgname=aegisub pkgver=3.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="Aegisub is a cross-platform subtitle editor." url="http://www.aegisub.org/"; depends=('hunspell' 'libass' 'portaudio' 'libpulse>=2.1' 'intltool' \ - 'ffmpegsource>=2.17-3' 'wxwidget' 'x264>=20120904') + 'ffmpegsource>=2.17-3' 'wxwidget>=2.9.5' 'x264>=20120904') _F_cd_path="$pkgname/$pkgname" Fconfopts+=" --with-wx-config=/usr/lib/wx/config/gtk2-unicode-2.9 --without-openal" groups=('xapps-extra') archs=('i686' 'x86_64') up2date="Flasttar http://ftp.aegisub.org/pub/releases/"; -source=(http://ftp.aegisub.org/pub/releases/$pkgname-$pkgver.tar.xz) -sha1sums=('6922e2084ce0a2dfebd2ac886a851f9feed6bd91') +source=(http://ftp.aegisub.org/pub/releases/$pkgname-$pkgver.tar.xz \ + wxwidget-2.9.5.patch) +sha1sums=('6922e2084ce0a2dfebd2ac886a851f9feed6bd91' \ + 'ce115024fd2378fd1a29e1d8fa36d12790242750') build() diff --git a/source/xapps-extra/aegisub/wxwidget-2.9.5.patch b/source/xapps-extra/aegisub/wxwidget-2.9.5.patch new file mode 100644 index 0000000..b2fea73 --- /dev/null +++ b/source/xapps-extra/aegisub/wxwidget-2.9.5.patch @@ -0,0 +1,43 @@ +diff -Naur aegisub/aegisub/src/menu.cpp aegisub.new/aegisub/src/menu.cpp +--- aegisub/src/menu.cpp 2013-07-04 20:05:39.000000000 +0200 ++++ aegisub.new/src/menu.cpp 2013-11-06 17:02:30.254248453 +0100 +@@ -462,11 +462,11 @@ + 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 +diff -Naur aegisub/aegisub/src/utils.cpp aegisub.new/aegisub/src/utils.cpp +--- aegisub/src/utils.cpp 2013-07-04 20:05:39.000000000 +0200 ++++ aegisub.new/src/utils.cpp 2013-11-06 17:01:30.614247354 +0100 +@@ -279,8 +279,7 @@ + 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"); +@@ -290,8 +289,7 @@ + LOG_I("util/restart/exec") << exec; + wxExecute(exec); + #else +- wxStandardPaths stand; +- wxExecute(stand.GetExecutablePath()); ++ wxExecute(wxStandardPaths::Get().GetExecutablePath()); + #endif + } + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
