Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (42c9d5b6c3228fbfd458fa2d71f30b323d66e227)

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, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (42c9d5b6c3228fbfd458fa2d71f30b323d66e227)
  • Date: Fri, 28 Jun 2024 16:58:30 +0000

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

editors/nextvi/BUILD | 2 +-
editors/nextvi/DETAILS | 25 +++++++++++++++++++++----
editors/nextvi/HISTORY | 8 +++++++-
editors/nextvi/INSTALL | 4 +++-
editors/nextvi/Makefile | 38 --------------------------------------
editors/nextvi/PRE_BUILD | 8 ++++++++
6 files changed, 40 insertions(+), 45 deletions(-)

New commits:
commit 42c9d5b6c3228fbfd458fa2d71f30b323d66e227
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

nextvi: Add useful contrib patches from upstream

* Arrow keys support in NORMAL mode
* Arrow keys support in INSERT mode
* Allow to use vi like a pager
* Detect filetype based on the shebang

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

nextvi: Use upstreamed Makefile

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

nextvi 2024-06-27 snapshot

diff --git a/editors/nextvi/BUILD b/editors/nextvi/BUILD
index 0afb3f9..34b4e17 100755
--- a/editors/nextvi/BUILD
+++ b/editors/nextvi/BUILD
@@ -1 +1 @@
-make -f "$SPELL_DIRECTORY"/Makefile
+make -f "$SOURCE_CACHE"/"$SOURCE2"
diff --git a/editors/nextvi/DETAILS b/editors/nextvi/DETAILS
old mode 100644
new mode 100755
index 4287126..dc58ac1
--- a/editors/nextvi/DETAILS
+++ b/editors/nextvi/DETAILS
@@ -1,9 +1,26 @@
SPELL=nextvi
- VERSION=0.0.2024-06-09
- REV=ffdb1d38b3b626f5ec0a5207864ef0bca791a69a
- SOURCE="$SPELL-$REV.tar.gz"
+ VERSION=0.0.2024-06-27
+ REV=2091d51f111f0125c681d2f506862d06c9672170
+ SOURCE="$SPELL-${REV:0:12}.tar.gz"
SOURCE_URL[0]=https://github.com/kyx0r/$SPELL/archive/$REV.tar.gz
-
SOURCE_HASH=sha512:6ddb1d9163fd993bdbc03511c5ba65f709e74d5f95821e5beece01fb0ab8c594b7e0afae33458e01eb800204c836d05ea145a7dadb84346c88c081cd06ac26f2
+
SOURCE_HASH=sha512:734ad73b043d9da1c2da451ee932c00198fedb1869e2b398b1712b6acc2a9770c937860402f2139665bdca4413e470c2b86eca91176cd72d75248ac616aa0dcd
+
SOURCE2_HASH=sha512:5727d1c0665ceb58abd40726ccb0ef65cfa760c7c812c2de7f4ffff16e628ba2e6470f264ab4881d99f32160cbd0c73db5d1607315bad790dae2e83f186c51cc
+
SOURCE3_HASH=sha512:a101e9c81cb5a8031176033ac9aa4cb0ceb2d3cf936ae0372912f0807a2a29a9236e4f81619f33959f6f0eaa350e7fe2283a6c73dc86ddbcbd7d802bed82ee2e
+
SOURCE4_HASH=sha512:92662033aaf97aabee7077deb32b1a968665012b9bcb9accb889fdd1a43bcd9527dd1b2bcb82d5bd694f5e19f008423fe9ace93722f23c2b15f408f3dde76afa
+
SOURCE5_HASH=sha512:7be5bb9c86b08ae36607c8496fc797f455cdf56ab1cd511bcfe61cfa90e95c64a819d0709aebc5294e13c31db951c4bf12198ffebab5feb27d7d876f44aeb5b4
+
SOURCE6_HASH=sha512:8d6d2357f58d7e189af3f3ce92b5ad44022bc530172206929f6cf2ffc4d8b9e5a3f12df0d1dae6f13f42057a4977829874924d1ad935eeee6dbd5e080e4f4bcd
+ PATCHES_REV=485c48ea568d3b93934d7d8435ecf6d6e4ab759d
+ PATCHES_URL=https://raw.githubusercontent.com/kyx0r/nextvi/$PATCHES_REV
+ SOURCE2_URL[0]=$PATCHES_URL/Makefile
+ SOURCE3_URL[0]=$PATCHES_URL/arrowkeys_normal.patch # Arrow keys support in
NORMAL mode
+ SOURCE4_URL[0]=$PATCHES_URL/arrowkeys_insert.patch # Arrow keys support in
INSERT mode
+ SOURCE5_URL[0]=$PATCHES_URL/stdin_pipe.patch # Allow to use vi like
a pager
+ SOURCE6_URL[0]=$PATCHES_URL/filetype_shebang.patch # Detect filetype based
on the shebang
+ SOURCE2="$SPELL-${SOURCE2_HASH:7:12}-${SOURCE2_URL##*/}"
+ SOURCE3="$SPELL-${SOURCE3_HASH:7:12}-${SOURCE3_URL##*/}"
+ SOURCE4="$SPELL-${SOURCE4_HASH:7:12}-${SOURCE4_URL##*/}"
+ SOURCE5="$SPELL-${SOURCE5_HASH:7:12}-${SOURCE5_URL##*/}"
+ SOURCE6="$SPELL-${SOURCE6_HASH:7:12}-${SOURCE6_URL##*/}"
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$REV"
WEB_SITE="https://github.com/kyx0r/nextvi";
LICENSE[0]="ISC"
diff --git a/editors/nextvi/HISTORY b/editors/nextvi/HISTORY
index 289711d..8840d8e 100644
--- a/editors/nextvi/HISTORY
+++ b/editors/nextvi/HISTORY
@@ -1,5 +1,11 @@
+2024-06-28 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2024-06-27 snapshot
+ * BUILD, DETAILS, INSTALL: made use of upstreamed Makefile
+ * Makefile: removed, no longer needed
+ * DETAILS, PRE_BUILD: added useful patches from upstream
+
2024-06-24 Ismael Luceno <ismael AT sourcemage.org>
- * DETAILS: updated to 2024-06-09 snapshot
+ * DETAILS: updated spell to 2024-06-09 snapshot

