From 679795231669674a8d2d54ff79a3d4f42d6ab343 Mon Sep 17 00:00:00 2001
From: David Stes <55844484+cstes@users.noreply.github.com>
Date: Sun, 31 Mar 2024 18:41:11 +0200
Subject: [PATCH] opensmalltalk stack-spur: upgrade to 5.0.3356
---
components/runtime/smalltalk/stack-spur/manifests/sample-manifest.p5m | 46 +++++++++++-----------
components/runtime/smalltalk/stack-spur/test/results-64.master | 2
components/runtime/smalltalk/stack-spur/Makefile | 8 ++--
components/runtime/smalltalk/stack-spur/patches/02-sqSCCSVersion.patch | 14 +++---
components/runtime/smalltalk/stack-spur/patches/03-sqPluginsSCCSVersion.patch | 8 ++--
components/runtime/smalltalk/stack-spur/squeak.ips | 2
6 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/components/runtime/smalltalk/stack-spur/Makefile b/components/runtime/smalltalk/stack-spur/Makefile
index d1f8b06..d01200c 100644
--- a/components/runtime/smalltalk/stack-spur/Makefile
+++ b/components/runtime/smalltalk/stack-spur/Makefile
@@ -40,9 +40,9 @@
# sometimes the Stack VM is generated from a different VMMaker as the Cog VM
COMPONENT_NAME= stack-spur
-COMPONENT_VERSION= 5.0.3351
-GIT_TAG= sun-v5.0.62
-PLUGIN_REV= 5.0-202402252018
+COMPONENT_VERSION= 5.0.3356
+GIT_TAG= sun-v5.0.63
+PLUGIN_REV= 5.0-202403301849
COMPONENT_SUMMARY= The OpenSmalltalk Stack Spur Virtual Machine
COMPONENT_PROJECT_URL= http://www.squeak.org
COMPONENT_FMRI= runtime/smalltalk/stack-spur
@@ -56,7 +56,7 @@
COMPONENT_SRC= opensmalltalk-vm-$(GIT_TAG)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha256:3eec084e9620a9552a8ab87e4eb19a98b5f6b639f6907dba0e047103c033ff2d
+COMPONENT_ARCHIVE_HASH= sha256:417eeb23cf33fab0e670903f406308ac49f227f15cf9e377a655d3ce402fb281
COMPONENT_ARCHIVE_URL= https://codeload.github.com/cstes/opensmalltalk-vm/tar.gz/$(GIT_TAG)
# run SUnit tests in the build directories on 32bit and 64bit Squeak images
diff --git a/components/runtime/smalltalk/stack-spur/manifests/sample-manifest.p5m b/components/runtime/smalltalk/stack-spur/manifests/sample-manifest.p5m
index 8a67223..57d759f 100644
--- a/components/runtime/smalltalk/stack-spur/manifests/sample-manifest.p5m
+++ b/components/runtime/smalltalk/stack-spur/manifests/sample-manifest.p5m
@@ -31,29 +31,29 @@
file path=usr/doc/squeak/README.Contributing
file path=usr/doc/squeak/README.Keyboard
file path=usr/doc/squeak/README.Sound
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/B3DAcceleratorPlugin.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/ClipboardExtendedPlugin.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/DESPlugin.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/FileAttributesPlugin.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/ImmX11Plugin.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/LocalePlugin.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/MD5Plugin.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/SHA2Plugin.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/Squeak3D.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/SqueakFFIPrims.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/SqueakSSL.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/UUIDPlugin.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/UnicodePlugin.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/UnixOSProcessPlugin.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/VectorEnginePlugin.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/XDisplayControlPlugin.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/squeak
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/vm-display-X11.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/vm-display-null.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/vm-sound-OSS.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/vm-sound-Sun.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/vm-sound-null.so
-file path=usr/lib/$(MACH64)/squeak/5.0-202402252018-64bit/vm-sound-pulse.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/B3DAcceleratorPlugin.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/ClipboardExtendedPlugin.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/DESPlugin.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/FileAttributesPlugin.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/ImmX11Plugin.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/LocalePlugin.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/MD5Plugin.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/SHA2Plugin.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/Squeak3D.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/SqueakFFIPrims.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/SqueakSSL.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/UUIDPlugin.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/UnicodePlugin.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/UnixOSProcessPlugin.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/VectorEnginePlugin.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/XDisplayControlPlugin.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/squeak
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/vm-display-X11.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/vm-display-null.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/vm-sound-OSS.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/vm-sound-Sun.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/vm-sound-null.so
+file path=usr/lib/$(MACH64)/squeak/5.0-202403301849-64bit/vm-sound-pulse.so
hardlink path=usr/share/man/man1/inisqueak.1 target=squeak.1
file path=usr/share/man/man1/squeak.1
file path=usr/squeak
diff --git a/components/runtime/smalltalk/stack-spur/patches/02-sqSCCSVersion.patch b/components/runtime/smalltalk/stack-spur/patches/02-sqSCCSVersion.patch
index 5b12fce..f21d0c6 100644
--- a/components/runtime/smalltalk/stack-spur/patches/02-sqSCCSVersion.patch
+++ b/components/runtime/smalltalk/stack-spur/patches/02-sqSCCSVersion.patch
@@ -1,15 +1,15 @@
---- opensmalltalk-vm-sun-v5.0.62/platforms/Cross/vm/sqSCCSVersion.h Sun Feb 25 21:18:14 2024
-+++ p0/opensmalltalk-vm-sun-v5.0.62/platforms/Cross/vm/sqSCCSVersion.h Fri Mar 1 18:48:00 2024
+--- opensmalltalk-vm-sun-v5.0.63/platforms/Cross/vm/sqSCCSVersion.h Sat Mar 30 19:49:31 2024
++++ p0/opensmalltalk-vm-sun-v5.0.63/platforms/Cross/vm/sqSCCSVersion.h Sun Mar 31 13:22:40 2024
@@ -30,13 +30,13 @@
#if SUBVERSION
# define PREFIX "r"
-static char SvnRawRevisionString[] = "$Rev$";
-+static char SvnRawRevisionString[] = "$Rev: 202402252018 $";
++static char SvnRawRevisionString[] = "$Rev: 202403301849 $";
# define REV_START (SvnRawRevisionString + 6)
-static char SvnRawRevisionDate[] = "$Date$";
-+static char SvnRawRevisionDate[] = "$Date: Sun Feb 25 21:18:14 2024 +0100 $";
++static char SvnRawRevisionDate[] = "$Date: Sat Mar 30 19:49:31 2024 +0100 $";
# define DATE_START (SvnRawRevisionDate + 7)
-static char SvnRawRepositoryURL[] = "$URL$";
@@ -22,12 +22,12 @@
#elif GIT
# define PREFIX ""
-static char GitRawRevisionString[] = "$Rev$";
-+static char GitRawRevisionString[] = "$Rev: 202402252018 $";
++static char GitRawRevisionString[] = "$Rev: 202403301849 $";
# define REV_START (GitRawRevisionString + 6)
# define REV_TIME_START (GitRawRevisionString + 14)
-static char GitRawRevisionDate[] = "$Date$";
-+static char GitRawRevisionDate[] = "$Date: Sun Feb 25 21:18:14 2024 +0100 $";
++static char GitRawRevisionDate[] = "$Date: Sat Mar 30 19:49:31 2024 +0100 $";
# define DATE_START (GitRawRevisionDate + 7)
-static char GitRawRepositoryURL[] = "$URL$";
@@ -35,7 +35,7 @@
# define URL_START (GitRawRepositoryURL + 6)
-static char GitRawRevisionShortHash[] = "$CommitHash$";
-+static char GitRawRevisionShortHash[] = "$CommitHash: b4692df30 $";
++static char GitRawRevisionShortHash[] = "$CommitHash: cd6c6c431 $";
# define SHORTHASH_START (GitRawRevisionShortHash + 13)
static char *
diff --git a/components/runtime/smalltalk/stack-spur/patches/03-sqPluginsSCCSVersion.patch b/components/runtime/smalltalk/stack-spur/patches/03-sqPluginsSCCSVersion.patch
index 84ce7dc..6001369 100644
--- a/components/runtime/smalltalk/stack-spur/patches/03-sqPluginsSCCSVersion.patch
+++ b/components/runtime/smalltalk/stack-spur/patches/03-sqPluginsSCCSVersion.patch
@@ -1,11 +1,11 @@
---- opensmalltalk-vm-sun-v5.0.62/platforms/Cross/plugins/sqPluginsSCCSVersion.h Sun Feb 25 21:18:14 2024
-+++ p0/opensmalltalk-vm-sun-v5.0.62/platforms/Cross/plugins/sqPluginsSCCSVersion.h Fri Mar 1 18:48:00 2024
+--- opensmalltalk-vm-sun-v5.0.63/platforms/Cross/plugins/sqPluginsSCCSVersion.h Sat Mar 30 19:49:31 2024
++++ p0/opensmalltalk-vm-sun-v5.0.63/platforms/Cross/plugins/sqPluginsSCCSVersion.h Sun Mar 31 13:22:40 2024
@@ -9,10 +9,10 @@
*/
#if SUBVERSION
-static char SvnRawPluginsRevisionString[] = "$Rev$";
-+static char SvnRawPluginsRevisionString[] = "$Rev: 202402252018 $";
++static char SvnRawPluginsRevisionString[] = "$Rev: 202403301849 $";
# define PLUGINS_REV_START (SvnRawPluginsRevisionString + 6)
-static char SvnRawPluginsRepositoryURL[] = "$URL$";
@@ -18,7 +18,7 @@
# undef URL_START
#elif GIT
-static char GitRawPluginsRevisionString[] = "$Rev$";
-+static char GitRawPluginsRevisionString[] = "$Rev: 202402252018 $";
++static char GitRawPluginsRevisionString[] = "$Rev: 202403301849 $";
# define PLUGINS_REV_START (GitRawPluginsRevisionString + 6)
-static char GitRawPluginsRepositoryURL[] = "$URL$";
diff --git a/components/runtime/smalltalk/stack-spur/squeak.ips b/components/runtime/smalltalk/stack-spur/squeak.ips
index 466708a..4b23a86 100755
--- a/components/runtime/smalltalk/stack-spur/squeak.ips
+++ b/components/runtime/smalltalk/stack-spur/squeak.ips
@@ -6,7 +6,7 @@
# Last edited: 2013-11-13 19:51:35 by piumarta on emilia
PATH=/usr/bin:/bin
-PLUGIN_REV=5.0-202402252018
+PLUGIN_REV=5.0-202403301849
realpath () {
path="$1"
diff --git a/components/runtime/smalltalk/stack-spur/test/results-64.master b/components/runtime/smalltalk/stack-spur/test/results-64.master
index eaabc24..579fde9 100644
--- a/components/runtime/smalltalk/stack-spur/test/results-64.master
+++ b/components/runtime/smalltalk/stack-spur/test/results-64.master
@@ -1,7 +1,7 @@
SUnit Results
Squeak5.3
solaris2.11
-Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3351]
+Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3356]
Failed Tests
'BitBltTest>>#testAllAlphasRgbMul'
'OrderedDictionaryTest>>#testGrow'
--
Gitblit v1.9.3