Date: Sunday, August 17, 2014 @ 14:19:46 Author: alucryd Revision: 117475
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 117474, aegisub/trunk/PKGBUILD) aegisub/repos/community-staging-i686/aegisub-boost1.56.patch (from rev 117474, aegisub/trunk/aegisub-boost1.56.patch) aegisub/repos/community-staging-i686/aegisub.install (from rev 117474, aegisub/trunk/aegisub.install) aegisub/repos/community-staging-x86_64/ aegisub/repos/community-staging-x86_64/PKGBUILD (from rev 117474, aegisub/trunk/PKGBUILD) aegisub/repos/community-staging-x86_64/aegisub-boost1.56.patch (from rev 117474, aegisub/trunk/aegisub-boost1.56.patch) aegisub/repos/community-staging-x86_64/aegisub.install (from rev 117474, aegisub/trunk/aegisub.install) --------------------------------------------------+ community-staging-i686/PKGBUILD | 44 +++++++++++++ community-staging-i686/aegisub-boost1.56.patch | 67 +++++++++++++++++++++ community-staging-i686/aegisub.install | 14 ++++ community-staging-x86_64/PKGBUILD | 44 +++++++++++++ community-staging-x86_64/aegisub-boost1.56.patch | 67 +++++++++++++++++++++ community-staging-x86_64/aegisub.install | 14 ++++ 6 files changed, 250 insertions(+) Copied: aegisub/repos/community-staging-i686/PKGBUILD (from rev 117474, aegisub/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2014-08-17 12:19:46 UTC (rev 117475) @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Maxime Gauduin <aluc...@gmail.com> +# Contributor: kozec <ko...@kozec.com> +# Contributor: Limao Luo <luolimao+...@gmail.com> + +pkgname=aegisub +pkgver=3.2.0 +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=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'wxgtk') +makedepends=('boost' 'intltool' 'mesa') +install="${pkgname}.install" +source=("http://ftp.aegisub.org/pub/archives/releases/source/${pkgname}-${pkgver}.tar.xz" + 'aegisub-boost1.56.patch') +sha256sums=('d9e5fd48b243e29832361a13f8be82b271ef0c606b13593ec72461156ee19159' + '998ffba66c5acd879c4bd87e339ee66cea875d37171a269ad5f29eedc2997ec0') + +prepare() { + cd ${pkgname}-${pkgver} + + patch -Np1 -i ../aegisub-boost1.56.patch +} + +build() { + cd ${pkgname}-${pkgver} + + ./configure --prefix='/usr' --without-{portaudio,openal,oss} \ + --disable-update-checker + make +} + +package() { + cd ${pkgname}-${pkgver} + + 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-staging-i686/aegisub-boost1.56.patch (from rev 117474, aegisub/trunk/aegisub-boost1.56.patch) =================================================================== --- community-staging-i686/aegisub-boost1.56.patch (rev 0) +++ community-staging-i686/aegisub-boost1.56.patch 2014-08-17 12:19:46 UTC (rev 117475) @@ -0,0 +1,67 @@ +diff --git a/libaegisub/include/libaegisub/lua/utils.h b/libaegisub/include/libaegisub/lua/utils.h +index 4e907ee..634d924 100644 +--- a/libaegisub/include/libaegisub/lua/utils.h ++++ b/libaegisub/include/libaegisub/lua/utils.h +@@ -16,21 +16,27 @@ + + #include <libaegisub/fs.h> + +-#include <boost/exception/detail/attribute_noreturn.hpp> + #include <lua.hpp> + #include <string> + #include <vector> + #include <type_traits> + ++#include <boost/config.hpp> ++ ++#ifndef BOOST_NORETURN ++#include <boost/exception/detail/attribute_noreturn.hpp> ++#define BOOST_NORETURN BOOST_ATTRIBUTE_NORETURN ++#endif ++ + namespace agi { namespace lua { + // Exception type for errors where the error details are on the lua stack + struct error_tag {}; + + // Below are functionally equivalent to the luaL_ functions, but using a C++ + // exception for stack unwinding +-int BOOST_ATTRIBUTE_NORETURN error(lua_State *L, const char *fmt, ...); +-int BOOST_ATTRIBUTE_NORETURN argerror(lua_State *L, int narg, const char *extramsg); +-int BOOST_ATTRIBUTE_NORETURN typerror(lua_State *L, int narg, const char *tname); ++int BOOST_NORETURN error(lua_State *L, const char *fmt, ...); ++int BOOST_NORETURN argerror(lua_State *L, int narg, const char *extramsg); ++int BOOST_NORETURN typerror(lua_State *L, int narg, const char *tname); + void argcheck(lua_State *L, bool cond, int narg, const char *msg); + + inline void push_value(lua_State *L, bool value) { lua_pushboolean(L, value); } +diff --git a/libaegisub/lua/utils.cpp b/libaegisub/lua/utils.cpp +index 8a5770e..9dd577b 100644 +--- a/libaegisub/lua/utils.cpp ++++ b/libaegisub/lua/utils.cpp +@@ -181,7 +181,7 @@ int add_stack_trace(lua_State *L) { + return 1; + } + +-int BOOST_ATTRIBUTE_NORETURN error(lua_State *L, const char *fmt, ...) { ++int BOOST_NORETURN error(lua_State *L, const char *fmt, ...) { + va_list argp; + va_start(argp, fmt); + luaL_where(L, 1); +@@ -191,7 +191,7 @@ int BOOST_ATTRIBUTE_NORETURN error(lua_State *L, const char *fmt, ...) { + throw error_tag(); + } + +-int BOOST_ATTRIBUTE_NORETURN argerror(lua_State *L, int narg, const char *extramsg) { ++int BOOST_NORETURN argerror(lua_State *L, int narg, const char *extramsg) { + lua_Debug ar; + if (!lua_getstack(L, 0, &ar)) + error(L, "bad argument #%d (%s)", narg, extramsg); +@@ -203,7 +203,7 @@ int BOOST_ATTRIBUTE_NORETURN argerror(lua_State *L, int narg, const char *extram + narg, ar.name, extramsg); + } + +-int BOOST_ATTRIBUTE_NORETURN typerror(lua_State *L, int narg, const char *tname) { ++int BOOST_NORETURN typerror(lua_State *L, int narg, const char *tname) { + const char *msg = lua_pushfstring(L, "%s expected, got %s", + tname, luaL_typename(L, narg)); + argerror(L, narg, msg); Copied: aegisub/repos/community-staging-i686/aegisub.install (from rev 117474, aegisub/trunk/aegisub.install) =================================================================== --- community-staging-i686/aegisub.install (rev 0) +++ community-staging-i686/aegisub.install 2014-08-17 12:19:46 UTC (rev 117475) @@ -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/PKGBUILD (from rev 117474, aegisub/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2014-08-17 12:19:46 UTC (rev 117475) @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Maxime Gauduin <aluc...@gmail.com> +# Contributor: kozec <ko...@kozec.com> +# Contributor: Limao Luo <luolimao+...@gmail.com> + +pkgname=aegisub +pkgver=3.2.0 +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=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'wxgtk') +makedepends=('boost' 'intltool' 'mesa') +install="${pkgname}.install" +source=("http://ftp.aegisub.org/pub/archives/releases/source/${pkgname}-${pkgver}.tar.xz" + 'aegisub-boost1.56.patch') +sha256sums=('d9e5fd48b243e29832361a13f8be82b271ef0c606b13593ec72461156ee19159' + '998ffba66c5acd879c4bd87e339ee66cea875d37171a269ad5f29eedc2997ec0') + +prepare() { + cd ${pkgname}-${pkgver} + + patch -Np1 -i ../aegisub-boost1.56.patch +} + +build() { + cd ${pkgname}-${pkgver} + + ./configure --prefix='/usr' --without-{portaudio,openal,oss} \ + --disable-update-checker + make +} + +package() { + cd ${pkgname}-${pkgver} + + 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-staging-x86_64/aegisub-boost1.56.patch (from rev 117474, aegisub/trunk/aegisub-boost1.56.patch) =================================================================== --- community-staging-x86_64/aegisub-boost1.56.patch (rev 0) +++ community-staging-x86_64/aegisub-boost1.56.patch 2014-08-17 12:19:46 UTC (rev 117475) @@ -0,0 +1,67 @@ +diff --git a/libaegisub/include/libaegisub/lua/utils.h b/libaegisub/include/libaegisub/lua/utils.h +index 4e907ee..634d924 100644 +--- a/libaegisub/include/libaegisub/lua/utils.h ++++ b/libaegisub/include/libaegisub/lua/utils.h +@@ -16,21 +16,27 @@ + + #include <libaegisub/fs.h> + +-#include <boost/exception/detail/attribute_noreturn.hpp> + #include <lua.hpp> + #include <string> + #include <vector> + #include <type_traits> + ++#include <boost/config.hpp> ++ ++#ifndef BOOST_NORETURN ++#include <boost/exception/detail/attribute_noreturn.hpp> ++#define BOOST_NORETURN BOOST_ATTRIBUTE_NORETURN ++#endif ++ + namespace agi { namespace lua { + // Exception type for errors where the error details are on the lua stack + struct error_tag {}; + + // Below are functionally equivalent to the luaL_ functions, but using a C++ + // exception for stack unwinding +-int BOOST_ATTRIBUTE_NORETURN error(lua_State *L, const char *fmt, ...); +-int BOOST_ATTRIBUTE_NORETURN argerror(lua_State *L, int narg, const char *extramsg); +-int BOOST_ATTRIBUTE_NORETURN typerror(lua_State *L, int narg, const char *tname); ++int BOOST_NORETURN error(lua_State *L, const char *fmt, ...); ++int BOOST_NORETURN argerror(lua_State *L, int narg, const char *extramsg); ++int BOOST_NORETURN typerror(lua_State *L, int narg, const char *tname); + void argcheck(lua_State *L, bool cond, int narg, const char *msg); + + inline void push_value(lua_State *L, bool value) { lua_pushboolean(L, value); } +diff --git a/libaegisub/lua/utils.cpp b/libaegisub/lua/utils.cpp +index 8a5770e..9dd577b 100644 +--- a/libaegisub/lua/utils.cpp ++++ b/libaegisub/lua/utils.cpp +@@ -181,7 +181,7 @@ int add_stack_trace(lua_State *L) { + return 1; + } + +-int BOOST_ATTRIBUTE_NORETURN error(lua_State *L, const char *fmt, ...) { ++int BOOST_NORETURN error(lua_State *L, const char *fmt, ...) { + va_list argp; + va_start(argp, fmt); + luaL_where(L, 1); +@@ -191,7 +191,7 @@ int BOOST_ATTRIBUTE_NORETURN error(lua_State *L, const char *fmt, ...) { + throw error_tag(); + } + +-int BOOST_ATTRIBUTE_NORETURN argerror(lua_State *L, int narg, const char *extramsg) { ++int BOOST_NORETURN argerror(lua_State *L, int narg, const char *extramsg) { + lua_Debug ar; + if (!lua_getstack(L, 0, &ar)) + error(L, "bad argument #%d (%s)", narg, extramsg); +@@ -203,7 +203,7 @@ int BOOST_ATTRIBUTE_NORETURN argerror(lua_State *L, int narg, const char *extram + narg, ar.name, extramsg); + } + +-int BOOST_ATTRIBUTE_NORETURN typerror(lua_State *L, int narg, const char *tname) { ++int BOOST_NORETURN typerror(lua_State *L, int narg, const char *tname) { + const char *msg = lua_pushfstring(L, "%s expected, got %s", + tname, luaL_typename(L, narg)); + argerror(L, narg, msg); Copied: aegisub/repos/community-staging-x86_64/aegisub.install (from rev 117474, aegisub/trunk/aegisub.install) =================================================================== --- community-staging-x86_64/aegisub.install (rev 0) +++ community-staging-x86_64/aegisub.install 2014-08-17 12:19:46 UTC (rev 117475) @@ -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: