Skip to Content.
Sympa Menu

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

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 (1c1561a0e05023667fc64f19224f4f5635dc9ac1)
  • Date: Sun, 11 Aug 2013 04:26:09 -0500

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

editors/vim/BUILD | 6 +++++-
editors/vim/CONFIGURE | 2 ++
editors/vim/DEPENDS | 4 ++--
editors/vim/DETAILS | 19 ++++++++++---------
editors/vim/HISTORY | 28 ++++++++++++++++++++++++++++
editors/vim/PRE_BUILD | 23 ++++++++++++++---------
6 files changed, 61 insertions(+), 21 deletions(-)

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

editors/vim: version 7.4

diff --git a/editors/vim/BUILD b/editors/vim/BUILD
index ebda7a5..9abdc58 100755
--- a/editors/vim/BUILD
+++ b/editors/vim/BUILD
@@ -1,13 +1,17 @@
#
# First build without the GUI
#
+if [[ $VIM_X_DISABLE == y ]]; then
+ OPTS="--without-x \
+ $OPTS"
+fi &&
+
local OLD_OPTS=$OPTS &&

OPTS="$GVIM_MULTIBYTE \
--with-features=${VIM_FEATURES} \
--disable-workshop \
--enable-gui=no \
- --without-x \
--disable-xim \
--disable-fontset \
$GVIM_HANGUL \
diff --git a/editors/vim/CONFIGURE b/editors/vim/CONFIGURE
index e614288..a2bdd96 100755
--- a/editors/vim/CONFIGURE
+++ b/editors/vim/CONFIGURE
@@ -7,6 +7,8 @@ config_query_option GVIM_MULTIBYTE "Enable multi-byte
editing?" y \
config_query_option GVIM_HANGUL "Enable Hangul input?" n \
"--enable-hangulinput" "--disable-hangulinput" &&

+config_query VIM_X_DISABLE "Disable X support?" n &&
+
message "${MESSAGE_COLOR}${SPELL_COLOR}vim${DEFAULT_COLOR}${MESSAGE_COLOR}
will be built twice if you choose to build a GUI${DEFAULT_COLOR}" &&
config_query_list GVIM_GUI "Which GUI interface to use?" \
none gtk2 gtk+ gnome2 gnome motif athena &&
diff --git a/editors/vim/DEPENDS b/editors/vim/DEPENDS
index 359c523..f3b9054 100755
--- a/editors/vim/DEPENDS
+++ b/editors/vim/DEPENDS
@@ -1,5 +1,5 @@
if [[ "${VIM_BRANCH}" == "scm" ]]
-then depends CVS
+then depends mercurial
fi &&

optional_depends gettext \
@@ -16,7 +16,7 @@ if [[ "${VIM_FEATURES}" != "tiny" ]] &&
[[ "${VIM_FEATURES}" != "small" ]]

then
- optional_depends lua51 \
+ optional_depends LUA \
"--enable-luainterp" \
"" \
"to enable Lua interpreter" &&
diff --git a/editors/vim/DETAILS b/editors/vim/DETAILS
index 6d50327..5b53098 100755
--- a/editors/vim/DETAILS
+++ b/editors/vim/DETAILS
@@ -4,32 +4,33 @@ then

if [[ "${VIM_AUTOUPDATE}" == "y" ]]
then VERSION=$(date +%Y%m%d) && FORCE_DOWNLOAD=on
- else VERSION=cvs
+ else VERSION=hg
fi

SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-
SOURCE_URL=cvs://:pserver:anonymous AT cvs-pserver.sf.net:80/cvsroot/vim:vim7
+ SOURCE_URL=hg_http://vim.googlecode.com/hg:${SPELL}-hg
SOURCE_IGNORE=volatile

else
- VERSION=7.3
+ VERSION=7.4
PATCHLEVEL=1
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}${VERSION/\./}
- SOURCE_URL[0]=ftp://ftp.vim.org/pub/vim/unix/${SOURCE}
+ 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}
SOURCE_URL[3]=ftp://ftp2.us.vim.org/pub/vim/unix/${SOURCE}
SOURCE_URL[4]=ftp://ftp.us.vim.org/pub/vim/unix/${SOURCE}
- SOURCE_GPG=gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME
+# SOURCE_GPG=gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME
+
SOURCE_HASH=sha512:65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e

