Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (bb426ec68aaab0ea646783ee2e2f2661a1ec2a41)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (bb426ec68aaab0ea646783ee2e2f2661a1ec2a41)
  • Date: Sun, 2 Sep 2012 09:06:49 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

lua-forge/lua/DETAILS | 1 +
lua-forge/lua/HISTORY | 4 ++++
lua-forge/lua/shared.patch | 2 +-
utils/taskwarrior/BUILD | 4 ++--
utils/taskwarrior/DEPENDS | 3 ++-
utils/taskwarrior/DETAILS | 7 +++----
utils/taskwarrior/HISTORY | 6 +++++-
7 files changed, 18 insertions(+), 9 deletions(-)

New commits:
commit bb426ec68aaab0ea646783ee2e2f2661a1ec2a41
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

taskwarrior: => 2.1.1

commit 744bee0d4a4fe3e851361c535b3d7b0543c6853b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

lua: dynamically link liblua.so with libdl.so

diff --git a/lua-forge/lua/DETAILS b/lua-forge/lua/DETAILS
index 9f631e3..4234f23 100755
--- a/lua-forge/lua/DETAILS
+++ b/lua-forge/lua/DETAILS
@@ -1,5 +1,6 @@
SPELL=lua
VERSION=5.2.1
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.lua.org/ftp/$SOURCE
diff --git a/lua-forge/lua/HISTORY b/lua-forge/lua/HISTORY
index 438d46e..af1f8da 100644
--- a/lua-forge/lua/HISTORY
+++ b/lua-forge/lua/HISTORY
@@ -1,3 +1,7 @@
+2012-09-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * shared.patch: link with libdl.so
+
2012-06-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.2.1
* lua.pc: updated to 5.2.1
diff --git a/lua-forge/lua/shared.patch b/lua-forge/lua/shared.patch
index ec6b091..fa07115 100644
--- a/lua-forge/lua/shared.patch
+++ b/lua-forge/lua/shared.patch
@@ -17,7 +17,7 @@
$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)

+$(LUA_SO): $(CORE_O) $(LIB_O)
-+ $(CC) -o $@ -shared $(LDFLAGS) $(CORE_O) $(LIB_O)
++ $(CC) -o $@ -shared $(LDFLAGS) $(CORE_O) $(LIB_O) -ldl
+
clean:
$(RM) $(ALL_T) $(ALL_O)
diff --git a/utils/taskwarrior/BUILD b/utils/taskwarrior/BUILD
index d590482..1bbe43a 100755
--- a/utils/taskwarrior/BUILD
+++ b/utils/taskwarrior/BUILD
@@ -1,5 +1,5 @@
# needed else fails to find the dynamic loader
if is_depends_enabled $SPELL lua ; then
-CXXFLAGS="-ldl $CXXFLAGS"
+ CXXFLAGS="-ldl $CXXFLAGS"
fi &&
-default_build
+cmake_build
diff --git a/utils/taskwarrior/DEPENDS b/utils/taskwarrior/DEPENDS
index e396cd7..e76415f 100755
--- a/utils/taskwarrior/DEPENDS
+++ b/utils/taskwarrior/DEPENDS
@@ -1,3 +1,4 @@
depends ncurses &&
-optional_depends lua51 "--with-lua" "--without-lua" "Lua
support(${PROBLEM_COLOR}EXPERIMENTAL${DEFAULT_COLOR})"
+depends cmake &&

+optional_depends lua "" "" "for Lua support
(${PROBLEM_COLOR}EXPERIMENTAL${DEFAULT_COLOR})"
diff --git a/utils/taskwarrior/DETAILS b/utils/taskwarrior/DETAILS
index b3aeaa5..80e37c8 100755
--- a/utils/taskwarrior/DETAILS
+++ b/utils/taskwarrior/DETAILS
@@ -1,13 +1,12 @@
SPELL=taskwarrior
- VERSION=1.9.3
+ VERSION=2.1.1
SOURCE="task-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://www.${SPELL}.org/download/${SOURCE}
-
SOURCE_HASH=sha512:a97c539c9c9280fc40bc77b731b17d2cb6d47ed61e998fcade2e52b51a98cec735fcad62252d06a6f97dbee810ad2bb5f52d8427120b453255a797137b57bb5e
+ SOURCE_URL[0]=http://www.taskwarrior.org/download/${SOURCE}
+
SOURCE_HASH=sha512:5cc4f769c7ddb52ee54dcc59d0f4617fd7ce803eeff6f361e68cfebbad6bef1836f38224cce9a3d030cd145e52345d4c6b73dc151e4260e4beff387af5a301ab
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/task-${VERSION}"
WEB_SITE="http://www.taskwarrior.org";
LICENSE[0]="GPLv2"
ENTERED=20101110
- PATCHLEVEL=1
KEYWORDS=""
SHORT="A command-line to do list manager."
cat << EOF
diff --git a/utils/taskwarrior/HISTORY b/utils/taskwarrior/HISTORY
index 112822d..71b435c 100644
--- a/utils/taskwarrior/HISTORY
+++ b/utils/taskwarrior/HISTORY
@@ -1,3 +1,8 @@
+2012-09-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.1.1
+ * BUILD: switched to cmake build
+ * DEPENDS: cleaned up; added cmake; lua51 -> lua
+
2011-12-17 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: lua -> lua51

@@ -9,4 +14,3 @@

2010-11-10 Andraž 'ruskie' Levstik <ruskie+f03a580f AT codemages.net>
* DEPENDS, DETAILS: spell created, keywords cleaned up
-



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (bb426ec68aaab0ea646783ee2e2f2661a1ec2a41), Vlad Glagolev, 09/02/2012

Archive powered by MHonArc 2.6.24.

Top of Page