Date: Monday, September 2, 2013 @ 10:35:43
Author: alucryd
Revision: 96598
archrelease: copy trunk to community-i686, community-x86_64
Added:
aegisub/repos/community-i686/PKGBUILD
(from rev 96597, aegisub/trunk/PKGBUILD)
aegisub/repos/community-i686/aegisub.install
(from rev 96597, aegisub/trunk/aegisub.install)
aegisub/repos/community-i686/wxgtk2.9.5.patch
(from rev 96597, aegisub/trunk/wxgtk2.9.5.patch)
aegisub/repos/community-x86_64/PKGBUILD
(from rev 96597, aegisub/trunk/PKGBUILD)
aegisub/repos/community-x86_64/aegisub.install
(from rev 96597, aegisub/trunk/aegisub.install)
aegisub/repos/community-x86_64/wxgtk2.9.5.patch
(from rev 96597, aegisub/trunk/wxgtk2.9.5.patch)
Deleted:
aegisub/repos/community-i686/PKGBUILD
aegisub/repos/community-i686/aegisub.install
aegisub/repos/community-i686/wxgtk2.9.5.patch
aegisub/repos/community-x86_64/PKGBUILD
aegisub/repos/community-x86_64/aegisub.install
aegisub/repos/community-x86_64/wxgtk2.9.5.patch
-----------------------------------+
/PKGBUILD | 92 ++++++++++++++++++++++++++++++++++++
/aegisub.install | 28 ++++++++++
/wxgtk2.9.5.patch | 82 ++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 46 ------------------
community-i686/aegisub.install | 14 -----
community-i686/wxgtk2.9.5.patch | 36 --------------
community-x86_64/PKGBUILD | 46 ------------------
community-x86_64/aegisub.install | 14 -----
community-x86_64/wxgtk2.9.5.patch | 36 --------------
9 files changed, 202 insertions(+), 192 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-09-02 08:35:25 UTC (rev 96597)
+++ community-i686/PKGBUILD 2013-09-02 08:35:43 UTC (rev 96598)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <aluc...@gmail.com>
-# Contributor: kozec <ko...@kozec.com>
-# Contributor: Limao Luo <luolimao+...@gmail.com>
-
-pkgname=aegisub
-pkgver=3.0.4
-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')
-makedepends=('mesa')
-install=aegisub.install
-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 ${pkgname}/${pkgname}
-
- 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 ${pkgname}/${pkgname}
-
- make DESTDIR="${pkgdir}" install
-
-# License
- install -dm 755 "${pkgdir}"/usr/share/licenses/aegisub
- install -m 644 LICENCE "${pkgdir}"/usr/share/licenses/aegisub/LICENSE
-}
-
-# vim: ts=2 sw=2 et:
Copied: aegisub/repos/community-i686/PKGBUILD (from rev 96597,
aegisub/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-09-02 08:35:43 UTC (rev 96598)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Maxime Gauduin <aluc...@gmail.com>
+# Contributor: kozec <ko...@kozec.com>
+# Contributor: Limao Luo <luolimao+...@gmail.com>
+
+pkgname=aegisub
+pkgver=3.0.4
+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="${pkgname}.install"
+source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz";
+ 'wxgtk2.9.5.patch')
+sha256sums=('7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a'
+ '8aed8aaf4773e4a315f9336d3ea4af2c46b9e84c4e651c202e0a70a6cd9e499c')
+
+prepare() {
+ cd ${pkgname}/${pkgname}
+
+ patch -Np2 -i ../../wxgtk2.9.5.patch
+}
+
+build() {
+ cd ${pkgname}/${pkgname}
+
+ 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 ${pkgname}/${pkgname}
+
+ make DESTDIR="${pkgdir}" install
+
+# License
+ install -dm 755 "${pkgdir}"/usr/share/licenses/aegisub
+ install -m 644 LICENCE "${pkgdir}"/usr/share/licenses/aegisub/LICENSE
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-i686/aegisub.install
===================================================================
--- community-i686/aegisub.install 2013-09-02 08:35:25 UTC (rev 96597)
+++ community-i686/aegisub.install 2013-09-02 08:35:43 UTC (rev 96598)
@@ -1,14 +0,0 @@
-post_install() {
- gtk-update-icon-cache -ftq usr/share/icons/hicolor
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim: ts=2 sw=2 et:
Copied: aegisub/repos/community-i686/aegisub.install (from rev 96597,
aegisub/trunk/aegisub.install)
===================================================================
--- community-i686/aegisub.install (rev 0)
+++ community-i686/aegisub.install 2013-09-02 08:35:43 UTC (rev 96598)
@@ -0,0 +1,14 @@
+post_install() {
+ gtk-update-icon-cache -ftq usr/share/icons/hicolor
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-i686/wxgtk2.9.5.patch
===================================================================
--- community-i686/wxgtk2.9.5.patch 2013-09-02 08:35:25 UTC (rev 96597)
+++ community-i686/wxgtk2.9.5.patch 2013-09-02 08:35:43 UTC (rev 96598)
@@ -1,36 +0,0 @@
-From ca8036d425bf59020b476259e7857e8c67ebb6ba Mon Sep 17 00:00:00 2001
-From: Maxime Gauduin <aluc...@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
-
Copied: aegisub/repos/community-i686/wxgtk2.9.5.patch (from rev 96597,
aegisub/trunk/wxgtk2.9.5.patch)
===================================================================
--- community-i686/wxgtk2.9.5.patch (rev 0)
+++ community-i686/wxgtk2.9.5.patch 2013-09-02 08:35:43 UTC (rev 96598)
@@ -0,0 +1,41 @@
+--- 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
+ }
+
+--- 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
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-09-02 08:35:25 UTC (rev 96597)
+++ community-x86_64/PKGBUILD 2013-09-02 08:35:43 UTC (rev 96598)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <aluc...@gmail.com>
-# Contributor: kozec <ko...@kozec.com>
-# Contributor: Limao Luo <luolimao+...@gmail.com>
-
-pkgname=aegisub
-pkgver=3.0.4
-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')
-makedepends=('mesa')
-install=aegisub.install
-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 ${pkgname}/${pkgname}
-
- 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 ${pkgname}/${pkgname}
-
- make DESTDIR="${pkgdir}" install
-
-# License
- install -dm 755 "${pkgdir}"/usr/share/licenses/aegisub
- install -m 644 LICENCE "${pkgdir}"/usr/share/licenses/aegisub/LICENSE
-}
-
-# vim: ts=2 sw=2 et:
Copied: aegisub/repos/community-x86_64/PKGBUILD (from rev 96597,
aegisub/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-09-02 08:35:43 UTC (rev 96598)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Maxime Gauduin <aluc...@gmail.com>
+# Contributor: kozec <ko...@kozec.com>
+# Contributor: Limao Luo <luolimao+...@gmail.com>
+
+pkgname=aegisub
+pkgver=3.0.4
+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="${pkgname}.install"
+source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz";
+ 'wxgtk2.9.5.patch')
+sha256sums=('7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a'
+ '8aed8aaf4773e4a315f9336d3ea4af2c46b9e84c4e651c202e0a70a6cd9e499c')
+
+prepare() {
+ cd ${pkgname}/${pkgname}
+
+ patch -Np2 -i ../../wxgtk2.9.5.patch
+}
+
+build() {
+ cd ${pkgname}/${pkgname}
+
+ 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 ${pkgname}/${pkgname}
+
+ make DESTDIR="${pkgdir}" install
+
+# License
+ install -dm 755 "${pkgdir}"/usr/share/licenses/aegisub
+ install -m 644 LICENCE "${pkgdir}"/usr/share/licenses/aegisub/LICENSE
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-x86_64/aegisub.install
===================================================================
--- community-x86_64/aegisub.install 2013-09-02 08:35:25 UTC (rev 96597)
+++ community-x86_64/aegisub.install 2013-09-02 08:35:43 UTC (rev 96598)
@@ -1,14 +0,0 @@
-post_install() {
- gtk-update-icon-cache -ftq usr/share/icons/hicolor
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim: ts=2 sw=2 et:
Copied: aegisub/repos/community-x86_64/aegisub.install (from rev 96597,
aegisub/trunk/aegisub.install)
===================================================================
--- community-x86_64/aegisub.install (rev 0)
+++ community-x86_64/aegisub.install 2013-09-02 08:35:43 UTC (rev 96598)
@@ -0,0 +1,14 @@
+post_install() {
+ gtk-update-icon-cache -ftq usr/share/icons/hicolor
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-x86_64/wxgtk2.9.5.patch
===================================================================
--- community-x86_64/wxgtk2.9.5.patch 2013-09-02 08:35:25 UTC (rev 96597)
+++ community-x86_64/wxgtk2.9.5.patch 2013-09-02 08:35:43 UTC (rev 96598)
@@ -1,36 +0,0 @@
-From ca8036d425bf59020b476259e7857e8c67ebb6ba Mon Sep 17 00:00:00 2001
-From: Maxime Gauduin <aluc...@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
-
Copied: aegisub/repos/community-x86_64/wxgtk2.9.5.patch (from rev 96597,
aegisub/trunk/wxgtk2.9.5.patch)
===================================================================
--- community-x86_64/wxgtk2.9.5.patch (rev 0)
+++ community-x86_64/wxgtk2.9.5.patch 2013-09-02 08:35:43 UTC (rev 96598)
@@ -0,0 +1,41 @@
+--- 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
+ }
+
+--- 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
