diff options
| -rw-r--r-- | system/vice/fix_texi.diff | 38 | ||||
| -rw-r--r-- | system/vice/vice.SlackBuild | 10 | ||||
| -rw-r--r-- | system/vice/vice.info | 6 |
3 files changed, 39 insertions, 15 deletions
diff --git a/system/vice/fix_texi.diff b/system/vice/fix_texi.diff index c1a264538a..2cd710d358 100644 --- a/system/vice/fix_texi.diff +++ b/system/vice/fix_texi.diff @@ -1,7 +1,7 @@ -diff -Naur vice-3.8/doc/vice.texi vice-3.8.patched/doc/vice.texi ---- vice-3.8/doc/vice.texi 2023-12-24 12:42:36.000000000 -0500 -+++ vice-3.8.patched/doc/vice.texi 2024-02-13 20:17:44.907985392 -0500 -@@ -1486,7 +1486,7 @@ +diff -Naur vice-3.9/doc/vice.texi vice-3.9.patched/doc/vice.texi +--- vice-3.9/doc/vice.texi 2024-12-24 14:14:30.000000000 -0500 ++++ vice-3.9.patched/doc/vice.texi 2025-01-22 15:59:01.867145218 -0500 +@@ -1530,7 +1530,7 @@ * Romset files:: Files defining the machine's ROM set. @end menu @@ -10,7 +10,7 @@ diff -Naur vice-3.8/doc/vice.texi vice-3.8.patched/doc/vice.texi @section ROM files Every emulator requires its own ROM set. For the VIC20 and the C64, the -@@ -2415,17 +2415,6 @@ +@@ -2459,17 +2459,6 @@ Directives are special commands for the parser. They start with @strong{@code{!}} and are case-insensitive. @@ -28,7 +28,7 @@ diff -Naur vice-3.8/doc/vice.texi vice-3.8.patched/doc/vice.texi @strong{!CLEAR} @quotation -@@ -4954,7 +4943,7 @@ +@@ -5068,7 +5057,7 @@ xplus4 control ports and devices: @@ -37,7 +37,7 @@ diff -Naur vice-3.8/doc/vice.texi vice-3.8.patched/doc/vice.texi @headitem nr @tab device @tab N1 -@@ -8005,8 +7994,8 @@ +@@ -8146,8 +8135,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]} @@ -48,7 +48,7 @@ diff -Naur vice-3.8/doc/vice.texi vice-3.8.patched/doc/vice.texi @end table @table @code -@@ -8142,8 +8131,8 @@ +@@ -8283,8 +8272,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]} @@ -59,7 +59,7 @@ diff -Naur vice-3.8/doc/vice.texi vice-3.8.patched/doc/vice.texi @end table @table @code -@@ -9332,7 +9321,7 @@ +@@ -9513,7 +9502,7 @@ @c ---------------------------------------------------------------- @@ -68,7 +68,7 @@ diff -Naur vice-3.8/doc/vice.texi vice-3.8.patched/doc/vice.texi @c @section Miscellaneous settings @node Machine-specific features, Platform-specific features, Settings and resources, Top -@@ -20784,7 +20773,7 @@ +@@ -21062,7 +21051,7 @@ @end table @@ -77,3 +77,21 @@ diff -Naur vice-3.8/doc/vice.texi vice-3.8.patched/doc/vice.texi @section Resources commands @table @code +@@ -34670,7 +34659,7 @@ + @c @node FIXME + @subsubsection 7 - Super Expander + +-@multitable @columnfractions .3 .7 ++@multitable @columnfractions .3 .4 .3 + @item Size + @tab 4KiB (ROM) + @tab 3KiB (RAM) +@@ -34701,7 +34690,7 @@ + @c @node FIXME + @subsubsection 8 - Mikro Assembler + +-@multitable @columnfractions .3 .7 ++@multitable @columnfractions .3 .4 .3 + @item Size + @tab 8KiB (ROM) + @tab 3KiB (RAM) diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild index 38aa08d8c5..426e7c9a64 100644 --- a/system/vice/vice.SlackBuild +++ b/system/vice/vice.SlackBuild @@ -7,6 +7,8 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20250122 bkw: update for v3.9. + # 20240213 bkw: update for v3.8. # - had to add --disable-parsid to the configure command. it was breaking # the build. also, do you really have a SID chip connected to your @@ -60,7 +62,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=vice -VERSION=${VERSION:-3.8} +VERSION=${VERSION:-3.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -129,6 +131,9 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ # Fix some mildly broken constructs in vice.texi, so we can generate # the vice.info doc. +# 20250122 bkw: This is persistently broken upstream. They must be +# using something else besides the 'makeinfo' we have in Slackware, +# or they would have noticed by now. Had to add to the patch for 3.9. patch -p1 < $CWD/fix_texi.diff DOCDIR=/usr/doc/$PRGNAM-$VERSION @@ -239,7 +244,8 @@ EOF esac # Now build & install the whole project with the gtk3 UI. -config "--enable-gtk3ui --enable-desktop-files" +# 20250122 bkw: whoops, PDF doc was missing from 3.8, restore it. +config "--enable-pdf-docs --enable-gtk3ui --enable-desktop-files" make make install-strip DESTDIR=$PKG diff --git a/system/vice/vice.info b/system/vice/vice.info index f3ab5a74cb..ee2aa699b7 100644 --- a/system/vice/vice.info +++ b/system/vice/vice.info @@ -1,8 +1,8 @@ PRGNAM="vice" -VERSION="3.8" +VERSION="3.9" HOMEPAGE="https://vice-emu.sourceforge.io" -DOWNLOAD="https://downloads.sourceforge.net/project/vice-emu/releases/vice-3.8.tar.gz" -MD5SUM="023febe71bef57ff2537b6b5e961bd7a" +DOWNLOAD="https://downloads.sourceforge.net/project/vice-emu/releases/vice-3.9.tar.gz" +MD5SUM="e55406d577b976aa61197249c7527b1c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |