Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c664613cd2c480369797f0805476b6be0dc46e47)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c664613cd2c480369797f0805476b6be0dc46e47)
  • Date: Fri, 21 Feb 2014 12:36:50 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

dev/null |binary
editors/vim/DETAILS | 15 +++++++++------
editors/vim/HISTORY | 5 +++++
editors/vim/PRE_BUILD | 10 +++++-----
editors/vim/if_perl.patch | 28 ----------------------------
editors/vim/vim-patches-tarball | 29 ++++++++++++++++++-----------
6 files changed, 37 insertions(+), 50 deletions(-)

New commits:
commit c664613cd2c480369797f0805476b6be0dc46e47
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

editors/vim: apply patches 7.4.001 to 7.4.183

diff --git a/editors/vim/DETAILS b/editors/vim/DETAILS
index 5b53098..726bf49 100755
--- a/editors/vim/DETAILS
+++ b/editors/vim/DETAILS
@@ -13,10 +13,12 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_IGNORE=volatile

else
- VERSION=7.4
+ XVERSION=7.4
+ PATCH_VERSION=183
+ VERSION=$XVERSION.$PATCH_VERSION
PATCHLEVEL=1
- SOURCE=${SPELL}-${VERSION}.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}${VERSION/\./}
+ SOURCE=${SPELL}-${XVERSION}.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}${XVERSION/\./}
SOURCE_URL[0]=http://ftp.vim.org/pub/vim/unix/${SOURCE}
SOURCE_URL[1]=ftp://ftp.home.vim.org/pub/vim/unix/${SOURCE}
SOURCE_URL[2]=ftp://ftp.uk.vim.org/pub/vim/unix/${SOURCE}
@@ -25,9 +27,10 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}${VERSION/\./}
# SOURCE_GPG=gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME

SOURCE_HASH=sha512:65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e

-# SOURCE2=vim-7.3-patches-001-981.tar.bz2
-# SOURCE2_URL[0]=http://download.sourcemage.org/grimoire/distro/$SOURCE2
-#
SOURCE2_HASH=sha512:28087e616ac6669019e8d70ffb6963e699d59683d48baef674c06e2e9c3906f212427666ef8a9144a6c8c8f35d0042c7262e21f4c2c5f0ffaa6c89ead2055409
+ SOURCE2=vim-$XVERSION-patches-001-$PATCH_VERSION.tar.xz
+ SOURCE2_URL[0]=http://www.hawo.net/~siflfran/smgl/$SOURCE2
+ SOURCE2_URL[1]=http://download.sourcemage.org/grimoire/distro/$SOURCE2
+
SOURCE2_HASH=sha512:5590a70ca2b0d0511401775e009bc19c77cea32d2c3e6313d4c4873c18dbf6f352090185e44cb203753288f9b1f5703287254157a86066f615362aa6cda19182
fi

