Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Ismael Luceno (3e7a2eaf12f7a3d396c8007f8c29a2c11ab2561a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Ismael Luceno (3e7a2eaf12f7a3d396c8007f8c29a2c11ab2561a)
  • Date: Mon, 29 Aug 2016 18:08:26 +0000

GIT changes to master z-rejected grimoire by Ismael Luceno
<ismael AT sourcemage.org>:

z-windowmanagers/notion/DEPENDS
| 2
z-windowmanagers/notion/DETAILS
| 8 -
z-windowmanagers/notion/HISTORY
| 6 +
z-windowmanagers/notion/PRE_BUILD
| 5

z-windowmanagers/notion/patches/0001-Remove-return-value-from-re-sethook-closes-4.patch
| 55 ++++++++++
5 files changed, 71 insertions(+), 5 deletions(-)

New commits:
commit 3e7a2eaf12f7a3d396c8007f8c29a2c11ab2561a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

notion: Fix build against Lua 5.3

commit f50979d5809ef231a7ba6241d2d278acf91418cb
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

notion 3-2015061300

diff --git a/z-windowmanagers/notion/DEPENDS b/z-windowmanagers/notion/DEPENDS
index c07018a..84900a6 100755
--- a/z-windowmanagers/notion/DEPENDS
+++ b/z-windowmanagers/notion/DEPENDS
@@ -4,7 +4,7 @@ depends libice &&
depends libsm &&
depends libx11 &&
depends libxext &&
-depends lua51 &&
+depends LUA &&

optional_depends libxinerama \
"" \
diff --git a/z-windowmanagers/notion/DETAILS b/z-windowmanagers/notion/DETAILS
index 593f400..cd3ec9d 100755
--- a/z-windowmanagers/notion/DETAILS
+++ b/z-windowmanagers/notion/DETAILS
@@ -1,10 +1,10 @@
SPELL=notion
- VERSION=3-2014052800
- SOURCE=$SPELL-$VERSION-src.tar.bz2
+ VERSION=3-2015061300
+ SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://notion.sourceforge.net/
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:8c39a1de328d6f6f5154f357febf5934c68d9dc50cbadcb3d56ed96b401a4b484ffca54d8a3dfb02125905b4859d1d09886306675f28effb40303ec315695538
+ SOURCE_URL[0]=https://github.com/raboof/$SPELL/archive/$VERSION.tar.gz
+
SOURCE_HASH=sha512:254be12a8ece555d9f6253d99891bb51214379d0c04b6bf9595b7e5bf9493cb5d2fada37438f89621e7157f9e3647e446b5e173847498ee3608081f006b86679
LICENSE[0]=LGPL
REJECT="notion has licensing issues."
ENTERED=20120917
diff --git a/z-windowmanagers/notion/HISTORY b/z-windowmanagers/notion/HISTORY
index 199cf0b..264d7d6 100644
--- a/z-windowmanagers/notion/HISTORY
+++ b/z-windowmanagers/notion/HISTORY
@@ -1,3 +1,9 @@
+2016-08-29 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 3-2015061300
+ * patches/0001-Remove-return-value-from-re-sethook-closes-4.patch,
+ DEPENDS, PRE_BUILD: Fixed build against Lua 5.3
+
2014-07-06 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: version 3-2014052800
* BUILD, CONFIGURE, INSTALL, PREBUILD: configuration options and
diff --git a/z-windowmanagers/notion/PRE_BUILD
b/z-windowmanagers/notion/PRE_BUILD
index 367239a..997dd3b 100755
--- a/z-windowmanagers/notion/PRE_BUILD
+++ b/z-windowmanagers/notion/PRE_BUILD
@@ -1,6 +1,11 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+if [ -d "$SPELL_DIRECTORY/patches" ]; then
+ find "$SPELL_DIRECTORY/patches" \( -name \*.patch -o -name \*.diff \) \
+ -print0 | sort -zV | xargs -0 -n 1 -t patch -lfp1 -i
+fi
+
if ! is_depends_enabled $SPELL libxinerama; then
sedit 's,mod_xinerama,,' modulelist.mk
fi
diff --git
a/z-windowmanagers/notion/patches/0001-Remove-return-value-from-re-sethook-closes-4.patch

b/z-windowmanagers/notion/patches/0001-Remove-return-value-from-re-sethook-closes-4.patch
new file mode 100644
index 0000000..a58b774
--- /dev/null
+++
b/z-windowmanagers/notion/patches/0001-Remove-return-value-from-re-sethook-closes-4.patch
@@ -0,0 +1,55 @@
+From bf2903a13b6ecd05fb3583ec1fd59d7faa6dd51f Mon Sep 17 00:00:00 2001
+From: Arnout Engelen <arnouten AT bzzt.net>
+Date: Sun, 14 Jun 2015 14:30:39 +0200
+Subject: [PATCH] Remove return value from '(re)sethook' (closes #4)
+
+The upstream function always returned '1' since at least 5.0.3, and was
+removed in lua 5.3. We don't appear to use this value anywhere.
+
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ libextl/luaextl.c | 8 ++++----
+ libextl/luaextl.h | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/libextl/luaextl.c b/libextl/luaextl.c
+index 8e9f761e0820..7cec47c6ce00 100644
+--- a/libextl/luaextl.c
++++ b/libextl/luaextl.c
+@@ -2586,15 +2586,15 @@ void extl_dohook(lua_State *L, lua_Debug *ar)
+ (*current_hook) (event, ar->name, ar->source + 1, ar->linedefined);
+ }
+
+-int extl_sethook(ExtlHook hook)
++void extl_sethook(ExtlHook hook)
+ {
+ current_hook = hook;
+- return lua_sethook(l_st, extl_dohook, LUA_MASKCALL | LUA_MASKRET, -1);
++ lua_sethook(l_st, extl_dohook, LUA_MASKCALL | LUA_MASKRET, -1);
+ }
+
+-int extl_resethook()
++void extl_resethook()
+ {
+- return lua_sethook(l_st, NULL, 0, -1);
++ lua_sethook(l_st, NULL, 0, -1);
+ }
+
+ /*}}}*/
+diff --git a/libextl/luaextl.h b/libextl/luaextl.h
+index 153a66a03570..4d6e87afeb46 100644
+--- a/libextl/luaextl.h
++++ b/libextl/luaextl.h
+@@ -190,8 +190,8 @@ enum ExtlHookEvent {
+
+ typedef void (*ExtlHook) (const enum ExtlHookEvent event, const char *name,
const char *source, int currentline);
+
+-int extl_sethook(ExtlHook hook);
+-int extl_resethook();
++void extl_sethook(ExtlHook hook);
++void extl_resethook();
+
+ /* Misc. */
+
+--
+2.9.2



  • [SM-Commit] GIT changes to master z-rejected grimoire by Ismael Luceno (3e7a2eaf12f7a3d396c8007f8c29a2c11ab2561a), Ismael Luceno, 08/29/2016

Archive powered by MHonArc 2.6.24.

Top of Page