Skip to Content.
Sympa Menu

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

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 (0af6a3a60f0d4bfb7815c1fad1be719c15a29d5e)
  • Date: Tue, 12 Apr 2016 01:01:04 +0000

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

ChangeLog | 3 +++
editors/vis/CONFIGURE | 9 +++++++++
editors/vis/DEPENDS | 21 +++++++++++++++++++++
editors/vis/DETAILS | 28 ++++++++++++++++++++++++++++
editors/vis/HISTORY | 3 +++
editors/vis/INSTALL | 9 +++++++++
editors/vis/PRE_BUILD | 4 ++++
editors/vis/PROVIDES | 2 ++
editors/vis/profile.d/editor.sh | 10 ++++++++++
libs/libtermkey/BUILD | 6 +++++-
libs/libtermkey/CONFIGURE | 3 +++
libs/libtermkey/DEPENDS | 5 ++---
libs/libtermkey/HISTORY | 8 ++++++++
libs/libtermkey/PRE_BUILD | 4 ++++
libs/libtermkey/make.patch | 24 ++++++++++++++++++++++++
lua-forge/lpeg/DEPENDS | 2 +-
lua-forge/lpeg/HISTORY | 3 +++
17 files changed, 139 insertions(+), 5 deletions(-)

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

vis: new spell, vim-like text editor

commit 8d4901e6f771fa3ca91b91f9a9d2fe0f3e9962a3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libtermkey: corrected dependencies

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

lpeg: corrected dependency

diff --git a/ChangeLog b/ChangeLog
index 7a45b29..10ef3bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-04-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * editors/vis: new spell, vim-like text editor
+
2016-04-10 Treeve Jelbert <treeve AT sourcemage.org>
* kde5-apps/krita: added, painting program

diff --git a/editors/vis/CONFIGURE b/editors/vis/CONFIGURE
new file mode 100755
index 0000000..1b5e265
--- /dev/null
+++ b/editors/vis/CONFIGURE
@@ -0,0 +1,9 @@
+config_query VIS_SYMLINK "Would you like to have /usr/bin/vi as a symlink to
/usr/bin/vis?" n &&
+
+if [ "${VIS_SYMLINK}" == "y" ]; then
+ if [ -e /usr/bin/vi ] && `readlink -f "/usr/bin/vi" | grep -qv "vis"`; then
+ message "${MESSAGE_COLOR}VI is already provided by another vi clone.
Recast it" &&
+ message "with the vi symlink option disabled, then recast
${SPELL}.${DEFAULT_COLOR}" &&
+ VIS_SYMLINK="n"
+ fi
+fi
diff --git a/editors/vis/DEPENDS b/editors/vis/DEPENDS
new file mode 100755
index 0000000..f239125
--- /dev/null
+++ b/editors/vis/DEPENDS
@@ -0,0 +1,21 @@
+depends ncurses &&
+depends libtermkey &&
+
+optional_depends LUA \
+ "--enable-lua" \
+ "--disable-lua" \
+ "for Lua API and plugins support" &&
+
+if is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} LUA); then
+ optional_depends lpeg "" "" "for syntax highlighting support"
+fi &&
+
+optional_depends libselinux \
+ "--enable-selinux" \
+ "--disable-selinux" \
+ "for SELinux support" &&
+
+optional_depends acl \
+ "--enable-acl" \
+ "--disable-acl" \
+ "for POSIX ACL support"
diff --git a/editors/vis/DETAILS b/editors/vis/DETAILS
new file mode 100755
index 0000000..7170e81
--- /dev/null
+++ b/editors/vis/DETAILS
@@ -0,0 +1,28 @@
+ SPELL=vis
+ VERSION=0.2
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+
SOURCE_URL[0]=https://github.com/martanne/${SPELL}/archive/v${VERSION}.tar.gz
+
SOURCE_HASH=sha512:ded2566105b890e21ee010f2f2809986e405f76bed2f7a969d2f818bcf437f3969a140ed0be2af7631e36b3c7fb6b73a3d715ba9ddb7fdd67a2e983b0765918a
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE=https://github.com/martanne/vis
+ ENTERED=20160411
+ LICENSE[0]=ISC
+ LICENSE[1]=MIT
+ KEYWORDS="editors"
+ SHORT="vim-like text editor"
+cat << EOF
+Vis aims to be a modern, legacy free, simple yet efficient vim-like editor.
+
+It extends vim's modal editing with built-in support for multiple
+cursors/selections and combines it with sam's structural regular expression
+based command language.
+
+As an universal editor it has decent Unicode support (including double width
and
+combining characters) and should cope with arbitrary files including:
+
+* large (up to a few Gigabytes) ones including:
+ o Wikipedia/OpenStreetMap XML / SQL / CSV dumps
+ o amalgamated source trees (e.g. SQLite)
+* single line ones e.g. minified JavaScript
+* binary ones e.g. ELF files
+EOF
diff --git a/editors/vis/HISTORY b/editors/vis/HISTORY
new file mode 100644
index 0000000..fae2542
--- /dev/null
+++ b/editors/vis/HISTORY
@@ -0,0 +1,3 @@
+2016-04-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS, PRE_BUILD, INSTALL, CONFIGURE, PROVIDES,
profile.d:
+ created spell, version 0.2
diff --git a/editors/vis/INSTALL b/editors/vis/INSTALL
new file mode 100755
index 0000000..23065bc
--- /dev/null
+++ b/editors/vis/INSTALL
@@ -0,0 +1,9 @@
+default_install &&
+
+mkdir -p "${INSTALL_ROOT}/etc/profile.d/" &&
+
+if install_config_file "${SPELL_DIRECTORY}/profile.d/editor.sh" \
+ "${INSTALL_ROOT}/etc/profile.d/editor.sh"; then
+
+ chmod 0755 "${INSTALL_ROOT}/etc/profile.d/editor.sh"
+fi
diff --git a/editors/vis/PRE_BUILD b/editors/vis/PRE_BUILD
new file mode 100755
index 0000000..d090907
--- /dev/null
+++ b/editors/vis/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+sedit "/^CFLAGS_AUTO\|LDFLAGS_AUTO/d" configure
diff --git a/editors/vis/PROVIDES b/editors/vis/PROVIDES
new file mode 100755
index 0000000..1e25c73
--- /dev/null
+++ b/editors/vis/PROVIDES
@@ -0,0 +1,2 @@
+VI
+TEXT-EDITOR
diff --git a/editors/vis/profile.d/editor.sh b/editors/vis/profile.d/editor.sh
new file mode 100644
index 0000000..6ff4b24
--- /dev/null
+++ b/editors/vis/profile.d/editor.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# First check if this variable is already set
+# then if not set, check it (maybe), then set it
+
+if [ -z "$EDITOR" ] ; then
+ EDITOR="vis"
+fi
+
+export EDITOR
+
diff --git a/libs/libtermkey/BUILD b/libs/libtermkey/BUILD
index c9dda20..d1ce077 100755
--- a/libs/libtermkey/BUILD
+++ b/libs/libtermkey/BUILD
@@ -1 +1,5 @@
-make PREFIX=${INSTALL_ROOT}/usr
+if is_depends_enabled $SPELL unibilium; then
+ OPTS="UNIBILIUM=1 $OPTS"
+fi &&
+
+make VERBOSE=1 $OPTS PREFIX=${INSTALL_ROOT}/usr
diff --git a/libs/libtermkey/CONFIGURE b/libs/libtermkey/CONFIGURE
new file mode 100755
index 0000000..ce79738
--- /dev/null
+++ b/libs/libtermkey/CONFIGURE
@@ -0,0 +1,3 @@
+config_query_list LIBTERMKEY_DRIVER "What driver do you want to use?" \
+ ncurses \
+ unibilium
diff --git a/libs/libtermkey/DEPENDS b/libs/libtermkey/DEPENDS
index 798b94f..21a8ee2 100755
--- a/libs/libtermkey/DEPENDS
+++ b/libs/libtermkey/DEPENDS
@@ -1,4 +1,3 @@
-depends glib2 &&
-depends unibilium &&
depends pkgconfig &&
-depends libtool
+depends libtool &&
+depends $LIBTERMKEY_DRIVER
diff --git a/libs/libtermkey/HISTORY b/libs/libtermkey/HISTORY
index 5418db7..e6ed04f 100644
--- a/libs/libtermkey/HISTORY
+++ b/libs/libtermkey/HISTORY
@@ -1,3 +1,11 @@
+2016-04-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: dropped glib2; made unibilium optional
+ * CONFIGURE: added, to configure driver
+ * BUILD: use OPTS; verbosity++
+ * PRE_BUILD: added, to apply patch
+ * make.patch: added, for optional build with unibilium support and
+ dropped glib2 dependency for demo binary
+
2015-12-26 Pavel Vinogradov <public AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, INSTALL: spell created