WEB_SITE=http://www.vim.org
diff --git a/editors/vim/HISTORY b/editors/vim/HISTORY
index f9549c0..0f60c18 100644
--- a/editors/vim/HISTORY
+++ b/editors/vim/HISTORY
@@ -1,3 +1,8 @@
+2014-02-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, PRE_BUILD: apply upstream patches 7.4.001 to 7.4.183
+ * vim-patches-tarball: adapted to current version
+ * if_perl.patch: removed
+
2013-08-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, PRE_BUILD: Vim fails to use perl shared
libs when using perl 5.16 from test. And also
diff --git a/editors/vim/PRE_BUILD b/editors/vim/PRE_BUILD
index 6f08a11..e108912 100755
--- a/editors/vim/PRE_BUILD
+++ b/editors/vim/PRE_BUILD
@@ -9,9 +9,9 @@ then
# "${SPELL_DIRECTORY}"/if_perl.patch
else
message "${MESSAGE_COLOR}Building from stable tarball...${DEFAULT_COLOR}"
- # unpack_file 2 &&
- # for i in $(seq -w 1 754); do
- # message "${MESSAGE_COLOR}applying patch 7.3.$i ...${DEFAULT_COLOR}"
&&
- # patch -p0 < patches/7.3.$i
- # done
+ unpack_file 2 &&
+ for i in $(seq -w 1 $PATCH_VERSION); do
+ message "${MESSAGE_COLOR}applying patch $XVERSION.$i
...${DEFAULT_COLOR}" &&
+ patch -p0 < vim-$XVERSION-patches-001-$PATCH_VERSION/$XVERSION.$i
+ done
fi
diff --git a/editors/vim/if_perl.patch b/editors/vim/if_perl.patch
deleted file mode 100644
index 5f74cac..0000000
--- a/editors/vim/if_perl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -r f1f6ac67acd8 src/if_perl.xs
---- a/src/if_perl.xs Wed Feb 29 19:20:03 2012 +0100
-+++ b/src/if_perl.xs Tue Mar 13 17:15:51 2012 +0900
-@@ -913,24 +913,6 @@
- win_T *win_find_nr(int n) { return curwin; }
- #endif
-
--XS(XS_VIM_Msg);
--XS(XS_VIM_SetOption);
--XS(XS_VIM_DoCommand);
--XS(XS_VIM_Eval);
--XS(XS_VIM_Buffers);
--XS(XS_VIM_Windows);
--XS(XS_VIWIN_DESTROY);
--XS(XS_VIWIN_Buffer);
--XS(XS_VIWIN_SetHeight);
--XS(XS_VIWIN_Cursor);
--XS(XS_VIBUF_DESTROY);
--XS(XS_VIBUF_Name);
--XS(XS_VIBUF_Number);
--XS(XS_VIBUF_Count);
--XS(XS_VIBUF_Get);
--XS(XS_VIBUF_Set);
--XS(XS_VIBUF_Delete);
--XS(XS_VIBUF_Append);
- XS(boot_VIM);
-
- static void
diff --git a/editors/vim/vim-7.3-patches-001-107.tar.bz2.sig
b/editors/vim/vim-7.3-patches-001-107.tar.bz2.sig
deleted file mode 100644
index 5c0b7cf..0000000
Binary files a/editors/vim/vim-7.3-patches-001-107.tar.bz2.sig and /dev/null
differ
diff --git a/editors/vim/vim-7.3.tar.bz2.sig b/editors/vim/vim-7.3.tar.bz2.sig
deleted file mode 100644
index a8bd28e..0000000
Binary files a/editors/vim/vim-7.3.tar.bz2.sig and /dev/null differ
diff --git a/editors/vim/vim-patches-tarball b/editors/vim/vim-patches-tarball
index 492250f..7d460c1 100755
--- a/editors/vim/vim-patches-tarball
+++ b/editors/vim/vim-patches-tarball
@@ -1,21 +1,28 @@
#!/bin/bash
# creates up-to-date vim patches tarball

-wget ftp://ftp.vim.org/pub/vim/patches/7.3/MD5SUMS
-LAST=$(tail -n 1 MD5SUMS | cut -f 3 -d " " | cut -f 3 -d .)
+VERSION=7.4

-mkdir patches
-cd patches
+wget ftp://ftp.vim.org/pub/vim/patches/${VERSION}/MD5SUMS &&
+LAST=$(tail -n 1 MD5SUMS | cut -f 3 -d " " | cut -f 3 -d .) &&

-PATCHES=$(eval echo {001..$LAST})
+SOURCE_DIRECTORY=vim-${VERSION}-patches-001-$LAST &&
+DISTFILE=vim-${VERSION}-patches-001-$LAST.tar.xz
+
+mkdir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+
+PATCHES=$(eval echo {001..$LAST}) &&

for i in $PATCHES; do
- wget ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.$i
-done
+ wget ftp://ftp.vim.org/pub/vim/patches/${VERSION}/${VERSION}.$i
+done &&
+
+cd .. &&
+

-cd ..
+tar cvf - $SOURCE_DIRECTORY | xz -9 > $DISTFILE &&

-tar cvf vim-7.3-patches-001-$LAST.tar patches
-bzip2 vim-7.3-patches-001-$LAST.tar
+rm -r $SOURCE_DIRECTORY &&

-rm -r patches
+sha512sum $DISTFILE




Archive powered by MHonArc 2.6.24.

Top of Page