Arch Linux User Repository

Patches to build against the current upstream trunk. Very minimally tested, but it builds and seems to run at least well enough to boot into ROM Monitor

From: Wayne Galen <aur@waynegalen.com>
Date: Sat, 26 Aug 2023 16:09:07 -0700
Subject: [PATCH] Updated to build from current trunk

- Updated url to what appears to be the most recently updated website
- Set source to svn trunk
- src/dimension_eeprom.bin no longer exists during build
- Fixed previous-icon.patch to apply to current CMakeLists.txt
- previous-romdefault.patch doesn't apply cleanly, disabled it
---
 PKGBUILD            | 12 +++++-------
 previous-icon.patch | 12 ++++++------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 1c79173..d7c66f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,18 @@
 # Maintainer: orumin <dev@orum.in>

 pkgname=previous-svn
-pkgver=r635
+pkgver=r1341
 pkgrel=1
 pkgdesc="NeXTSTEP Emulator"
 arch=('i686' 'x86_64')
-url="http://previous.alternative-system.com"
+url="https://previous.unixdude.net/about.html"
 license=('GPL')
 depends=('sdl2')
 makedepends=('subversion' 'cmake' 'unzip')
 replaces=('previous')
 conflicts=('previous')
 provides=('previous')
-source=(previous::svn://svn.code.sf.net/p/previous/code/branches/branch_realtime
+source=(previous::svn://svn.code.sf.net/p/previous/code/trunk
         http://galgot.free.fr/transit/PReV-icons-WOshad.zip
         previous.desktop
         previous-icon.patch
@@ -23,10 +23,10 @@ install='previous-svn.install'
 md5sums=('SKIP'
          '4d9be2cb0c3d6fe0bce550af8bb6c85d'
          '2b66542a8f0efb7a3c8eaec062400afb'
-         '57aed380d85bd8264fb37b7b537f3f62'
+         'c2abe4086ecd454f784b153a377b711d'
          '0e20ed0b6a33cf4badb529c18a69c397')

-_svntrunk=svn://svn.code.sf.net/p/previous/code/branches/branch_realtime
+_svntrunk=svn://svn.code.sf.net/p/previous/code/trunk
 _svnmod=previous

 pkgver() {
@@ -45,7 +45,6 @@ build() {
   cd "$srcdir/$_svnmod-build"

   patch -p1 < ../previous-icon.patch
-  patch -p1 < ../previous-romdefault.patch

   ./configure --prefix=/usr
   make
@@ -78,5 +77,4 @@ package() {
   cd "$srcdir/$_svnmod-build"
   make DESTDIR="$pkgdir/" install
   cp "$srcdir/$_svnmod-build"/src/Rev_* "$pkgdir"/usr/share/previous/
-  cp "$srcdir/$_svnmod-build"/src/dimension_eeprom.bin  "$pkgdir"/usr/share/previous/
 }
diff --git a/previous-icon.patch b/previous-icon.patch
index 3ffc3bf..c8f2330 100644
--- a/previous-icon.patch
+++ b/previous-icon.patch
@@ -1,11 +1,11 @@
 diff -Naur previous/src/CMakeLists.txt patch.previous/src/CMakeLists.txt
---- previous/src/CMakeLists.txt    2016-02-22 10:13:54.036433610 -0800
-+++ patch.previous/src/CMakeLists.txt  2016-02-22 10:18:49.316413453 -0800
-@@ -127,7 +127,6 @@
+--- previous/src/CMakeLists.txt    2023-08-24 22:26:09.725232024 -0700
++++ patch.previous/src/CMakeLists.txt  2023-08-26 15:05:39.711604205 -0700
+@@ -144,7 +144,6 @@
    install(TARGETS Previous BUNDLE DESTINATION /Applications)
  else()
    install(TARGETS Previous RUNTIME DESTINATION ${BINDIR})
 -  install(FILES Previous-icon.bmp DESTINATION ${DATADIR})
-   install(FILES dimension_eeprom.bin DESTINATION ${BINDIR})
-   install(FILES Rev_1.0_v41.BIN DESTINATION ${BINDIR})
-   install(FILES Rev_2.5_v66.BIN DESTINATION ${BINDIR})
+   install(FILES ND_step1_v43.BIN DESTINATION ${DATADIR})
+   install(FILES Rev_0.8_v31.BIN DESTINATION ${DATADIR})
+   install(FILES Rev_1.0_v41.BIN DESTINATION ${DATADIR})

base-commit: e7f6e961457aace07306235e9ade49c2c98edb22
-- 
2.41.0

Cant build it

collect2: error: ld returned 1 exit status make[2]: [src/cpu/CMakeFiles/gencpu.dir/build.make:134: src/cpu/gencpu] Error 1 make[1]: [CMakeFiles/Makefile2:408: src/cpu/CMakeFiles/gencpu.dir/all] Error 2 make: *** [Makefile:136: all] Error 2 ==> ERROR: A failure occurred in build(). Aborting... -> error making: previous-svn

Build process is broken:

[ 55%] Linking C executable gencpu
/usr/bin/ld: CMakeFiles/gencpu.dir/readcpu.c.o:/home/fred/previous-svn/src/previous-build/src/cpu/compat.h:31: multiple definition of `quit_program'; CMakeFiles/gencpu.dir/gencpu.c.o:/home/fred/previous-svn/src/previous-build/src/cpu/compat.h:31: first defined here
/usr/bin/ld: CMakeFiles/gencpu.dir/readcpu.c.o:/home/fred/previous-svn/src/previous-build/src/cpu/compat.h:30: multiple definition of `vpos'; CMakeFiles/gencpu.dir/gencpu.c.o:/home/fred/previous-svn/src/previous-build/src/cpu/compat.h:30: first defined here
/usr/bin/ld: CMakeFiles/gencpu.dir/cpudefs.c.o:/home/fred/previous-svn/src/previous-build/src/cpu/compat.h:31: multiple definition of `quit_program'; CMakeFiles/gencpu.dir/gencpu.c.o:/home/fred/previous-svn/src/previous-build/src/cpu/compat.h:31: first defined here
/usr/bin/ld: CMakeFiles/gencpu.dir/cpudefs.c.o:/home/fred/previous-svn/src/previous-build/src/cpu/compat.h:30: multiple definition of `vpos'; CMakeFiles/gencpu.dir/gencpu.c.o:/home/fred/previous-svn/src/previous-build/src/cpu/compat.h:30: first defined here
collect2: error: ld returned 1 exit status
make[2]: *** [src/cpu/CMakeFiles/gencpu.dir/build.make:138: src/cpu/gencpu] Error 1
make[1]: *** [CMakeFiles/Makefile2:454: src/cpu/CMakeFiles/gencpu.dir/all] Error 2
make: *** [Makefile:149: all] Error 2
==> ERROR: A failure occurred in build().

@Refutationalist Thank you for your reporting and patch! I'll apply this.

laid up ths week, playing with previous, updated the package. here's a taurball if you want to use my changes http://vis.nu/crap/previous-svn-r635-1.src.tar.gz - uses the recently released 1.4 branch which includes NeXTdimension support and improved 68k emulation - added official icons, and a desktop file - patched to use /usr/share/previous for default rom locations