summaryrefslogtreecommitdiff
path: root/development/xvile
diff options
context:
space:
mode:
Diffstat (limited to 'development/xvile')
-rw-r--r--development/xvile/README4
-rw-r--r--development/xvile/patches/inputhint.patch12
-rw-r--r--development/xvile/patches/sh-filt.patch12
-rw-r--r--development/xvile/xvile.SlackBuild11
-rw-r--r--development/xvile/xvile.info6
5 files changed, 36 insertions, 9 deletions
diff --git a/development/xvile/README b/development/xvile/README
index de59d08ca0..ef7918e095 100644
--- a/development/xvile/README
+++ b/development/xvile/README
@@ -1,9 +1,9 @@
Vile retains the "finger-feel", if you will, of vi, while adding the
-multiple buffer and multiple window features of emacs and other editors.
+multiple buffer and multiple window features of emacs and other editors.
It is definitely not a vi clone, in that some substantial stuff is
missing, and the screen doesn't look quite the same. The things that
you tend to type over and over probably work. Things done less
frequently, like configuring a startup file, are somewhat (or very,
depending on how ambitious you are) different. But what matters most is
that one's "muscle memory" does the right thing to the text in front of
-you, and that is what vile tries to do for vi users.
+you, and that is what vile tries to do for vi users.
diff --git a/development/xvile/patches/inputhint.patch b/development/xvile/patches/inputhint.patch
new file mode 100644
index 0000000000..5d5ef0a1f4
--- /dev/null
+++ b/development/xvile/patches/inputhint.patch
@@ -0,0 +1,12 @@
+diff -ru vile-9.8s.orig/x11.c vile-9.8s/x11.c
+--- vile-9.8s.orig/x11.c 2014-03-30 14:53:19.000000000 -0400
++++ vile-9.8s/x11.c 2018-10-13 13:47:53.093692915 -0400
+@@ -1819,7 +1819,7 @@
+ hints = XAllocWMHints();
+
+ if (hints) {
+- hints->flags = IconPixmapHint;
++ hints->flags |= IconPixmapHint;
+ hints->icon_pixmap = myIcon;
+ if (myMask) {
+ hints->flags |= IconMaskHint;
diff --git a/development/xvile/patches/sh-filt.patch b/development/xvile/patches/sh-filt.patch
new file mode 100644
index 0000000000..e5b8e0806c
--- /dev/null
+++ b/development/xvile/patches/sh-filt.patch
@@ -0,0 +1,12 @@
+diff -ru vile-9.8s.orig/filters/sh-filt.l vile-9.8s/filters/sh-filt.l
+--- vile-9.8s.orig/filters/sh-filt.l 2016-12-17 18:24:00.000000000 -0500
++++ vile-9.8s/filters/sh-filt.l 2018-10-13 13:40:34.077559351 -0400
+@@ -198,7 +198,7 @@
+ }
+ }
+ <NORMAL>{KSH_TEST_UP} { if (!pop_backtic1(yytext, yyleng, LEN_KSH_TEST_DOWN)) {
+- FLEX_PRINTF((stderr, "cannot pop '[[' level %d\n", stk_level));
++ FLEX_PRINTF((stderr, "cannot pop '\[\[' level %d\n", stk_level));
+ handle_parens(yytext, 1, 1, -1, NORMAL);
+ unput(R_BLOCK);
+ }
diff --git a/development/xvile/xvile.SlackBuild b/development/xvile/xvile.SlackBuild
index fcc94b5434..54ad1ccaa3 100644
--- a/development/xvile/xvile.SlackBuild
+++ b/development/xvile/xvile.SlackBuild
@@ -25,7 +25,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=xvile
-VERSION=${VERSION:-9.8r}
+VERSION=${VERSION:-9.8s}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -33,7 +33,7 @@ SRCNAM=vile
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -86,6 +86,9 @@ CXXFLAGS="$SLKCFLAGS" \
--with-app-defaults=/etc/X11/app-defaults \
--build=$ARCH-slackware-linux
+patch -p1 <$CWD/patches/inputhint.patch
+patch -p1 <$CWD/patches/sh-filt.patch
+
make
make DESTDIR=$PKG docdir=/usr/doc/$PRGNAM-$VERSION install install-doc
diff --git a/development/xvile/xvile.info b/development/xvile/xvile.info
index 305974bee0..e7b6a31073 100644
--- a/development/xvile/xvile.info
+++ b/development/xvile/xvile.info
@@ -1,8 +1,8 @@
PRGNAM="xvile"
-VERSION="9.8r"
+VERSION="9.8s"
HOMEPAGE="http://invisible-island.net/vile/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/vile-9.8r.tgz"
-MD5SUM="9c96aaeddeb324a3b8a3d74cfe783a96"
+DOWNLOAD="ftp://ftp.invisible-island.net/vile/current/vile-9.8s.tgz"
+MD5SUM="001f42ecb8120d8e88c00779a6318f83"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""