[arch-commits] Commit in aegisub/repos (10 files)
Maxime Gauduin
alucryd at nymeria.archlinux.org
Mon Jan 13 21:34:11 UTC 2014
Date: Monday, January 13, 2014 @ 22:34:11
Author: alucryd
Revision: 103949
archrelease: copy trunk to community-i686, community-x86_64
Added:
aegisub/repos/community-i686/PKGBUILD
(from rev 103948, aegisub/trunk/PKGBUILD)
aegisub/repos/community-i686/aegisub.install
(from rev 103948, aegisub/trunk/aegisub.install)
aegisub/repos/community-x86_64/PKGBUILD
(from rev 103948, aegisub/trunk/PKGBUILD)
aegisub/repos/community-x86_64/aegisub.install
(from rev 103948, aegisub/trunk/aegisub.install)
Deleted:
aegisub/repos/community-i686/PKGBUILD
aegisub/repos/community-i686/aegisub-wx-stl.patch
aegisub/repos/community-i686/aegisub.install
aegisub/repos/community-x86_64/PKGBUILD
aegisub/repos/community-x86_64/aegisub-wx-stl.patch
aegisub/repos/community-x86_64/aegisub.install
---------------------------------------+
/PKGBUILD | 70 ++++++++++++++++++++++++++++++++
/aegisub.install | 28 ++++++++++++
community-i686/PKGBUILD | 43 -------------------
community-i686/aegisub-wx-stl.patch | 61 ---------------------------
community-i686/aegisub.install | 14 ------
community-x86_64/PKGBUILD | 43 -------------------
community-x86_64/aegisub-wx-stl.patch | 61 ---------------------------
community-x86_64/aegisub.install | 14 ------
8 files changed, 98 insertions(+), 236 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-01-13 21:33:48 UTC (rev 103948)
+++ community-i686/PKGBUILD 2014-01-13 21:34:11 UTC (rev 103949)
@@ -1,43 +0,0 @@
-# $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.1.0
-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=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'lua51' 'wxgtk')
-makedepends=('boost' 'intltool' 'mesa')
-install="${pkgname}.install"
-source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz"
- 'aegisub-wx-stl.patch')
-sha256sums=('3df061456bbab6bd955d7c5b63336be47392eafa21148ff6ed5727eaa6a29987'
- '1306b2caf2e192597a99931b4519023ea63b684f330e0838b1152d52b279f6c1')
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
- patch -Np1 -i ../aegisub-wx-stl.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}/${pkgname}
-
- ./configure --prefix='/usr' --without-{portaudio,openal,oss}
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}/${pkgname}
-
- make DESTDIR="${pkgdir}" install
-
- 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 103948, aegisub/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-01-13 21:34:11 UTC (rev 103949)
@@ -0,0 +1,35 @@
+# $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.1.1
+pkgrel=1
+pkgdesc="A general-purpose subtitle editor with ASS/SSA support"
+arch=('i686' 'x86_64')
+url="http://www.aegisub.org"
+license=('GPL' 'BSD')
+depends=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'lua51' 'wxgtk')
+makedepends=('boost' 'intltool' 'mesa')
+install="${pkgname}.install"
+source=("http://ftp.aegisub.org/pub/archives/releases/source/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('7f8417488cf56b835ddaa36e64916a64eb030fbd79d96a7f8009eae803e897ac')
+
+build() {
+ cd ${pkgname}-${pkgver}/${pkgname}
+
+ ./configure --prefix='/usr' --without-{portaudio,openal,oss}
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}/${pkgname}
+
+ make DESTDIR="${pkgdir}" install
+
+ 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-wx-stl.patch
===================================================================
--- community-i686/aegisub-wx-stl.patch 2014-01-13 21:33:48 UTC (rev 103948)
+++ community-i686/aegisub-wx-stl.patch 2014-01-13 21:34:11 UTC (rev 103949)
@@ -1,61 +0,0 @@
-From f71b380f016c7f2b7ec855a9945a4e62ad3e2e16 Mon Sep 17 00:00:00 2001
-From: Thomas Goyne <plorkyeran at aegisub.org>
-Date: Sun, 5 Jan 2014 08:10:08 -0800
-Subject: [PATCH 1/4] Fix compilation with wx built with --enable-stl
-
---enable-stl replaces the implicit conversion to char/wchar_t* with one
-to std::[w]string. This breaks conversions to boost::filesytem::path and
-makes some ternaries ambiguous (which GCC helpfully reports as no
-conversion existing rather than an ambiguous conversion).
----
- aegisub/src/base_grid.cpp | 6 +++---
- aegisub/src/command/video.cpp | 2 +-
- aegisub/src/dialog_attachments.cpp | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp
-index 9422bf9..4675ad5 100644
---- a/aegisub/src/base_grid.cpp
-+++ b/aegisub/src/base_grid.cpp
-@@ -570,9 +570,9 @@ void BaseGrid::GetRowStrings(int row, AssDialogue *line, bool *paint_columns, wx
- if (paint_columns[4]) strings[4] = to_wx(line->Style);
- if (paint_columns[5]) strings[5] = to_wx(line->Actor);
- if (paint_columns[6]) strings[6] = to_wx(line->Effect);
-- if (paint_columns[7]) strings[7] = line->Margin[0] ? std::to_wstring(line->Margin[0]) : wxString();
-- if (paint_columns[8]) strings[8] = line->Margin[1] ? std::to_wstring(line->Margin[1]) : wxString();
-- if (paint_columns[9]) strings[9] = line->Margin[2] ? std::to_wstring(line->Margin[2]) : wxString();
-+ if (paint_columns[7]) strings[7] = line->Margin[0] ? wxString(std::to_wstring(line->Margin[0])) : wxString();
-+ if (paint_columns[8]) strings[8] = line->Margin[1] ? wxString(std::to_wstring(line->Margin[1])) : wxString();
-+ if (paint_columns[9]) strings[9] = line->Margin[2] ? wxString(std::to_wstring(line->Margin[2])) : wxString();
-
- if (paint_columns[10]) {
- strings[10].clear();
-diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp
-index 010da90..47bf259 100644
---- a/aegisub/src/command/video.cpp
-+++ b/aegisub/src/command/video.cpp
-@@ -476,7 +476,7 @@ static void save_snapshot(agi::Context *c, bool raw) {
- // If where ever that is isn't defined, we can't save there
- if ((basepath == "\\") || (basepath == "/")) {
- // So save to the current user's home dir instead
-- basepath = wxGetHomeDir();
-+ basepath = wxGetHomeDir().c_str();
- }
- }
- // Actual fixed (possibly relative) path, decode it
-diff --git a/aegisub/src/dialog_attachments.cpp b/aegisub/src/dialog_attachments.cpp
-index 5465b39..2ff696e 100644
---- a/aegisub/src/dialog_attachments.cpp
-+++ b/aegisub/src/dialog_attachments.cpp
-@@ -150,7 +150,7 @@ void DialogAttachments::OnExtract(wxCommandEvent &) {
-
- // Multiple or single?
- if (listView->GetNextSelected(i) != -1)
-- path = wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString()));
-+ path = wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())).c_str();
- else {
- path = SaveFileSelector(
- _("Select the path to save the file to:"),
---
-1.8.5.2
-
Deleted: community-i686/aegisub.install
===================================================================
--- community-i686/aegisub.install 2014-01-13 21:33:48 UTC (rev 103948)
+++ community-i686/aegisub.install 2014-01-13 21:34:11 UTC (rev 103949)
@@ -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 103948, aegisub/trunk/aegisub.install)
===================================================================
--- community-i686/aegisub.install (rev 0)
+++ community-i686/aegisub.install 2014-01-13 21:34:11 UTC (rev 103949)
@@ -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/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-01-13 21:33:48 UTC (rev 103948)
+++ community-x86_64/PKGBUILD 2014-01-13 21:34:11 UTC (rev 103949)
@@ -1,43 +0,0 @@
-# $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.1.0
-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=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'lua51' 'wxgtk')
-makedepends=('boost' 'intltool' 'mesa')
-install="${pkgname}.install"
-source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz"
- 'aegisub-wx-stl.patch')
-sha256sums=('3df061456bbab6bd955d7c5b63336be47392eafa21148ff6ed5727eaa6a29987'
- '1306b2caf2e192597a99931b4519023ea63b684f330e0838b1152d52b279f6c1')
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
- patch -Np1 -i ../aegisub-wx-stl.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}/${pkgname}
-
- ./configure --prefix='/usr' --without-{portaudio,openal,oss}
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}/${pkgname}
-
- make DESTDIR="${pkgdir}" install
-
- 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 103948, aegisub/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-01-13 21:34:11 UTC (rev 103949)
@@ -0,0 +1,35 @@
+# $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.1.1
+pkgrel=1
+pkgdesc="A general-purpose subtitle editor with ASS/SSA support"
+arch=('i686' 'x86_64')
+url="http://www.aegisub.org"
+license=('GPL' 'BSD')
+depends=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'lua51' 'wxgtk')
+makedepends=('boost' 'intltool' 'mesa')
+install="${pkgname}.install"
+source=("http://ftp.aegisub.org/pub/archives/releases/source/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('7f8417488cf56b835ddaa36e64916a64eb030fbd79d96a7f8009eae803e897ac')
+
+build() {
+ cd ${pkgname}-${pkgver}/${pkgname}
+
+ ./configure --prefix='/usr' --without-{portaudio,openal,oss}
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}/${pkgname}
+
+ make DESTDIR="${pkgdir}" install
+
+ 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-wx-stl.patch
===================================================================
--- community-x86_64/aegisub-wx-stl.patch 2014-01-13 21:33:48 UTC (rev 103948)
+++ community-x86_64/aegisub-wx-stl.patch 2014-01-13 21:34:11 UTC (rev 103949)
@@ -1,61 +0,0 @@
-From f71b380f016c7f2b7ec855a9945a4e62ad3e2e16 Mon Sep 17 00:00:00 2001
-From: Thomas Goyne <plorkyeran at aegisub.org>
-Date: Sun, 5 Jan 2014 08:10:08 -0800
-Subject: [PATCH 1/4] Fix compilation with wx built with --enable-stl
-
---enable-stl replaces the implicit conversion to char/wchar_t* with one
-to std::[w]string. This breaks conversions to boost::filesytem::path and
-makes some ternaries ambiguous (which GCC helpfully reports as no
-conversion existing rather than an ambiguous conversion).
----
- aegisub/src/base_grid.cpp | 6 +++---
- aegisub/src/command/video.cpp | 2 +-
- aegisub/src/dialog_attachments.cpp | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp
-index 9422bf9..4675ad5 100644
---- a/aegisub/src/base_grid.cpp
-+++ b/aegisub/src/base_grid.cpp
-@@ -570,9 +570,9 @@ void BaseGrid::GetRowStrings(int row, AssDialogue *line, bool *paint_columns, wx
- if (paint_columns[4]) strings[4] = to_wx(line->Style);
- if (paint_columns[5]) strings[5] = to_wx(line->Actor);
- if (paint_columns[6]) strings[6] = to_wx(line->Effect);
-- if (paint_columns[7]) strings[7] = line->Margin[0] ? std::to_wstring(line->Margin[0]) : wxString();
-- if (paint_columns[8]) strings[8] = line->Margin[1] ? std::to_wstring(line->Margin[1]) : wxString();
-- if (paint_columns[9]) strings[9] = line->Margin[2] ? std::to_wstring(line->Margin[2]) : wxString();
-+ if (paint_columns[7]) strings[7] = line->Margin[0] ? wxString(std::to_wstring(line->Margin[0])) : wxString();
-+ if (paint_columns[8]) strings[8] = line->Margin[1] ? wxString(std::to_wstring(line->Margin[1])) : wxString();
-+ if (paint_columns[9]) strings[9] = line->Margin[2] ? wxString(std::to_wstring(line->Margin[2])) : wxString();
-
- if (paint_columns[10]) {
- strings[10].clear();
-diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp
-index 010da90..47bf259 100644
---- a/aegisub/src/command/video.cpp
-+++ b/aegisub/src/command/video.cpp
-@@ -476,7 +476,7 @@ static void save_snapshot(agi::Context *c, bool raw) {
- // If where ever that is isn't defined, we can't save there
- if ((basepath == "\\") || (basepath == "/")) {
- // So save to the current user's home dir instead
-- basepath = wxGetHomeDir();
-+ basepath = wxGetHomeDir().c_str();
- }
- }
- // Actual fixed (possibly relative) path, decode it
-diff --git a/aegisub/src/dialog_attachments.cpp b/aegisub/src/dialog_attachments.cpp
-index 5465b39..2ff696e 100644
---- a/aegisub/src/dialog_attachments.cpp
-+++ b/aegisub/src/dialog_attachments.cpp
-@@ -150,7 +150,7 @@ void DialogAttachments::OnExtract(wxCommandEvent &) {
-
- // Multiple or single?
- if (listView->GetNextSelected(i) != -1)
-- path = wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString()));
-+ path = wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())).c_str();
- else {
- path = SaveFileSelector(
- _("Select the path to save the file to:"),
---
-1.8.5.2
-
Deleted: community-x86_64/aegisub.install
===================================================================
--- community-x86_64/aegisub.install 2014-01-13 21:33:48 UTC (rev 103948)
+++ community-x86_64/aegisub.install 2014-01-13 21:34:11 UTC (rev 103949)
@@ -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 103948, aegisub/trunk/aegisub.install)
===================================================================
--- community-x86_64/aegisub.install (rev 0)
+++ community-x86_64/aegisub.install 2014-01-13 21:34:11 UTC (rev 103949)
@@ -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:
More information about the arch-commits
mailing list