diff --git a/libs/libtermkey/PRE_BUILD b/libs/libtermkey/PRE_BUILD
new file mode 100755
index 0000000..19b547b
--- /dev/null
+++ b/libs/libtermkey/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/make.patch"
diff --git a/libs/libtermkey/make.patch b/libs/libtermkey/make.patch
new file mode 100644
index 0000000..0954aae
--- /dev/null
+++ b/libs/libtermkey/make.patch
@@ -0,0 +1,24 @@
+--- Makefile.orig 2015-10-06 17:52:28.000000000 -0400
++++ Makefile 2016-04-11 19:35:20.710409134 -0400
+@@ -22,8 +22,10 @@
+ endif
+
+ ifeq ($(call pkgconfig, --atleast-version=0.1.0 unibilium && echo 1),1)
++ifeq ($(UNIBILIUM),1)
+ override CFLAGS +=$(call pkgconfig, --cflags unibilium) -DHAVE_UNIBILIUM
+ override LDFLAGS+=$(call pkgconfig, --libs unibilium)
++endif
+ else ifeq ($(call pkgconfig, tinfo && echo 1),1)
+ override CFLAGS +=$(call pkgconfig, --cflags tinfo)
+ override LDFLAGS+=$(call pkgconfig, --libs tinfo)
+@@ -39,10 +41,6 @@
+
+ DEMOS=demo demo-async
+
+-ifeq ($(call pkgconfig, glib-2.0 && echo 1),1)
+- DEMOS+=demo-glib
+-endif
+-
+ DEMO_OBJECTS=$(DEMOS:=.lo)
+
+ TESTSOURCES=$(wildcard t/[0-9]*.c)
diff --git a/lua-forge/lpeg/DEPENDS b/lua-forge/lpeg/DEPENDS
index 9371d4a..d564330 100755
--- a/lua-forge/lpeg/DEPENDS
+++ b/lua-forge/lpeg/DEPENDS
@@ -1 +1 @@
-depends lua51
+depends LUA
diff --git a/lua-forge/lpeg/HISTORY b/lua-forge/lpeg/HISTORY
index f287cab..d5b60ea 100644
--- a/lua-forge/lpeg/HISTORY
+++ b/lua-forge/lpeg/HISTORY
@@ -1,3 +1,6 @@
+2016-04-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: depends on LUA, Lua 5.2 supported
+
2015-12-26 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 1.0.0




  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0af6a3a60f0d4bfb7815c1fad1be719c15a29d5e), Vlad Glagolev, 04/11/2016

Archive powered by MHonArc 2.6.24.

Top of Page