mirror of
git://slackware.nl/current.git
synced 2024-12-28 09:59:53 +01:00
ba4217f718
a/elvis-2.2_0-x86_64-5.txz: Rebuilt.
Don't make /usr/bin/{ex,vi} symlinks.
a/kernel-generic-5.4.11-x86_64-1.txz: Upgraded.
a/kernel-huge-5.4.11-x86_64-1.txz: Upgraded.
a/kernel-modules-5.4.11-x86_64-1.txz: Upgraded.
a/nvi-1.81.6-x86_64-1.txz: Added.
This is an implementation of the classic ex/vi text editor written by Keith
Bostic. Due to this having UTF8 support which elvis lacks, we'll have it
take over the ex/vi symlinks if they aren't already pointing to a different
choice. Note that the removal of vi/ex symlinks from the elvis and vim
packages might cause your ex/vi symlinks to point to this after all the ex/vi
packages have been upgraded. You can set them to your preferences using
pkgtool -> Setup -> vi-ex.
a/pkgtools-15.0-noarch-29.txz: Rebuilt.
Added an installer/pkgtool menu to select the default ex/vi editor.
ap/vim-8.2.0114-x86_64-1.txz: Upgraded.
Don't make /usr/bin/{ex,vi} symlinks.
d/kernel-headers-5.4.11-x86-1.txz: Upgraded.
d/python-setuptools-45.0.0-x86_64-1.txz: Upgraded.
k/kernel-source-5.4.11-noarch-1.txz: Upgraded.
l/imagemagick-7.0.9_15-x86_64-1.txz: Upgraded.
n/ethtool-5.4-x86_64-1.txz: Upgraded.
xap/vim-gvim-8.2.0114-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
29 lines
884 B
Diff
29 lines
884 B
Diff
#! /bin/sh /usr/share/dpatch/dpatch-run
|
|
## 20glibc_has_grantpt.dpatch by <hesso@pool.math.tu-berlin.de>
|
|
##
|
|
## DP: glibc has grantpt(), so only hceck for HAVE_SYS5_PTY
|
|
## DP: on non-glibc installations.
|
|
|
|
@DPATCH@
|
|
diff -Naur nvi-1.81.6.orig/ex/ex_script.c nvi-1.81.6/ex/ex_script.c
|
|
--- nvi-1.81.6.orig/ex/ex_script.c 2007-11-18 17:41:42.000000000 +0100
|
|
+++ nvi-1.81.6/ex/ex_script.c 2008-05-01 18:24:06.000000000 +0200
|
|
@@ -23,7 +23,8 @@
|
|
#include <sys/select.h>
|
|
#endif
|
|
#include <sys/stat.h>
|
|
-#ifdef HAVE_SYS5_PTY
|
|
+/* glibc2.1 defines grantpt but there is no stropts.h */
|
|
+#if defined(HAVE_SYS5_PTY) && !defined(__GLIBC__)
|
|
#include <sys/stropts.h>
|
|
#endif
|
|
#include <sys/time.h>
|
|
@@ -664,7 +665,7 @@
|
|
F_CLR(gp, G_SCRWIN);
|
|
}
|
|
|
|
-#ifdef HAVE_SYS5_PTY
|
|
+#if defined(HAVE_SYS5_PTY) && !defined(__GLIBC__)
|
|
static int ptys_open __P((int, char *));
|
|
static int ptym_open __P((char *));
|
|
|