system/vice: Fix vice.info.gz, bad options.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 77 insertions, 15 deletions

diff --git a/system/vice/doinst.sh b/system/vice/doinst.sh
index 010d680f5861e..4079257f0858d 100644
--- a/system/vice/doinst.sh
+++ b/system/vice/doinst.sh
@@ -8,4 +8,6 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
-chroot . /usr/bin/install-info --info-dir=/usr/info /usr/info/vice.info.gz
+if [ -x /usr/bin/install-info -a -e usr/info/vice.info.gz ]; then
+  /usr/bin/install-info usr/info/vice.info.gz usr/info/dir
+fi
diff --git a/system/vice/douninst.sh b/system/vice/douninst.sh
new file mode 100644
index 0000000000000..1bef5020286ea
--- /dev/null
+++ b/system/vice/douninst.sh
@@ -0,0 +1,6 @@
+if [ -x /usr/bin/install-info -a -d usr/info ]; then
+  ( cd usr/info
+    rm -f dir
+    for i in *.info*; do /usr/bin/install-info $i dir 2>/dev/null; done
+  )
+fi
diff --git a/system/vice/fix_texi.diff b/system/vice/fix_texi.diff
new file mode 100644
index 0000000000000..62b0aceabc2b3
--- /dev/null
+++ b/system/vice/fix_texi.diff
@@ -0,0 +1,43 @@
+diff -Naur vice-3.7.1/doc/vice.texi vice-3.7.1.patched/doc/vice.texi
+--- vice-3.7.1/doc/vice.texi	2022-12-27 18:57:48.000000000 -0500
++++ vice-3.7.1.patched/doc/vice.texi	2023-05-04 02:57:02.622937677 -0400
+@@ -1840,7 +1840,7 @@
+ * Romset files::                Files defining the machine's ROM set.
+ @end menu
+ 
+-@node ROM files, Keymap files, Gtk3 Hotkeys files, System files, System files
++@node ROM files, Keymap files, Gtk3 Hotkeys files, System files
+ @section ROM files
+ 
+ Every emulator requires its own ROM set.  For the VIC20 and the C64, the
+@@ -5178,7 +5178,7 @@
+ 
+ xplus4 control ports and devices:
+ 
+-@multitable @columnfractions .05 .33 .05 .05 .05 .05
++@multitable @columnfractions .05 .33 .05 .05 .05 .05 .05 .05
+ @headitem nr
+ @tab device
+ @tab N1
+@@ -8047,8 +8047,8 @@
+ 
+ The windows driver understands various options passed in the so called "mode string"
+ after a colon after the ports name: @code{COMx[:]} @code{[baud=b]} @code{[parity=p]}
+-@code{[data=d]} @code{[stop=s]} @code{[to={on|off}]} @code{[xon={on|off}]} @code{[odsr={on|off}]}
+-@code{[octs={on|off}]} @code{[dtr={on|off|hs}]} @code{[rts={on|off|hs|tg}]} @code{[idsr={on|off}]}
++@code{[data=d]} @code{[stop=s]} @code{[to=on|off]} @code{[xon=on|off]} @code{[odsr=on|off]}
++@code{[octs=on|off]} @code{[dtr=on|off|hs]} @code{[rts=on|off|hs|tg]} @code{[idsr=on|off]}
+ @end table
+ 
+ @table @code
+@@ -8179,8 +8179,8 @@
+ 
+ The windows driver understands various options passed in the so called "mode string"
+ after a colon after the ports name: @code{COMx[:]} @code{[baud=b]} @code{[parity=p]}
+-@code{[data=d]} @code{[stop=s]} @code{[to={on|off}]} @code{[xon={on|off}]} @code{[odsr={on|off}]}
+-@code{[octs={on|off}]} @code{[dtr={on|off|hs}]} @code{[rts={on|off|hs|tg}]} @code{[idsr={on|off}]}
++@code{[data=d]} @code{[stop=s]} @code{[to=on|off]} @code{[xon=on|off]} @code{[odsr=on|off]}
++@code{[octs=on|off]} @code{[dtr=on|off|hs]} @code{[rts=on|off|hs|tg]} @code{[idsr=on|off]}
+ @end table
+ 
+ @table @code
diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild
index 6142796d34671..c0725a72af936 100644
--- a/system/vice/vice.SlackBuild
+++ b/system/vice/vice.SlackBuild
@@ -3,10 +3,21 @@
 # Slackware build script for vice
 
 # Copyright 2008 Mauro Giachero (email removed)
