Skip to Content.
Sympa Menu

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

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 (503843761d40bb6ba70f084039cae2bf01c7d860)
  • Date: Tue, 9 May 2017 02:51:44 +0000

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

editors/vile/BUILD | 4 --
editors/vile/DETAILS | 66
+++++++++++++++++++++++++++++++++++++++++++++---
editors/vile/HISTORY | 6 ++++
editors/vile/PRE_BUILD | 17 +++++++++++-
editors/vile/flex.patch | 19 -------------
5 files changed, 85 insertions(+), 27 deletions(-)

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

vile: => 9.8r

diff --git a/editors/vile/BUILD b/editors/vile/BUILD
index ec9df6b..c9a27bf 100755
--- a/editors/vile/BUILD
+++ b/editors/vile/BUILD
@@ -1,7 +1,3 @@
OPTS="$VILE_OPTS $OPTS" &&

-if [ "${VILE_SYMLINK}" == "y" ]; then
- OPTS="--with-symlink=vi $OPTS"
-fi &&
-
default_build
diff --git a/editors/vile/DETAILS b/editors/vile/DETAILS
index 94f4de8..c1648e8 100755
--- a/editors/vile/DETAILS
+++ b/editors/vile/DETAILS
@@ -1,10 +1,70 @@
SPELL=vile
- VERSION=9.8
- SOURCE=$SPELL-$VERSION.tgz
+ VERSIONX=9.8
+ VERSION=${VERSIONX}r
+ SOURCE=$SPELL-$VERSIONX.tgz
SOURCE_URL[0]=ftp://invisible-island.net/$SPELL/$SOURCE
SOURCE_URL[1]=http://invisible-mirror.net/archives/$SPELL/$SOURCE

