4 files changed, 17 insertions, 76 deletions
diff --git a/source/e/emacs/emacs.SlackBuild b/source/e/emacs/emacs.SlackBuild
index 49b06f608..3933a61c9 100755
--- a/source/e/emacs/emacs.SlackBuild
+++ b/source/e/emacs/emacs.SlackBuild
@@ -42,9 +42,7 @@ VERSION=$SRCDIRVER
 # installed package is larger. Pass NATIVECOMP=NO to do a normal build.
 NATIVECOMP=${NATIVECOMP:-YES}
 
-# When building with native compilation, link to the X11 libraries. This option
-# is only for native compilation builds -- regular builds will include both
-# an X11 and non-X11 version of Emacs.
+# Do we want X support? (causes Emacs to be linked with many X11 libraries):
 WITHX=${WITHX:-YES}
 
 # Pass this variable set to "--with-pgtk" to use GTK+3 without linking to X11
@@ -66,7 +64,7 @@ fi
 if [ "$NATIVECOMP" = "YES" ]; then
   PDUMPER=${PDUMPER:-"--with-dumping=pdumper --with-native-compilation"}
 else
-  PDUMPER=${PDUMPER:-"--with-pdumper=no --with-dumping=unexec --without-native-compilation"}
+  PDUMPER=${PDUMPER:-"--with-pdumper=auto --without-native-compilation"}
 fi
 
 # Automatically determine the architecture we're building on:
@@ -153,72 +151,6 @@ else
 fi
 make install DESTDIR=$PKG || exit 1
 
-# When using native compilation, pdumper is required. And, with pdumper it is
-# not possible to share Emacs' support files between two Emacs binaries.
-# Slackware has traditionally installed a version of Emacs that supports X11
-# and a graphical toolkit, and another one that is not linked to X for console
-# use. So, if we are building Emacs with native compilation, we should not
-# build an additional non-X binary. Also, if the previously built Emacs didn't
-# support X, then there's no need to build another one like that.
-if [ ! "$NATIVECOMP" = "YES" -a ! "$WITHX" = "NO" ]; then
-
-  # We're going to build an extra non-X Emacs, so rename the previously built one:
-  ( cd $PKG/usr/bin
-    rm emacs
-    mv emacs-${SRCDIRVER} emacs-${TARBALLVER}-with-x11
-  )
-
-  # Build a version of the Emacs binary that is not linked to X11:
-  cd $TMP
-  rm -rf $SRCNAM-$TARBALLVER
-  tar xvf $CWD/$SRCNAM-$TARBALLVER.tar.xz || exit 1
-  cd $SRCNAM-$SRCDIRVER || exit 1
-
-  chown -R root:root .
-  find . \
-    \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-    -exec chmod 755 {} \+ -o \
-    \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-    -exec chmod 644 {} \+
-
-  # The defaults are a little too worried about adding a few more K of pure
-  # memory given the amount available on modern systems:
-  sed -i "s/#define SYSTEM_PURESIZE_EXTRA 0/#define SYSTEM_PURESIZE_EXTRA 100000/g" src/puresize.h
-
-  CFLAGS="$SLKCFLAGS" \
-  CXXFLAGS="$SLKCFLAGS" \
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --program-prefix="" \
-    --program-suffix="" \
-    --mandir=/usr/man \
-    --infodir=/usr/info \
-    --without-gconf \
-    --without-gsettings \
-    --with-modules \
-    --with-x=no \
-    $PDUMPER \
-    --build=${ARCH}-slackware-linux || exit 1
-
-  make $NUMJOBS || make || exit 1
-
-  # Install the non-X version:
-  cat src/emacs > $PKG/usr/bin/emacs-${TARBALLVER}-no-x11
-  chown root:root $PKG/usr/bin/emacs-${TARBALLVER}-no-x11
-  chmod 1755 $PKG/usr/bin/emacs-${TARBALLVER}-no-x11
-
-  # Create unversioned symlinks for both versions of emacs:
-  ( cd $PKG/usr/bin
-    ln -sf emacs-${TARBALLVER}-with-x11 emacs-with-x11
-    ln -sf emacs-${TARBALLVER}-no-x11 emacs-no-x11
-    # Create a plain "emacs" symlink pointing to emacs-with-x11:
-    ln -sf emacs-with-x11 emacs
-  )
-
-fi # build/install non-X emacs
-
 # Seems like this nonsense is finally obsolete:
 if [ -d $PKG/var/games/emacs ]; then
   # I don't care for broken permissions.
diff --git a/source/e/emacs/emacs.SlackBuild.regular-build b/source/e/emacs/emacs.SlackBuild.regular-build
index 12af1ab0b..95756410b 100755
--- a/source/e/emacs/emacs.SlackBuild.regular-build
+++ b/source/e/emacs/emacs.SlackBuild.regular-build
@@ -21,8 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Build a --without-native-compilation Emacs package with an X11 version
-# using GTK+3, and a non-X11 linked version for use on the console or on
-# machines lacking the X11 libraries. This is how the Slackware Emacs package
-# has been traditionally built from 1993-2024.
+# using GTK+3. This will still run on the console (or in an xterm if you use
+# "emacs -nw"). If you want a version that is not linked to any X11 libraries,
+# pass "WITHX=NO" to this script.
 
 NATIVECOMP=NO TAG=_regular ./emacs.SlackBuild
diff --git a/source/e/emacspeak/emacspeak.SlackBuild b/source/e/emacspeak/emacspeak.SlackBuild
index 7c45f0ffb..800e00fa5 100755
--- a/source/e/emacspeak/emacspeak.SlackBuild
+++ b/source/e/emacspeak/emacspeak.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=emacspeak
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -146,8 +146,17 @@ mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
   ln -sf /usr/share/emacs/site-lisp/emacspeak/etc .
   ln -sf etc/COPYRIGHT .
   ln -sf etc/NEWS .
-  ln -sf /usr/share/emacs/site-lisp/emacspeak/README.md .
+  ln -sf /usr/share/emacs/site-lisp/emacspeak/README .
+  ln -sf /usr/share/emacs/site-lisp/emacspeak/Readme.org .
   ln -sf /usr/share/emacs/site-lisp/emacspeak/blog-archive .
+  # Check these:
+  find $PKG/usr/doc/${PKGNAM}-$VERSION -xtype l | while read brokenlink ; do
+    echo
+    echo "WARNING: Removing broken symlink $brokenlink"
+    echo
+    rm -f $brokenlink
+    sleep 60
+  done
 )
 
 mkdir -p $PKG/install
diff --git a/source/e/emacspeak/emacspeak.url b/source/e/emacspeak/emacspeak.url
index 018d49104..9a92588c3 100644
--- a/source/e/emacspeak/emacspeak.url
+++ b/source/e/emacspeak/emacspeak.url
@@ -1,2 +1,2 @@
 https://github.com/tvraman/emacspeak
-https://github.com/tvraman/emacspeak/releases/download/59/emacspeak-59.0.tar.bz2
+https://github.com/tvraman/emacspeak/releases/download/60.0/emacspeak-60.0.tar.bz2