-# Copyright 2020, 2021, 2022 B. Watson (urchlay@slackware.uk)
+# Copyright 2020, 2021, 2022, 2023 B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230504 bkw: BUILD=2.
+# - fix vice.texi so the GNU info file gets generated.
+# - remove old ./configure arguments and fix a couple of wrong ones.
+#   thanks to Franzen for sending a patch to fix this.
+# - changed -Wl,--allow-multiple-definition to -fcommon, which does
+#   basically the same thing but matches how other builds do it.
+# - fix doinst.sh silliness.
+# - add douninst.sh, to clean up /usr/info/dir after the package is removed.
+
+# 20221228 bkw: update for v3.7.1.
+
 # 20221129 bkw: update for v3.6.1.
 # - can't build our own HTML or plaintext docs from vice.texi.
 # - include upstream's HTML docs in package.
@@ -42,7 +53,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=vice
 VERSION=${VERSION:-3.7.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -84,7 +95,7 @@ set -e
 
 # ffmpeg is included in the base OS on post-14.2 -current, but leave
 # this here in case someone's doing something clever.
-[ -x /usr/bin/ffmpeg ] && ffmpeg="--enable-external-ffmpeg"
+[ -x /usr/bin/ffmpeg ] && ffmpeg="--enable-ffmpeg"
 
 # Anticipating 15.0's pure-alsa-system
 if [ "${PULSE:-yes}" != "yes" ]; then
@@ -109,6 +120,10 @@ chmod 644 doc/html/fonts/OFL.txt # this file shouldn't be +x
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
+# Fix some mildly broken constructs in vice.texi, so we can generate
+# the vice.info doc.
+patch -p1 < $CWD/fix_texi.diff
+
 DOCDIR=/usr/doc/$PRGNAM-$VERSION
 PKGDOC=$PKG/$DOCDIR
 
@@ -143,7 +158,8 @@ config() {
   # with a configure argument, because that stops them being built
   # at all.
 
-  CFLAGS="$SLKCFLAGS -w -Wl,--allow-multiple-definition" \
+  # 20230504 bkw: note to self: -w means disable all warnings.
+  CFLAGS="$SLKCFLAGS -w -fcommon" \
   CXXFLAGS="$SLKCFLAGS" \
   DOS2UNIX=/bin/true \
   XA=/bin/true \
@@ -163,8 +179,6 @@ config() {
     --mandir=/usr/man \
     --infodir=/usr/info \
     --docdir=$DOCDIR \
-    --with-x \
-    --enable-quicktime \
     --enable-ethernet \
     --enable-parsid \
     --enable-cpuhistory \
@@ -172,7 +186,6 @@ config() {
     --with-flac \
     --with-vorbis \
     --with-gif \
-    --with-jpeg \
     --with-png \
     --enable-midi \
     --enable-lame \
@@ -185,8 +198,7 @@ config() {
 # rename them to <whatever>-sdl2 (or -sdl1).
 buildsdl() {
   local exesuf="-sdl$1"
-  local configarg="--disable-pdf-docs --enable-sdlui"
-  [ "$1" = "2" ] && configarg+="2"
+  local configarg="--disable-pdf-docs --enable-sdl${1}ui"
 
   config "$configarg"
   make -C src install-binPROGRAMS \
@@ -220,7 +232,7 @@ EOF
 esac
 
 # Now build & install the whole project with the gtk3 UI.
-config "--enable-native-gtk3ui --enable-desktop-files"
+config "--enable-gtk3ui --enable-desktop-files"
 make
 make install-strip DESTDIR=$PKG
 
@@ -242,16 +254,14 @@ install -m0644 src/arch/gtk3/data/unix/vice*directory \
 # vice-3.6.1. Not sure whether this is because we have an
 # outdated texinfo package in Slackware 15.0, or because upstream
 # broke some kind of rule... regardless, it's disabled for now.
-if [ "${MAKEINFO:-no}" = "yes" ]; then
+# 20230504 bkw: Patched vice.texi, so this is now enabled by default.
+if [ "${MAKEINFO:-yes}" = "yes" ]; then
 	makeinfo doc/$PRGNAM.texi
 	mkdir -p $PKG/usr/info
 	mv $PRGNAM.info* $PKG/usr/info
 	gzip -9 $PKG/usr/info/*
 
 	makeinfo --plaintext doc/$PRGNAM.texi > $PKGDOC/$PRGNAM.txt
-
-	( cd doc ; texi2any --html $PRGNAM.texi )
-	cp -a doc/$PRGNAM $PKGDOC/html
 fi
 
 # 20221130 bkw: HTML docs do get built, but never installed.
@@ -295,6 +305,7 @@ sed -e "s,@PA@,$PA,"   \
     -e "s,@SDL@,$SDL," \
   $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/douninst.sh > $PKG/install/douninst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE