From 6758118b3dff2cf3d13de631d67db804e8e3aabc Mon Sep 17 00:00:00 2001 From: Guido Falsi Date: Wed, 28 Sep 2016 16:55:38 +0000 Subject: - Update conky and conky-awesome to 1.10.4 - Take maintainership [1] - Options adapted to new version - Removed LUA option since it's a mandatoory requirement now - Use project own install target - Fix installation of lua helper libraries - Project moved to github - in conky-awesome, properly use OPTIONS_EXCLUDE PR: 212629 Submitted by: me Approved by: ntarmos@ceid.upatras.gr (former maintainer) [1] --- sysutils/conky/files/patch-src_luamm.cc | 39 +++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 sysutils/conky/files/patch-src_luamm.cc (limited to 'sysutils/conky/files/patch-src_luamm.cc') diff --git a/sysutils/conky/files/patch-src_luamm.cc b/sysutils/conky/files/patch-src_luamm.cc new file mode 100644 index 000000000000..2d28deba36a5 --- /dev/null +++ b/sysutils/conky/files/patch-src_luamm.cc @@ -0,0 +1,39 @@ +--- src/luamm.cc.orig 2016-07-20 16:53:48 UTC ++++ src/luamm.cc +@@ -57,7 +57,8 @@ namespace lua { + lua_pushstring(l, e.what()); + } + catch(...) { +- lua_pushstring(l, ptr->__cxa_exception_type()->name()); ++// lua_pushstring(l, ptr->__cxa_exception_type()->name()); ++ lua_pushstring(l, "Unknown exception"); + } + return 1; + } +@@ -344,7 +345,7 @@ namespace lua { + pushinteger(what); + pushinteger(data); + call(2, 1, 0); +- assert(isnumber(-1)); ++ assert(isanumber(-1)); + int r = tointeger(-1); + pop(); + return r; +@@ -427,7 +428,7 @@ namespace lua { + + call(2, MULTRET, 0); + +- assert(isnumber(-1)); ++ assert(isanumber(-1)); + int r = tointeger(-1); + pop(); + return r; +@@ -466,7 +467,7 @@ namespace lua { + pushvalue(index1); + pushvalue(index2); + call(2, 1, 0); +- assert(isnumber(-1)); ++ assert(isanumber(-1)); + int r = tointeger(-1); + pop(); + return r; -- cgit v1.2.3