[arch-commits] Commit in aegisub/repos (8 files)
Maxime Gauduin
alucryd at nymeria.archlinux.org
Fri Aug 16 17:02:57 UTC 2013
Date: Friday, August 16, 2013 @ 19:02:57
Author: alucryd
Revision: 95769
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
aegisub/repos/community-staging-i686/
aegisub/repos/community-staging-i686/PKGBUILD
(from rev 95768, aegisub/trunk/PKGBUILD)
aegisub/repos/community-staging-i686/aegisub.install
(from rev 95768, aegisub/trunk/aegisub.install)
aegisub/repos/community-staging-i686/wxgtk2.9.5.patch
(from rev 95768, aegisub/trunk/wxgtk2.9.5.patch)
aegisub/repos/community-staging-x86_64/
aegisub/repos/community-staging-x86_64/PKGBUILD
(from rev 95768, aegisub/trunk/PKGBUILD)
aegisub/repos/community-staging-x86_64/aegisub.install
(from rev 95768, aegisub/trunk/aegisub.install)
aegisub/repos/community-staging-x86_64/wxgtk2.9.5.patch
(from rev 95768, aegisub/trunk/wxgtk2.9.5.patch)
-------------------------------------------+
community-staging-i686/PKGBUILD | 46 ++++++++++++++++++++++++++++
community-staging-i686/aegisub.install | 14 ++++++++
community-staging-i686/wxgtk2.9.5.patch | 36 +++++++++++++++++++++
community-staging-x86_64/PKGBUILD | 46 ++++++++++++++++++++++++++++
community-staging-x86_64/aegisub.install | 14 ++++++++
community-staging-x86_64/wxgtk2.9.5.patch | 36 +++++++++++++++++++++
6 files changed, 192 insertions(+)
Copied: aegisub/repos/community-staging-i686/PKGBUILD (from rev 95768, aegisub/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-08-16 17:02:57 UTC (rev 95769)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at gmail.com>
+# Contributor: kozec <kozec at kozec.com>
+# Contributor: Limao Luo <luolimao+AUR at 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-staging-i686/aegisub.install (from rev 95768, aegisub/trunk/aegisub.install)
===================================================================
--- community-staging-i686/aegisub.install (rev 0)
+++ community-staging-i686/aegisub.install 2013-08-16 17:02:57 UTC (rev 95769)
@@ -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:
Copied: aegisub/repos/community-staging-i686/wxgtk2.9.5.patch (from rev 95768, aegisub/trunk/wxgtk2.9.5.patch)
===================================================================
--- community-staging-i686/wxgtk2.9.5.patch (rev 0)
+++ community-staging-i686/wxgtk2.9.5.patch 2013-08-16 17:02:57 UTC (rev 95769)
@@ -0,0 +1,36 @@
+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() {
+ 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-staging-x86_64/PKGBUILD (from rev 95768, aegisub/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2013-08-16 17:02:57 UTC (rev 95769)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at gmail.com>
+# Contributor: kozec <kozec at kozec.com>
+# Contributor: Limao Luo <luolimao+AUR at 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-staging-x86_64/aegisub.install (from rev 95768, aegisub/trunk/aegisub.install)
===================================================================
--- community-staging-x86_64/aegisub.install (rev 0)
+++ community-staging-x86_64/aegisub.install 2013-08-16 17:02:57 UTC (rev 95769)
@@ -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:
Copied: aegisub/repos/community-staging-x86_64/wxgtk2.9.5.patch (from rev 95768, aegisub/trunk/wxgtk2.9.5.patch)
===================================================================
--- community-staging-x86_64/wxgtk2.9.5.patch (rev 0)
+++ community-staging-x86_64/wxgtk2.9.5.patch 2013-08-16 17:02:57 UTC (rev 95769)
@@ -0,0 +1,36 @@
+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() {
+ 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
+
More information about the arch-commits
mailing list