[arch-commits] Commit in aegisub/trunk (PKGBUILD aegisub-wx-stl.patch)

[Maxime Gauduin]

    Date: Monday, January 13, 2014 @ 22:33:48
  Author: alucryd
Revision: 103948

upgpkg: aegisub 3.1.1-1

Modified:
  aegisub/trunk/PKGBUILD
Deleted:
  aegisub/trunk/aegisub-wx-stl.patch

----------------------+
 PKGBUILD             |   16 +++---------
 aegisub-wx-stl.patch |   61 -------------------------------------------------
 2 files changed, 4 insertions(+), 73 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-13 20:32:53 UTC (rev 103947)
+++ PKGBUILD	2014-01-13 21:33:48 UTC (rev 103948)
@@ -4,8 +4,8 @@
 # Contributor: Limao Luo <luolimao+AUR at gmail.com>
 
 pkgname=aegisub
-pkgver=3.1.0
-pkgrel=2
+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"
@@ -13,17 +13,9 @@
 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')
+source=("http://ftp.aegisub.org/pub/archives/releases/source/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('7f8417488cf56b835ddaa36e64916a64eb030fbd79d96a7f8009eae803e897ac')
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-
-  patch -Np1 -i ../aegisub-wx-stl.patch
-}
-
 build() {
   cd ${pkgname}-${pkgver}/${pkgname}
 

Deleted: aegisub-wx-stl.patch
===================================================================
--- aegisub-wx-stl.patch	2014-01-13 20:32:53 UTC (rev 103947)
+++ aegisub-wx-stl.patch	2014-01-13 21:33:48 UTC (rev 103948)
@@ -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
-