2022-02-12 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, INSTALL, DETAILS, Makefile: spell created
diff --git a/editors/nextvi/INSTALL b/editors/nextvi/INSTALL
index 443ced8..13852e0 100755
--- a/editors/nextvi/INSTALL
+++ b/editors/nextvi/INSTALL
@@ -1 +1,3 @@
-make -f "$SPELL_DIRECTORY"/Makefile prefix="$INSTALL_ROOT"/usr install
+make -f "$SOURCE_CACHE"/"$SOURCE2" \
+ prefix="$INSTALL_ROOT"/usr \
+ install
diff --git a/editors/nextvi/Makefile b/editors/nextvi/Makefile
deleted file mode 100644
index d94710166..0000000
--- a/editors/nextvi/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh -e
-all: vi
-
-CFLAGS := \
- -pedantic -Wall -Wextra \
- -Wno-implicit-fallthrough \
- -Wno-missing-field-initializers \
- -Wno-unused-parameter \
- -Wfatal-errors \
- ${CFLAGS}
-
-CFLAGS += -D_POSIX_C_SOURCE=200809L -D_BSD_SOURCE
-CFLAGS += -MMD
-
-CC = c99
-
-prefix = /usr/local
-bindir := ${prefix}/bin
-
-install: vi
- mkdir -p "${DESTDIR}${bindir}/"
- cp -f vi "${DESTDIR}${bindir}/vi"
-
--include vi.d
-vi: vi.c
- ${CC} ${CFLAGS} -o $@ vi.c
-
-clean:
- -rm -f vi vi.d
-
-pgobuild:
- ${CC} ${CFLAGS} -fprofile-generate=. -o vi vi.c
- echo "qq" \
- | ./vi -v ./vi.c >/dev/null
- ${CC} ${CFLAGS} -fprofile-use=. -o vi vi.c
- rm *.gcda
-
-.PHONY: all clean install pgobuild
diff --git a/editors/nextvi/PRE_BUILD b/editors/nextvi/PRE_BUILD
new file mode 100755
index 0000000..f0e6386
--- /dev/null
+++ b/editors/nextvi/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+seq 3 100 | while read n; do
+ file="SOURCE$n"
+ file="${!file}"
+ [ -n "$file" ] || break
+ patch -fp1 -i "$SOURCE_CACHE/$file" || return 1
+done


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (42c9d5b6c3228fbfd458fa2d71f30b323d66e227), Ismael Luceno, 06/28/2024

Archive powered by MHonArc 2.6.24.

Top of Page