From 5d055bc476270f7692c855c63dc523ff01b80c1d Mon Sep 17 00:00:00 2001 From: David Stes <55844484+cstes@users.noreply.github.com> Date: Wed, 23 Dec 2020 18:36:22 +0100 Subject: [PATCH] squeak-4,squeak-5: update to 4.19.3 and 5.0.2908 --- components/runtime/squeak5/manifests/sample-manifest.p5m | 38 ++++---- components/runtime/squeak5c/Makefile | 12 ++- components/runtime/squeak5c/patches/02-sqSCCSVersion.patch | 14 +- components/runtime/squeak4/Makefile | 22 ++++- components/runtime/squeak5/patches/02-sqSCCSVersion.patch | 14 +- components/runtime/squeak4/manifests/sample-manifest.p5m | 56 +++++++------- components/runtime/squeak5/Makefile | 12 ++- components/runtime/squeak5/patches/03-sqPluginsSCCSVersion.patch | 8 +- components/runtime/squeak5c/manifests/sample-manifest.p5m | 38 ++++---- components/runtime/squeak5c/patches/03-sqPluginsSCCSVersion.patch | 8 +- 10 files changed, 122 insertions(+), 100 deletions(-) diff --git a/components/runtime/squeak4/Makefile b/components/runtime/squeak4/Makefile index d459a83..d48c03f 100644 --- a/components/runtime/squeak4/Makefile +++ b/components/runtime/squeak4/Makefile @@ -31,16 +31,15 @@ include ../../../make-rules/shared-macros.mk COMPONENT_NAME= squeak-4 -COMPONENT_VERSION= 4.19.2 -COMPONENT_REVISION= 1 +COMPONENT_VERSION= 4.19.3 COMPONENT_SUMMARY= The Squeak V4 Smalltalk Virtual Machine COMPONENT_PROJECT_URL= http://www.squeak.org COMPONENT_ARCHIVE_URL= http://squeakvm.org COMPONENT_FMRI= runtime/squeak-4 COMPONENT_CLASSIFICATION= Development/Other Languages SVN_REPO= http://squeakvm.org/svn/squeak/trunk/ -SVN_REV= 3791 -SVN_HASH= sha256:10087d6bfd42b49fc2fecc7268603326e30650fdb06cbf2d996c55d697a4d358 +SVN_REV= 3792 +SVN_HASH= sha256:46abb74efeac5ae9c8321ec30db5164211f6e3e2f7ff83209cf4cc8be2ca48f8 # See http://wiki.squeak.org/squeak/933 # See http://wiki.squeak.org/squeak/159 @@ -57,6 +56,21 @@ PATH=$(PATH.gnu) +# override gcc_OPT (defaults to -O3) for the moment +# squeak4 compiles with -O2 or -O3 but +# KernelTests-Chronology with gcc 7.5 version 4.16.7 or 4.19.* +# gcc -O : 438 pass tests +# gcc -O2 : 20 failures 1 errors #testAsDelay error +# the system compiled with -O3 / -O2 is usable but has Chronology failures + +# the example squeak4 Makefile specifies _FILE_OFFSET_BITS=64 +# goal is large file support (as in man lfcompile) +# lfcompile - large file compilation environment for 32-bit applications + +gcc_OPT= -O +gcc_OPT+= -D_LARGEFILE_SOURCE +gcc_OPT+= -D_FILE_OFFSET_BITS=64 + # squeak4 configure looks for .svn or svnversion file, but # prep-svn.mk did a svn export and created an unversioned copy of the sources COMPONENT_PRE_CONFIGURE_ACTION = \ diff --git a/components/runtime/squeak4/manifests/sample-manifest.p5m b/components/runtime/squeak4/manifests/sample-manifest.p5m index 38eb2b7..5feb6b2 100644 --- a/components/runtime/squeak4/manifests/sample-manifest.p5m +++ b/components/runtime/squeak4/manifests/sample-manifest.p5m @@ -24,32 +24,32 @@ file path=usr/bin/squeak file path=usr/bin/squeak.sh -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/ckformat -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.AioPlugin -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.B3DAcceleratorPlugin -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.ClipboardExtendedPlugin -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.DBusPlugin -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.FT2Plugin -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.FileCopyPlugin -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.GStreamerPlugin -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.HostWindowPlugin -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.ImmX11Plugin -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.KedamaPlugin2 -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.Mpeg3Plugin -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.RomePlugin -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.ScratchPlugin -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.Squeak3D -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.SqueakFFIPrims -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.SqueakSSL -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.UUIDPlugin -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.UnicodePlugin -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.UnixOSProcessPlugin -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.XDisplayControlPlugin -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.vm-display-X11 -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.vm-display-custom -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.vm-display-null -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.vm-sound-custom -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.vm-sound-null -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/so.vm-sound-pulse -file path=usr/lib/squeak/$(COMPONENT_VERSION)-3791/squeakvm +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/ckformat +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.AioPlugin +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.B3DAcceleratorPlugin +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.ClipboardExtendedPlugin +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.DBusPlugin +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.FT2Plugin +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.FileCopyPlugin +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.GStreamerPlugin +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.HostWindowPlugin +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.ImmX11Plugin +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.KedamaPlugin2 +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.Mpeg3Plugin +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.RomePlugin +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.ScratchPlugin +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.Squeak3D +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.SqueakFFIPrims +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.SqueakSSL +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.UUIDPlugin +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.UnicodePlugin +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.UnixOSProcessPlugin +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.XDisplayControlPlugin +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.vm-display-X11 +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.vm-display-custom +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.vm-display-null +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.vm-sound-custom +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.vm-sound-null +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/so.vm-sound-pulse +file path=usr/lib/squeak/$(COMPONENT_VERSION)-3792/squeakvm file path=usr/share/man/man1/squeak.1 diff --git a/components/runtime/squeak5/Makefile b/components/runtime/squeak5/Makefile index b3ca0ea..8222506 100644 --- a/components/runtime/squeak5/Makefile +++ b/components/runtime/squeak5/Makefile @@ -24,10 +24,14 @@ include ../../../make-rules/shared-macros.mk +# there is no official triplet version for opensmalltalk-vm +# we use 5.0.<n> for VMMaker.oscog-eem.<n> +# sometimes the Stack VM is generated from a different VMMaker as the Cog VM + COMPONENT_NAME= squeak-5 -COMPONENT_VERSION= 5.0.2893 -GIT_TAG= sun-v5.0.22 -PLUGIN_REV= 5.0-202012050741 +COMPONENT_VERSION= 5.0.2908 +GIT_TAG= sun-v5.0.23 +PLUGIN_REV= 5.0-202012230929 COMPONENT_SUMMARY= The Squeak V5 Smalltalk Virtual Machine COMPONENT_PROJECT_URL= http://www.squeak.org COMPONENT_FMRI= runtime/squeak-5 @@ -41,7 +45,7 @@ COMPONENT_SRC= opensmalltalk-vm-$(GIT_TAG) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz -COMPONENT_ARCHIVE_HASH= sha256:2457764d6a4b0f9d2a4330a090f0a80a68ea5e81f3439f133d3d434fea924163 +COMPONENT_ARCHIVE_HASH= sha256:bd2c370117c72d03f2ee44c78d9f33be90b86a5177f2897c453520be5da952bc COMPONENT_ARCHIVE_URL= https://codeload.github.com/cstes/opensmalltalk-vm/tar.gz/$(GIT_TAG) TEST_TARGET= $(NO_TESTS) diff --git a/components/runtime/squeak5/manifests/sample-manifest.p5m b/components/runtime/squeak5/manifests/sample-manifest.p5m index 2f2a11b..ada6d04 100644 --- a/components/runtime/squeak5/manifests/sample-manifest.p5m +++ b/components/runtime/squeak5/manifests/sample-manifest.p5m @@ -30,25 +30,25 @@ 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-202012050741/B3DAcceleratorPlugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741/DESPlugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741/FileAttributesPlugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741/ImmX11Plugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741/LocalePlugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741/MD5Plugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741/SHA2Plugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741/Squeak3D.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741/SqueakFFIPrims.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741/SqueakSSL.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741/UUIDPlugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741/UnicodePlugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741/UnixOSProcessPlugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741/XDisplayControlPlugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741/squeak -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741/vm-display-X11.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741/vm-display-null.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741/vm-sound-null.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741/vm-sound-pulse.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929/B3DAcceleratorPlugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929/DESPlugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929/FileAttributesPlugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929/ImmX11Plugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929/LocalePlugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929/MD5Plugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929/SHA2Plugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929/Squeak3D.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929/SqueakFFIPrims.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929/SqueakSSL.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929/UUIDPlugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929/UnicodePlugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929/UnixOSProcessPlugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929/XDisplayControlPlugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929/squeak +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929/vm-display-X11.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929/vm-display-null.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929/vm-sound-null.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929/vm-sound-pulse.so file path=usr/share/man/man1/inisqueak.1 hardlink path=usr/share/man/man1/squeak.1 target=inisqueak.1 file path=usr/squeak diff --git a/components/runtime/squeak5/patches/02-sqSCCSVersion.patch b/components/runtime/squeak5/patches/02-sqSCCSVersion.patch index 5d675ae..1e930ea 100644 --- a/components/runtime/squeak5/patches/02-sqSCCSVersion.patch +++ b/components/runtime/squeak5/patches/02-sqSCCSVersion.patch @@ -1,15 +1,15 @@ ---- opensmalltalk-vm-sun-v5.0.22/platforms/Cross/vm/sqSCCSVersion.h Sat Dec 5 08:41:05 2020 -+++ p0/opensmalltalk-vm-sun-v5.0.22/platforms/Cross/vm/sqSCCSVersion.h Sat Dec 5 10:09:12 2020 +--- opensmalltalk-vm-sun-v5.0.23/platforms/Cross/vm/sqSCCSVersion.h Wed Dec 23 10:29:31 2020 ++++ p0/opensmalltalk-vm-sun-v5.0.23/platforms/Cross/vm/sqSCCSVersion.h Wed Dec 23 16:21:23 2020 @@ -28,13 +28,13 @@ #if SUBVERSION # define PREFIX "r" -static char SvnRawRevisionString[] = "$Rev$"; -+static char SvnRawRevisionString[] = "$Rev: 202012050741 $"; ++static char SvnRawRevisionString[] = "$Rev: 202012230929 $"; # define REV_START (SvnRawRevisionString + 6) -static char SvnRawRevisionDate[] = "$Date$"; -+static char SvnRawRevisionDate[] = "$Date: Sat Dec 5 08:41:05 2020 +0100 $"; ++static char SvnRawRevisionDate[] = "$Date: Wed Dec 23 10:29:31 2020 +0100 $"; # define DATE_START (SvnRawRevisionDate + 7) -static char SvnRawRepositoryURL[] = "$URL$"; @@ -22,11 +22,11 @@ #elif GIT # define PREFIX "" -static char GitRawRevisionString[] = "$Rev$"; -+static char GitRawRevisionString[] = "$Rev: 202012050741 $"; ++static char GitRawRevisionString[] = "$Rev: 202012230929 $"; # define REV_START (GitRawRevisionString + 6) -static char GitRawRevisionDate[] = "$Date$"; -+static char GitRawRevisionDate[] = "$Date: Sat Dec 5 08:41:05 2020 +0100 $"; ++static char GitRawRevisionDate[] = "$Date: Wed Dec 23 10:29:31 2020 +0100 $"; # define DATE_START (GitRawRevisionDate + 7) -static char GitRawRepositoryURL[] = "$URL$"; @@ -34,7 +34,7 @@ # define URL_START (GitRawRepositoryURL + 6) -static char GitRawRevisionShortHash[] = "$CommitHash$"; -+static char GitRawRevisionShortHash[] = "$CommitHash: 1e6a5bbca $"; ++static char GitRawRevisionShortHash[] = "$CommitHash: 3c9839e81 $"; # define SHORTHASH_START (GitRawRevisionShortHash + 13) static char * diff --git a/components/runtime/squeak5/patches/03-sqPluginsSCCSVersion.patch b/components/runtime/squeak5/patches/03-sqPluginsSCCSVersion.patch index 17be6d9..68ef326 100644 --- a/components/runtime/squeak5/patches/03-sqPluginsSCCSVersion.patch +++ b/components/runtime/squeak5/patches/03-sqPluginsSCCSVersion.patch @@ -1,11 +1,11 @@ ---- opensmalltalk-vm-sun-v5.0.22/platforms/Cross/plugins/sqPluginsSCCSVersion.h Sat Dec 5 08:41:05 2020 -+++ p0/opensmalltalk-vm-sun-v5.0.22/platforms/Cross/plugins/sqPluginsSCCSVersion.h Sat Dec 5 10:09:12 2020 +--- opensmalltalk-vm-sun-v5.0.23/platforms/Cross/plugins/sqPluginsSCCSVersion.h Wed Dec 23 10:29:31 2020 ++++ p0/opensmalltalk-vm-sun-v5.0.23/platforms/Cross/plugins/sqPluginsSCCSVersion.h Wed Dec 23 16:21:23 2020 @@ -9,10 +9,10 @@ */ #if SUBVERSION -static char SvnRawPluginsRevisionString[] = "$Rev$"; -+static char SvnRawPluginsRevisionString[] = "$Rev: 202012050741 $"; ++static char SvnRawPluginsRevisionString[] = "$Rev: 202012230929 $"; # 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: 202012050741 $"; ++static char GitRawPluginsRevisionString[] = "$Rev: 202012230929 $"; # define PLUGINS_REV_START (GitRawPluginsRevisionString + 6) -static char GitRawPluginsRepositoryURL[] = "$URL$"; diff --git a/components/runtime/squeak5c/Makefile b/components/runtime/squeak5c/Makefile index d9fc8c6..a45bbec 100644 --- a/components/runtime/squeak5c/Makefile +++ b/components/runtime/squeak5c/Makefile @@ -24,10 +24,14 @@ include ../../../make-rules/shared-macros.mk +# there is no official triplet version for opensmalltalk-vm +# we use 5.0.<n> for VMMaker.oscog-eem.<n> +# sometimes the Stack VM is generated from a different VMMaker as the Cog VM + COMPONENT_NAME= squeak-5c -COMPONENT_VERSION= 5.0.2905 -GIT_TAG= sun-v5.0.22 -PLUGIN_REV= 5.0-202012050741-cog +COMPONENT_VERSION= 5.0.2908 +GIT_TAG= sun-v5.0.23 +PLUGIN_REV= 5.0-202012230929-cog COMPONENT_SUMMARY= The Cog Implementation of the Squeak V5 Smalltalk Virtual Machine COMPONENT_PROJECT_URL= http://www.squeak.org COMPONENT_FMRI= runtime/squeak-5c @@ -41,7 +45,7 @@ COMPONENT_SRC= opensmalltalk-vm-$(GIT_TAG) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz -COMPONENT_ARCHIVE_HASH= sha256:2457764d6a4b0f9d2a4330a090f0a80a68ea5e81f3439f133d3d434fea924163 +COMPONENT_ARCHIVE_HASH= sha256:bd2c370117c72d03f2ee44c78d9f33be90b86a5177f2897c453520be5da952bc COMPONENT_ARCHIVE_URL= https://codeload.github.com/cstes/opensmalltalk-vm/tar.gz/$(GIT_TAG) TEST_TARGET= $(NO_TESTS) diff --git a/components/runtime/squeak5c/manifests/sample-manifest.p5m b/components/runtime/squeak5c/manifests/sample-manifest.p5m index a07c9a9..bfb30a5 100644 --- a/components/runtime/squeak5c/manifests/sample-manifest.p5m +++ b/components/runtime/squeak5c/manifests/sample-manifest.p5m @@ -30,25 +30,25 @@ 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-202012050741-cog/B3DAcceleratorPlugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741-cog/DESPlugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741-cog/FileAttributesPlugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741-cog/ImmX11Plugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741-cog/LocalePlugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741-cog/MD5Plugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741-cog/SHA2Plugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741-cog/Squeak3D.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741-cog/SqueakFFIPrims.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741-cog/SqueakSSL.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741-cog/UUIDPlugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741-cog/UnicodePlugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741-cog/UnixOSProcessPlugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741-cog/XDisplayControlPlugin.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741-cog/squeak -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741-cog/vm-display-X11.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741-cog/vm-display-null.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741-cog/vm-sound-null.so -file path=usr/lib/$(MACH64)/squeak/5.0-202012050741-cog/vm-sound-pulse.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929-cog/B3DAcceleratorPlugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929-cog/DESPlugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929-cog/FileAttributesPlugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929-cog/ImmX11Plugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929-cog/LocalePlugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929-cog/MD5Plugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929-cog/SHA2Plugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929-cog/Squeak3D.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929-cog/SqueakFFIPrims.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929-cog/SqueakSSL.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929-cog/UUIDPlugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929-cog/UnicodePlugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929-cog/UnixOSProcessPlugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929-cog/XDisplayControlPlugin.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929-cog/squeak +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929-cog/vm-display-X11.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929-cog/vm-display-null.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929-cog/vm-sound-null.so +file path=usr/lib/$(MACH64)/squeak/5.0-202012230929-cog/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/squeak5c/patches/02-sqSCCSVersion.patch b/components/runtime/squeak5c/patches/02-sqSCCSVersion.patch index 20e9b7e..67a7d64 100644 --- a/components/runtime/squeak5c/patches/02-sqSCCSVersion.patch +++ b/components/runtime/squeak5c/patches/02-sqSCCSVersion.patch @@ -1,15 +1,15 @@ ---- opensmalltalk-vm-sun-v5.0.22/platforms/Cross/vm/sqSCCSVersion.h Sat Dec 5 08:41:05 2020 -+++ p0/opensmalltalk-vm-sun-v5.0.22/platforms/Cross/vm/sqSCCSVersion.h Sat Dec 5 10:37:08 2020 +--- opensmalltalk-vm-sun-v5.0.23/platforms/Cross/vm/sqSCCSVersion.h Wed Dec 23 10:29:31 2020 ++++ p0/opensmalltalk-vm-sun-v5.0.23/platforms/Cross/vm/sqSCCSVersion.h Wed Dec 23 16:47:09 2020 @@ -28,13 +28,13 @@ #if SUBVERSION # define PREFIX "r" -static char SvnRawRevisionString[] = "$Rev$"; -+static char SvnRawRevisionString[] = "$Rev: 202012050741-cog $"; ++static char SvnRawRevisionString[] = "$Rev: 202012230929-cog $"; # define REV_START (SvnRawRevisionString + 6) -static char SvnRawRevisionDate[] = "$Date$"; -+static char SvnRawRevisionDate[] = "$Date: Sat Dec 5 08:41:05 2020 +0100 $"; ++static char SvnRawRevisionDate[] = "$Date: Wed Dec 23 10:29:31 2020 +0100 $"; # define DATE_START (SvnRawRevisionDate + 7) -static char SvnRawRepositoryURL[] = "$URL$"; @@ -22,11 +22,11 @@ #elif GIT # define PREFIX "" -static char GitRawRevisionString[] = "$Rev$"; -+static char GitRawRevisionString[] = "$Rev: 202012050741-cog $"; ++static char GitRawRevisionString[] = "$Rev: 202012230929-cog $"; # define REV_START (GitRawRevisionString + 6) -static char GitRawRevisionDate[] = "$Date$"; -+static char GitRawRevisionDate[] = "$Date: Sat Dec 5 08:41:05 2020 +0100 $"; ++static char GitRawRevisionDate[] = "$Date: Wed Dec 23 10:29:31 2020 +0100 $"; # define DATE_START (GitRawRevisionDate + 7) -static char GitRawRepositoryURL[] = "$URL$"; @@ -34,7 +34,7 @@ # define URL_START (GitRawRepositoryURL + 6) -static char GitRawRevisionShortHash[] = "$CommitHash$"; -+static char GitRawRevisionShortHash[] = "$CommitHash: 1e6a5bbca $"; ++static char GitRawRevisionShortHash[] = "$CommitHash: 3c9839e81 $"; # define SHORTHASH_START (GitRawRevisionShortHash + 13) static char * diff --git a/components/runtime/squeak5c/patches/03-sqPluginsSCCSVersion.patch b/components/runtime/squeak5c/patches/03-sqPluginsSCCSVersion.patch index f3115ab..efd7fb0 100644 --- a/components/runtime/squeak5c/patches/03-sqPluginsSCCSVersion.patch +++ b/components/runtime/squeak5c/patches/03-sqPluginsSCCSVersion.patch @@ -1,11 +1,11 @@ ---- opensmalltalk-vm-sun-v5.0.22/platforms/Cross/plugins/sqPluginsSCCSVersion.h Sat Dec 5 08:41:05 2020 -+++ p0/opensmalltalk-vm-sun-v5.0.22/platforms/Cross/plugins/sqPluginsSCCSVersion.h Sat Dec 5 10:37:08 2020 +--- opensmalltalk-vm-sun-v5.0.23/platforms/Cross/plugins/sqPluginsSCCSVersion.h Wed Dec 23 10:29:31 2020 ++++ p0/opensmalltalk-vm-sun-v5.0.23/platforms/Cross/plugins/sqPluginsSCCSVersion.h Wed Dec 23 16:47:09 2020 @@ -9,10 +9,10 @@ */ #if SUBVERSION -static char SvnRawPluginsRevisionString[] = "$Rev$"; -+static char SvnRawPluginsRevisionString[] = "$Rev: 202012050741-cog $"; ++static char SvnRawPluginsRevisionString[] = "$Rev: 202012230929-cog $"; # 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: 202012050741-cog $"; ++static char GitRawPluginsRevisionString[] = "$Rev: 202012230929-cog $"; # define PLUGINS_REV_START (GitRawPluginsRevisionString + 6) -static char GitRawPluginsRepositoryURL[] = "$URL$"; -- Gitblit v1.9.3