Slackware 14.2slackware-14.2

Thu Jun 30 20:26:57 UTC 2016
Slackware 14.2 x86_64 stable is released!

The long development cycle (the Linux community has lately been living in
"interesting times", as they say) is finally behind us, and we're proud to
announce the release of Slackware 14.2.  The new release brings many updates
and modern tools, has switched from udev to eudev (no systemd), and adds
well over a hundred new packages to the system.  Thanks to the team, the
upstream developers, the dedicated Slackware community, and everyone else
who pitched in to help make this release a reality.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

Have fun!  :-)

1 files changed, 13 insertions, 44 deletions

diff --git a/source/ap/vim/vim-gvim.SlackBuild b/source/ap/vim/vim-gvim.SlackBuild
index 6183d4e6..0af5aabe 100755
--- a/source/ap/vim/vim-gvim.SlackBuild
+++ b/source/ap/vim/vim-gvim.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2013  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2013, 2016  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,16 +20,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# This package must be build right after the main vim package, and the
+# generated vim package must still be in $TMP.
 
-VIMVER=7.4
-# This is the directory in the VIM source archive to cd into.
-DIRVER=74
+VIMBRANCH=7.4
+VERSION=$(echo vim-${VIMBRANCH}*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -56,22 +57,9 @@ PKG=$TMP/package-vim-gvim
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
-# Determine VIM patchlevel:
-if [ -d $CWD/patches ] ; then
-  cd $CWD/patches
-  PATCHLEVEL=$(/bin/ls ?.?.????.gz 2> /dev/null | tail -1 | cut -f 3 -d . )
-  if [ "$PATCHLEVEL" = "" ]; then
-    PATCHLEVEL=$(/bin/ls ?.?.???.gz 2> /dev/null | tail -1 | cut -f 3 -d . )
-    if [ "$PATCHLEVEL" = "" ]; then
-      PATCHLEVEL=000
-    fi
-  fi
-  cd $CWD
-fi
-
 cd $TMP
-rm -rf vim$DIRVER
-tar xvf $CWD/vim-$VIMVER.tar.?z* || exit 1
+rm -rf vim-$VERSION
+tar xvf $CWD/vim-$VERSION.tar.xz || exit 1
 
 config_vim() {
 CFLAGS="$SLKCFLAGS" LDFLAGS="$SLKLDFLAGS" \
@@ -93,21 +81,7 @@ CFLAGS="$SLKCFLAGS" LDFLAGS="$SLKLDFLAGS" \
 
 }
 
-cd $TMP/vim$DIRVER
-
-# If there's no syntax update, create one:
-if ! ls $CWD/vim-runtime-syntax-* 1> /dev/null 2> /dev/null ; then
-  rm -rf runtime/syntax.orig
-  cp -a runtime/syntax runtime/syntax.orig
-  echo "Fetching vim syntax updates from ftp.nluug.nl..."
-  rsync -avzcP ftp.nluug.nl::Vim/runtime/syntax/ runtime/syntax/
-  diff -u -r --new-file runtime/syntax.orig runtime/syntax | gzip -9c > $CWD/vim-runtime-syntax-$(date +%Y%m%d).diff.gz
-  rm -rf runtime/syntax
-  mv runtime/syntax.orig runtime/syntax
-fi
-
-# Apply the syntax update:
-zcat $CWD/vim-runtime-syntax-*.diff.gz | patch -p0 --verbose || exit 1
+cd $TMP/vim-$VERSION || exit 1
 
 chown -R root:root .
 find . \
@@ -115,11 +89,6 @@ find . \
   -exec chmod 755 {} \; -o \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
-for file in $CWD/patches/?.?.???.gz $CWD/patches/?.?.????.gz ; do
-  if [ -f $file ]; then
-    zcat $file | patch -p0 --verbose || exit 1
-  fi
-done
 
 config_vim --with-x --enable-gui=gtk2
 make $NUMJOBS || make || exit 1
@@ -182,15 +151,15 @@ rm -f vimtutor xxd
 # Now we get rid of everything that's not in the other vim package.
 # Let's assume (dangerous ;-) that we just built that in $TMP
 # and use it as a reference:
-if ! /bin/ls $TMP/vim-${VIMVER}*txz 1> /dev/null 2> /dev/null ; then
+if ! /bin/ls $TMP/vim-${VERSION}*txz 1> /dev/null 2> /dev/null ; then
   echo "FATAL: VIM package needed in $TMP"
   exit 1
 fi
 mkdir $PKG/vim
 ( cd $PKG
   ( cd vim
-    echo "Extracting reference package $TMP/vim-${VIMVER}*txz:"
-    explodepkg $TMP/vim-${VIMVER}*txz 1> /dev/null
+    echo "Extracting reference package $TMP/vim-${VERSION}*txz:"
+    explodepkg $TMP/vim-${VERSION}*txz 1> /dev/null
     sh install/doinst.sh
   )
 )
@@ -218,5 +187,5 @@ cp -a $CWD/gvim.png $PKG/usr/share/pixmaps
 find $PKG -type d -exec rmdir -p {} \; 2> /dev/null
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/vim-gvim-$VIMVER.$PATCHLEVEL-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/vim-gvim-$VERSION-$ARCH-$BUILD.txz