Date: Thursday, January 9, 2014 @ 10:26:44
  Author: alucryd
Revision: 103672

upgpkg: aegisub 3.1.0-2

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

----------------------+
 PKGBUILD             |   17 +++++++---
 aegisub-wx-stl.patch |   61 +++++++++++++++++++++++++++++++++++++++
 version.patch        |   76 -------------------------------------------------
 3 files changed, 72 insertions(+), 82 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2014-01-09 06:33:11 UTC (rev 103671)
+++ PKGBUILD    2014-01-09 09:26:44 UTC (rev 103672)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A general-purpose subtitle editor with ASS/SSA support"
 arch=('i686' 'x86_64')
 url="http://www.aegisub.org";
@@ -14,23 +14,28 @@
 makedepends=('boost' 'intltool' 'mesa')
 install="${pkgname}.install"
 source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz";
-        'version.patch')
-sha256sums=('0d2befed013f3c64ab2cdf725f2b865fe2d074b35b621b7a61298b95f67def15'
-            '4119b79363512b18c6ddcbbdfb87b35c51e0ea149e763b126f568e80f956a01f')
+        'aegisub-wx-stl.patch')
+sha256sums=('3df061456bbab6bd955d7c5b63336be47392eafa21148ff6ed5727eaa6a29987'
+            '1306b2caf2e192597a99931b4519023ea63b684f330e0838b1152d52b279f6c1')
 
 prepare() {
-  patch -Np1 -i version.patch
+  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
 
-# License
   install -dm 755 "${pkgdir}"/usr/share/licenses/aegisub
   install -m 644 LICENCE "${pkgdir}"/usr/share/licenses/aegisub/LICENSE
 }

Added: aegisub-wx-stl.patch
===================================================================
--- aegisub-wx-stl.patch                                (rev 0)
+++ aegisub-wx-stl.patch        2014-01-09 09:26:44 UTC (rev 103672)
@@ -0,0 +1,61 @@
+From f71b380f016c7f2b7ec855a9945a4e62ad3e2e16 Mon Sep 17 00:00:00 2001
+From: Thomas Goyne <plorkye...@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: version.patch
===================================================================
--- version.patch       2014-01-09 06:33:11 UTC (rev 103671)
+++ version.patch       2014-01-09 09:26:44 UTC (rev 103672)
@@ -1,76 +0,0 @@
---- a/build/version.sh 2014-01-04 15:24:06.000000000 +0100
-+++ b/build/version.sh 2014-01-04 18:34:30.596106160 +0100
-@@ -1,70 +1,3 @@
--srcdir="$1"
--
--# If no git repo try to read from the existing git_version.h, for building 
from tarballs
--if ! test -d "${srcdir}/.git"; then
--  version_h_path="${srcdir}/aegisub/build/git_version.h"
--  if test -f "${version_h_path}"; then
--    while read line; do
--      set -- $line
--      export $2=$(echo $3 | sed 's/"//g')
--    done < "${version_h_path}"
--    if test x$BUILD_GIT_VERSION_NUMBER != x -a x$BUILD_GIT_VERSION_STRING != 
x; then
--      export VERSION_SOURCE="from cached git_version.h"
--      return 0
--    else
--      echo "invalid git_version.h"
--      exit 2
--    fi
--  else
--    echo "git repo not found and no cached git_version.h"
--    exit 2
--  fi
--fi
--
--last_svn_revision=6962
--last_svn_hash="16cd907fe7482cb54a7374cd28b8501f138116be"
--
--git_revision=$(expr $last_svn_revision + $(git log --pretty=oneline 
$last_svn_hash..HEAD 2>/dev/null | wc -l))
--git_version_str=$(git describe --exact-match 2> /dev/null)
--if test x$git_version_str != x; then
--  git_version_str="${git_version_str##v}"
--  tagged_release=1
--else
--  git_branch="$(git symbolic-ref HEAD 2> /dev/null)" || git_branch="(unnamed 
branch)"
--  git_branch="${git_branch##refs/heads/}"
--  git_hash=$(git rev-parse --short HEAD)
--
--  git_version_str="${git_revision}-${git_branch}-${git_hash}"
--  tagged_release=0
--fi
--
--new_version_h="\
--#define BUILD_GIT_VERSION_NUMBER ${git_revision}
--#define BUILD_GIT_VERSION_STRING \"${git_version_str}\"
--#define TAGGED_RELEASE ${tagged_release}"
--
--# may not exist yet for out of tree builds
--mkdir -p build
--version_h_path="build/git_version.h"
--
--# Write it only if it's changed to avoid spurious rebuilds
--# This bizzare comparison method is due to that newlines in shell variables 
are very exciting
--case "$(cat ${version_h_path} 2> /dev/null)"
--in
--  "${new_version_h}");;
--  *) echo "${new_version_h}" > "${version_h_path}"
--esac
--
--export BUILD_GIT_VERSION_NUMBER="${git_revision}"
--export BUILD_GIT_VERSION_STRING="${git_version_str}"
--export VERSION_SOURCE="from git"
--
--cat << EOF > build/git_version.xml
--<?xml version="1.0" encoding="utf-8"?>
--<Project ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
--  <PropertyGroup>
--    <GitVersionNumber>${git_revision}</GitVersionNumber>
--    <GitVersionString>${git_version_str}</GitVersionString>
--  </PropertyGroup>
--</Project>
--EOF
-+export BUILD_GIT_VERSION_NUMBER='7937'
-+export BUILD_GIT_VERSION_STRING='3.1.0'
-+export TAGGED_RELEASE=1

Reply via email to