SOURCE_HASH=sha512:daaaa33e79b970d753c5c0c4972f4e8f91aa8a26c813dc8755bb7eff60cefaf4766b08a77e210d1c8fabd39ecf7093b5ea819f35cc1f3ea8122b48d4b5e2dfe8
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ PATCH_URL=http://invisible-mirror.net/archives/$SPELL/patches
+ SOURCE2=${SPELL}-${VERSIONX}a.patch.gz
+ SOURCE2_URL[0]=$PATCH_URL/$SOURCE2
+
SOURCE2_HASH=sha512:89acfeab246bdf42c0571278d3847555c01dcb7fea2c99b4a3303556cce3d245c8b80040153d5ce3d00e7f5cfa4ead293b1d18aadb51e1354eb657e3154abe60
+ SOURCE3=${SPELL}-${VERSIONX}b.patch.gz
+ SOURCE3_URL[0]=$PATCH_URL/$SOURCE3
+
SOURCE3_HASH=sha512:3858e7ea8d55f31fb371263cf5e9f25cd65f7735cd20f160ba3969708322abb240e0271529fa42983fde53b77c44d8744b5461a1ea752fc07b242989b2fb3268
+ SOURCE4=${SPELL}-${VERSIONX}c.patch.gz
+ SOURCE4_URL[0]=$PATCH_URL/$SOURCE4
+
SOURCE4_HASH=sha512:33db5f49e607435a5bb3bc0ec299271d823879ca555a9486a5f4d774e3c352e165f0bdba4629c85fe4eb1c676ac9420af3cc5effc1a04aad81a9feff2cd847de
+ SOURCE5=${SPELL}-${VERSIONX}d.patch.gz
+ SOURCE5_URL[0]=$PATCH_URL/$SOURCE5
+
SOURCE5_HASH=sha512:964ac58a3d3cc36700faf7477daff410d71f92dc35874331280366c936924837cf084c104702f1cf653f24fcaeca682c5c1aaf1100c1c3e7d424efe11ea92176
+ SOURCE6=${SPELL}-${VERSIONX}e.patch.gz
+ SOURCE6_URL[0]=$PATCH_URL/$SOURCE6
+
SOURCE6_HASH=sha512:a6bdfcf2d6e4b7bd9763d005b097acd96c52577eb4654954e4e0c4f6caf85c7f67206fd21f1e33f9264481ac72461aa5b08ac87b0d7334aae22279bc6c256285
+ SOURCE7=${SPELL}-${VERSIONX}f.patch.gz
+ SOURCE7_URL[0]=$PATCH_URL/$SOURCE7
+
SOURCE7_HASH=sha512:67ad9e8e28e7f237a7ab2c2dccd3de02aa6376c20c1fa1294dbbcd50d05807513f39867d00fb9f0fb1550f9b8b79099974aa4b257ae5aea7c64d604f821187f4
+ SOURCE8=${SPELL}-${VERSIONX}g.patch.gz
+ SOURCE8_URL[0]=$PATCH_URL/$SOURCE8
+
SOURCE8_HASH=sha512:e95fc98677ceebc64fae3c4900470d5da2a4f41b5b8aa51daccaf904435cecb52c7f5aaefe92a68ccba856f589add01db9fd37693ae59e5ff810d4d2a358155d
+ SOURCE9=${SPELL}-${VERSIONX}h.patch.gz
+ SOURCE9_URL[0]=$PATCH_URL/$SOURCE9
+
SOURCE9_HASH=sha512:79d26607c8aa968ab6955fc224c6f045368752d555dc24679928f572bdc6e276b35c1617c75c5822f06ebfb6f4bae43037ec71ac260f7be868b5cf67003923ac
+ SOURCE10=${SPELL}-${VERSIONX}i.patch.gz
+ SOURCE10_URL[0]=$PATCH_URL/$SOURCE10
+
SOURCE10_HASH=sha512:5ab7aae1df53262c84556e19bf441ac7009cf5ccbec6d10bb8047d7fe5a4afec7e1a6acf35619ca879dcfc7ce5373b488070c4fb46c024929e22f8002ffef933
+ SOURCE11=${SPELL}-${VERSIONX}j.patch.gz
+ SOURCE11_URL[0]=$PATCH_URL/$SOURCE11
+
SOURCE11_HASH=sha512:3e9cabc51d622bb92c59e4ccbca9b10512c428aae273ad96b2aa74de9b180acb04f17bdb8b11d664bc967a6106860ca051d056aae6d13ff8505367243275c946
+ SOURCE12=${SPELL}-${VERSIONX}k.patch.gz
+ SOURCE12_URL[0]=$PATCH_URL/$SOURCE12
+
SOURCE12_HASH=sha512:9e524faeaf18da37eab202576c76eab881db76ba95af6faa32aca7f4c68564edf804f763d0b83f3cc49761e5003310c2735fcca2695cc57d6a23d9a62f1e9965
+ SOURCE13=${SPELL}-${VERSIONX}l.patch.gz
+ SOURCE13_URL[0]=$PATCH_URL/$SOURCE13
+
SOURCE13_HASH=sha512:0864e7d3ae631e7e915f33a0fdd4ad3c0c0242dbf0833629a6ccb8ead4014e353ec158181bbb3ad0bfa90c6ff261cb0683d54573b44f959397609a51484871bd
+ SOURCE14=${SPELL}-${VERSIONX}m.patch.gz
+ SOURCE14_URL[0]=$PATCH_URL/$SOURCE14
+
SOURCE14_HASH=sha512:c6b44ea70fbc89f63cfcd61d83e23442664638969547b7b1be31e48d7f5a2da2f7ad6d4453b0f06c10c65979a7f42384e8a7c16e752b9a8a0f7f914a110f094e
+ SOURCE15=${SPELL}-${VERSIONX}n.patch.gz
+ SOURCE15_URL[0]=$PATCH_URL/$SOURCE15
+
SOURCE15_HASH=sha512:e76d83406145babf5a1580f0e68a54fe676ac5a037a969b596a98d329f9c194d5db0bdf75619b55ee053aab81e182a0ce4087509e5ca4ab3c3708b8f39197546
+ SOURCE16=${SPELL}-${VERSIONX}o.patch.gz
+ SOURCE16_URL[0]=$PATCH_URL/$SOURCE16
+
SOURCE16_HASH=sha512:de4567052013dc040ad85e4c83398f249a545dccec53fa783b74ca086b4b3ddbf68de2edc3859542b1e4c6d62f4f917db654fe62e9e92c86a7136fd30ca6c422
+ SOURCE17=${SPELL}-${VERSIONX}p.patch.gz
+ SOURCE17_URL[0]=$PATCH_URL/$SOURCE17
+
SOURCE17_HASH=sha512:0c64f72aa3aa88d4b88e22e226cd10f40f8c47c8dfcfc6687832c5c1eebddca315d7fe96a54401bbdc7d3ab2db2fc4572ca18995c11921a31327bab5c9d82ee4
+ SOURCE18=${SPELL}-${VERSIONX}q.patch.gz
+ SOURCE18_URL[0]=$PATCH_URL/$SOURCE18
+
SOURCE18_HASH=sha512:a16c16dce35480e7d20bf59e90d657e120f6a71585b0c9c21be4a941b26dbff72e09e754d773d7db08c7418e78e8c954f848f2da2db580615e408f426b35fac5
+ SOURCE19=${SPELL}-${VERSIONX}r.patch.gz
+ SOURCE19_URL[0]=$PATCH_URL/$SOURCE19
+
SOURCE19_HASH=sha512:3ec6856c159084b17d2083a2088714b22201a0a225b64ad59d15d8a7f6e8a8f7daf2186c505a23e1828349ffc479f034a95f5e2639d9d9b06a8fc767d60892c9
+# WARNING: doesn't compile with current flex
+# SOURCE20=${SPELL}-${VERSIONX}s.patch.gz
+# SOURCE20_URL[0]=$PATCH_URL/$SOURCE20
+#
SOURCE20_HASH=sha512:5d6e7d80163bcfa405061c442c7590fd0ce0fe049c3efc214f7466406a36b7061d198474ccb83bf93a298078c6c06c8aad10ccb9ffd70c54969d337276e1d3d7
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSIONX"
WEB_SITE=http://invisible-island.net/vile/
DOC_DIRS=""
ENTERED=20141110
diff --git a/editors/vile/HISTORY b/editors/vile/HISTORY
index ac57f20..3905ab6 100644
--- a/editors/vile/HISTORY
+++ b/editors/vile/HISTORY
@@ -1,3 +1,9 @@
+2017-05-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.9.8r
+ * BUILD: moved symlink option configuration to PRE_BUILD
+ * PRE_BUILD: verify and apply patches
+ * flex.patch: dropped, fixed by upstream
+
2015-03-16 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added, to apply patch
* flex.patch: added, backported official patch from 0.9.8m, to fix
build
diff --git a/editors/vile/PRE_BUILD b/editors/vile/PRE_BUILD
index 909ef7c..b22f224 100755
--- a/editors/vile/PRE_BUILD
+++ b/editors/vile/PRE_BUILD
@@ -1,4 +1,19 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p1 < "$SPELL_DIRECTORY/flex.patch"
+# a..r
+local patches=`seq 2 19` &&
+
+for src in ${patches}; do
+ verify_file ${src} || return 1
+done &&
+
+for src in ${patches}; do
+ local source=SOURCE${src} &&
+
+ zcat ${SOURCE_CACHE}/${!source} | patch -p1 || return 1
+done
+
+if [ "${VILE_SYMLINK}" == "y" ]; then
+ sedit "s:@VILE_SYMLINK@:vi:g" makefile.in
+fi
diff --git a/editors/vile/flex.patch b/editors/vile/flex.patch
deleted file mode 100644
index b0a5ab9..0000000
--- a/editors/vile/flex.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- vile-9.8l+/filters/filters.h 2013-12-07 11:54:41.000000000 +0000
-+++ vile-9.8m/filters/filters.h 2014-03-30 18:22:19.000000000 +0000
-@@ -235,13 +235,15 @@
- extern FILE *yyget_out (void);
- extern char *yyget_text (void);
- extern int yyget_debug (void);
--extern int yyget_leng (void);
- extern int yyget_lineno (void);
- extern int yylex_destroy (void);
- extern void yyset_debug (int bdebug);
- extern void yyset_in (FILE * in_str);
- extern void yyset_lineno (int line_number);
- extern void yyset_out (FILE * out_str);
-+#if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 37)
-+extern int yyget_leng (void);
-+#endif
- /* there's also warnings for unused 'yyunput()', but I don't see a fix */
- /* flex's skeleton includes <unistd.h> - no particular reason apparent */
- #endif



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (503843761d40bb6ba70f084039cae2bf01c7d860), Vlad Glagolev, 05/08/2017

Archive powered by MHonArc 2.6.24.

Top of Page