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

[Maxime Gauduin]

    Date: Saturday, April 4, 2015 @ 11:53:27
  Author: alucryd
Revision: 130675

upgpkg: aegisub 3.2.2-2

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

-------------------------+
 PKGBUILD                |    2 -
 aegisub-boost1.56.patch |   67 ----------------------------------------------
 2 files changed, 1 insertion(+), 68 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-04 09:43:20 UTC (rev 130674)
+++ PKGBUILD	2015-04-04 09:53:27 UTC (rev 130675)
@@ -5,7 +5,7 @@
 
 pkgname=aegisub
 pkgver=3.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A general-purpose subtitle editor with ASS/SSA support'
 arch=('i686' 'x86_64')
 url='http://www.aegisub.org'

Deleted: aegisub-boost1.56.patch
===================================================================
--- aegisub-boost1.56.patch	2015-04-04 09:43:20 UTC (rev 130674)
+++ aegisub-boost1.56.patch	2015-04-04 09:53:27 UTC (rev 130675)
@@ -1,67 +0,0 @@
-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);