- SOURCE2=vim-7.3-patches-001-107.tar.bz2
- SOURCE2_URL[0]=http://download.sourcemage.org/grimoire/distro/$SOURCE2
- SOURCE2_GPG=gurus.gpg:${SOURCE2}.sig:WORKS_FOR_ME
+# SOURCE2=vim-7.3-patches-001-981.tar.bz2
+# SOURCE2_URL[0]=http://download.sourcemage.org/grimoire/distro/$SOURCE2
+#
SOURCE2_HASH=sha512:28087e616ac6669019e8d70ffb6963e699d59683d48baef674c06e2e9c3906f212427666ef8a9144a6c8c8f35d0042c7262e21f4c2c5f0ffaa6c89ead2055409
fi

- WEB_SITE=http://vim.sf.net
+ WEB_SITE=http://www.vim.org
LICENSE[0]=http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
ENTERED=20010922
KEYWORDS="editors"
diff --git a/editors/vim/HISTORY b/editors/vim/HISTORY
index 1e68249..f9549c0 100644
--- a/editors/vim/HISTORY
+++ b/editors/vim/HISTORY
@@ -1,3 +1,31 @@
+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
+ refuses to compile with such perl. Therefore,
+ several 7.3 patches are required if not used the
+ SCM version, between them 263, 297, 304, 439,
+ 474, 623, 667, 668 and 722, are all related to
+ perl. But as vim doesn't support individual
+ patches, then all are recquired till 722, but
+ then all of current patches go to 744, and there
+ was little effort to get to the last 744th one.
+ MD5SUMS was applied to the patches, and all
+ passed. Then now applying a tarball with
+ patches from 1 to 744...
+ * CONFIGURE: Adding query VIM_X_DISABLE to find out
+ whether it's OK to configure with "--without-x",
+ cause if that is used, the clipboard is disabled
+ on vim under X terminals. Granted there's the
+ gtk+2 version, but at least I prefer using vim
+ under X terminal than the gtk+2 alternative,
+ but then I need clipboard support. At least the
+ options is good
+ * BUILD: Using VIM_X_DISABLE as result of the query
+ to determine whether to include "--without-x" as
+ part of the options or not
+ * thanks to Javier Vasquez <j.e.vasquez.v AT gmail.com>
+ for the updated spell
+
2012-05-25 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Apply if_perl.patch
* if_perl.patch: After perl 5.16 my vim fails to compile with this
error:
diff --git a/editors/vim/PRE_BUILD b/editors/vim/PRE_BUILD
index 4adf6d9..6f08a11 100755
--- a/editors/vim/PRE_BUILD
+++ b/editors/vim/PRE_BUILD
@@ -1,12 +1,17 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-unpack_file 2 &&

-for i in $(seq -w 1 107); do
- message "${MESSAGE_COLOR}applying patch 7.3.$i ...${DEFAULT_COLOR}" &&
- patch -p0 < patches/7.3.$i
-done &&
-
-message "${MESSAGE_COLOR}Fixing if_perl.xs...${DEFAULT_COLOR}" &&
-patch "${SOURCE_DIRECTORY}"/src/if_perl.xs \
- "${SPELL_DIRECTORY}"/if_perl.patch
+if [[ "${VIM_BRANCH}" == "scm" ]]
+then
+ message "${MESSAGE_COLOR}Building from SCM...${DEFAULT_COLOR}"
+ # message "${MESSAGE_COLOR}Fixing if_perl.xs...${DEFAULT_COLOR}" &&
+ # patch "${SOURCE_DIRECTORY}"/src/if_perl.xs \
+ # "${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
+fi



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (1c1561a0e05023667fc64f19224f4f5635dc9ac1), Florian Franzmann, 08/11/2013

Archive powered by MHonArc 2.6.24.

Top of Page