[arch-commits] Commit in aegisub/trunk (PKGBUILD aegisub-boost1.56.patch)

[Maxime Gauduin]

    Date: Sunday, August 17, 2014 @ 14:19:37
  Author: alucryd
Revision: 117474

boost rebuild: aegisub 3.2.0-3

Added:
  aegisub/trunk/aegisub-boost1.56.patch
Modified:
  aegisub/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   14 +++++++--
 aegisub-boost1.56.patch |   67 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-17 11:52:22 UTC (rev 117473)
+++ PKGBUILD	2014-08-17 12:19:37 UTC (rev 117474)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'
@@ -13,9 +13,17 @@
 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")
-sha256sums=('d9e5fd48b243e29832361a13f8be82b271ef0c606b13593ec72461156ee19159')
+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}
 

Added: aegisub-boost1.56.patch
===================================================================
--- aegisub-boost1.56.patch	                        (rev 0)
+++ aegisub-boost1.56.patch	2014-08-17 12:19:37 UTC (rev 117474)
@@ -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);


Property changes on: aegisub/trunk/aegisub-boost1.56.patch
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property