components/runtime/squeak5/Makefile
@@ -35,10 +35,9 @@ # sometimes the Stack VM is generated from a different VMMaker as the Cog VM COMPONENT_NAME= squeak-5 COMPONENT_VERSION= 5.0.2945 COMPONENT_REVISION= 1 GIT_TAG= sun-v5.0.26 PLUGIN_REV= 5.0-202102111620 COMPONENT_VERSION= 5.0.2948 GIT_TAG= sun-v5.0.27 PLUGIN_REV= 5.0-202103291332 COMPONENT_SUMMARY= The Squeak V5 Smalltalk Virtual Machine COMPONENT_PROJECT_URL= http://www.squeak.org COMPONENT_FMRI= runtime/squeak-5 @@ -52,7 +51,7 @@ COMPONENT_SRC= opensmalltalk-vm-$(GIT_TAG) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= sha256:470a55c51da928bce248a6c1c239fa5c74cb5141b9a06119640c75602bbcf163 COMPONENT_ARCHIVE_HASH= sha256:84d22bfba6a9f1b9dfbc8d3be14343a7fb5cbe09bb9c6146900f61a7ba37b2f8 COMPONENT_ARCHIVE_URL= https://codeload.github.com/cstes/opensmalltalk-vm/tar.gz/$(GIT_TAG) TEST_TARGET= $(NO_TESTS) @@ -60,11 +59,6 @@ # some builds seem to be broken with -Bdirect # but issue is not reproducable # LD_B_DIRECT= # try to install the 32bit version before the 64bit version build : $(BUILD_32) $(INSTALL_32) $(BUILD_64) install : $(INSTALL_64) include $(WS_MAKE_RULES)/common.mk @@ -133,17 +127,17 @@ REQUIRED_PACKAGES += library/audio/gstreamer REQUIRED_PACKAGES += library/libffi REQUIRED_PACKAGES += system/library/freetype-2 REQUIRED_PACKAGES += x11/library/libxext REQUIRED_PACKAGES += x11/library/libxevie # Auto-generated dependencies REQUIRED_PACKAGES += SUNWcs REQUIRED_PACKAGES += library/audio/pulseaudio REQUIRED_PACKAGES += library/desktop/cairo REQUIRED_PACKAGES += library/desktop/pango REQUIRED_PACKAGES += library/glib2 REQUIRED_PACKAGES += library/security/openssl REQUIRED_PACKAGES += shell/ksh93 REQUIRED_PACKAGES += system/library REQUIRED_PACKAGES += system/library/math REQUIRED_PACKAGES += x11/library/libx11 REQUIRED_PACKAGES += x11/library/libxext REQUIRED_PACKAGES += x11/library/libxrender components/runtime/squeak5/manifests/sample-manifest.p5m
@@ -32,44 +32,44 @@ 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-202102111620/B3DAcceleratorPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620/DESPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620/FileAttributesPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620/ImmX11Plugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620/LocalePlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620/MD5Plugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620/SHA2Plugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620/Squeak3D.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620/SqueakFFIPrims.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620/SqueakSSL.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620/UUIDPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620/UnicodePlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620/UnixOSProcessPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620/XDisplayControlPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620/squeak file path=usr/lib/$(MACH64)/squeak/5.0-202102111620/vm-display-X11.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620/vm-display-null.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620/vm-sound-null.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620/vm-sound-pulse.so file path=usr/lib/squeak/5.0-202102111620/B3DAcceleratorPlugin.so file path=usr/lib/squeak/5.0-202102111620/DESPlugin.so file path=usr/lib/squeak/5.0-202102111620/FileAttributesPlugin.so file path=usr/lib/squeak/5.0-202102111620/ImmX11Plugin.so file path=usr/lib/squeak/5.0-202102111620/LocalePlugin.so file path=usr/lib/squeak/5.0-202102111620/MD5Plugin.so file path=usr/lib/squeak/5.0-202102111620/SHA2Plugin.so file path=usr/lib/squeak/5.0-202102111620/Squeak3D.so file path=usr/lib/squeak/5.0-202102111620/SqueakFFIPrims.so file path=usr/lib/squeak/5.0-202102111620/SqueakSSL.so file path=usr/lib/squeak/5.0-202102111620/UUIDPlugin.so file path=usr/lib/squeak/5.0-202102111620/UnicodePlugin.so file path=usr/lib/squeak/5.0-202102111620/UnixOSProcessPlugin.so file path=usr/lib/squeak/5.0-202102111620/XDisplayControlPlugin.so file path=usr/lib/squeak/5.0-202102111620/squeak file path=usr/lib/squeak/5.0-202102111620/vm-display-X11.so file path=usr/lib/squeak/5.0-202102111620/vm-display-null.so file path=usr/lib/squeak/5.0-202102111620/vm-sound-null.so file path=usr/lib/squeak/5.0-202102111620/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/lib/$(MACH64)/squeak/5.0-202103291332/B3DAcceleratorPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332/DESPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332/FileAttributesPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332/ImmX11Plugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332/LocalePlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332/MD5Plugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332/SHA2Plugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332/Squeak3D.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332/SqueakFFIPrims.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332/SqueakSSL.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332/UUIDPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332/UnicodePlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332/UnixOSProcessPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332/XDisplayControlPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332/squeak file path=usr/lib/$(MACH64)/squeak/5.0-202103291332/vm-display-X11.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332/vm-display-null.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332/vm-sound-null.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332/vm-sound-pulse.so file path=usr/lib/squeak/5.0-202103291332/B3DAcceleratorPlugin.so file path=usr/lib/squeak/5.0-202103291332/DESPlugin.so file path=usr/lib/squeak/5.0-202103291332/FileAttributesPlugin.so file path=usr/lib/squeak/5.0-202103291332/ImmX11Plugin.so file path=usr/lib/squeak/5.0-202103291332/LocalePlugin.so file path=usr/lib/squeak/5.0-202103291332/MD5Plugin.so file path=usr/lib/squeak/5.0-202103291332/SHA2Plugin.so file path=usr/lib/squeak/5.0-202103291332/Squeak3D.so file path=usr/lib/squeak/5.0-202103291332/SqueakFFIPrims.so file path=usr/lib/squeak/5.0-202103291332/SqueakSSL.so file path=usr/lib/squeak/5.0-202103291332/UUIDPlugin.so file path=usr/lib/squeak/5.0-202103291332/UnicodePlugin.so file path=usr/lib/squeak/5.0-202103291332/UnixOSProcessPlugin.so file path=usr/lib/squeak/5.0-202103291332/XDisplayControlPlugin.so file path=usr/lib/squeak/5.0-202103291332/squeak file path=usr/lib/squeak/5.0-202103291332/vm-display-X11.so file path=usr/lib/squeak/5.0-202103291332/vm-display-null.so file path=usr/lib/squeak/5.0-202103291332/vm-sound-null.so file path=usr/lib/squeak/5.0-202103291332/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 components/runtime/squeak5/patches/01-Makefile-amd64.patch
@@ -1,15 +1,27 @@ --- opensmalltalk-vm-sun-v5.0.11/platforms/unix/config/Makefile.in Wed Aug 26 15:38:04 2020 +++ p0/opensmalltalk-vm-sun-v5.0.11/platforms/unix/config/Makefile.in Thu Aug 27 07:33:34 2020 @@ -67,6 +67,9 @@ --- opensmalltalk-vm-sun-v5.0.26/platforms/unix/config/Makefile.in Thu Feb 11 17:20:06 2021 +++ p0/opensmalltalk-vm-sun-v5.0.26/platforms/unix/config/Makefile.in Mon Mar 29 16:48:16 2021 @@ -49,7 +49,7 @@ # VM -$(squeak) : config.sh $(SQLIBS) version.o +$(squeak) : $(SQLIBS) version.o $(LINK) $(squeak) $(SQLIBS) version.o $(LIBS) [plibs] vm/vm.a @echo @size $(squeak) @@ -67,8 +67,11 @@ getversion : ${cfgdir}/getversion.c ${topdir}/platforms/Cross/vm/sqSCCSVersion.h $(LINK) getversion $(INCLUDES) ${cfgdir}/getversion.c -plugins : config.sh $(PLUGINS_LA) +ckformat : ${topdir}/src/ckformat.c + $(LINK) $@ $? + plugins : config.sh $(PLUGINS_LA) +plugins : $(PLUGINS_LA) + # nuke everything but the mvm script; plugins.ext and plugins.int are assumed # to be copied from the parent or grandparent directory @@ -77,10 +80,10 @@ # unix launch scripts @@ -23,3 +35,28 @@ # npsqueak @@ -135,7 +138,7 @@ NPOBJS = vm-display-Quartz/sqUnixSafari.o vm-sound-MacOSX/sqUnixSoundMacOSX.o vm-display-Quartz/sqUnixQuartz.o NPLIBS = $(NPOBJS) -framework CoreAudio -framework AudioToolbox -NPSqueak : config.sh $(SQLIBS) version.o $(NPOBJS) +NPSqueak : $(SQLIBS) version.o $(NPOBJS) gcc -bundle -flat_namespace -undefined suppress -o NPSqueak \ $(NPLIBS) $(SQLIBS) version.o $(LIBS) vm/vm.a @@ -153,15 +156,6 @@ @Makefile_rpm@ @Makefile_deb@ -# VMM configuration changes - -config.sh : $(vmmcfg)/plugins.int $(vmmcfg)/plugins.ext libtool - ./config.status - @echo - @echo "configuration changed: please run make again" - @echo - @exit 1 - # bookkeeping LIBTOOL_DEPS = @LIBTOOL_DEPS@ libtool: $(LIBTOOL_DEPS) components/runtime/squeak5/patches/02-sqSCCSVersion.patch
@@ -1,19 +1,19 @@ --- opensmalltalk-vm-sun-v5.0.26/platforms/Cross/vm/sqSCCSVersion.h Thu Feb 11 17:20:06 2021 +++ p0/opensmalltalk-vm-sun-v5.0.26/platforms/Cross/vm/sqSCCSVersion.h Fri Feb 12 09:32:59 2021 --- opensmalltalk-vm-sun-v5.0.27/platforms/Cross/vm/sqSCCSVersion.h Mon Mar 29 15:32:44 2021 +++ p0/opensmalltalk-vm-sun-v5.0.27/platforms/Cross/vm/sqSCCSVersion.h Tue Mar 30 18:07:31 2021 @@ -28,13 +28,13 @@ #if SUBVERSION # define PREFIX "r" -static char SvnRawRevisionString[] = "$Rev$"; +static char SvnRawRevisionString[] = "$Rev: 202102111620 $"; +static char SvnRawRevisionString[] = "$Rev: 202103291332 $"; # define REV_START (SvnRawRevisionString + 6) -static char SvnRawRevisionDate[] = "$Date$"; +static char SvnRawRevisionDate[] = "$Date: Thu Feb 11 17:20:06 2021 +0100 $"; +static char SvnRawRevisionDate[] = "$Date: Mon Mar 29 15:32:44 2021 +0200 $"; # define DATE_START (SvnRawRevisionDate + 7) -static char SvnRawRepositoryURL[] = "$URL$"; +static char SvnRawRepositoryURL[] = "$URL: stes@phobos:src/opensmalltalk $"; +static char SvnRawRepositoryURL[] = "$URL: stes@pallas:src/opensmalltalk $"; # define URL_START (SvnRawRepositoryURL + 6) static char * @@ -22,19 +22,19 @@ #elif GIT # define PREFIX "" -static char GitRawRevisionString[] = "$Rev$"; +static char GitRawRevisionString[] = "$Rev: 202102111620 $"; +static char GitRawRevisionString[] = "$Rev: 202103291332 $"; # define REV_START (GitRawRevisionString + 6) -static char GitRawRevisionDate[] = "$Date$"; +static char GitRawRevisionDate[] = "$Date: Thu Feb 11 17:20:06 2021 +0100 $"; +static char GitRawRevisionDate[] = "$Date: Mon Mar 29 15:32:44 2021 +0200 $"; # define DATE_START (GitRawRevisionDate + 7) -static char GitRawRepositoryURL[] = "$URL$"; +static char GitRawRepositoryURL[] = "$URL: stes@phobos:src/opensmalltalk $"; +static char GitRawRepositoryURL[] = "$URL: stes@pallas:src/opensmalltalk $"; # define URL_START (GitRawRepositoryURL + 6) -static char GitRawRevisionShortHash[] = "$CommitHash$"; +static char GitRawRevisionShortHash[] = "$CommitHash: 55f686255 $"; +static char GitRawRevisionShortHash[] = "$CommitHash: 8ff3640cb $"; # define SHORTHASH_START (GitRawRevisionShortHash + 13) static char * components/runtime/squeak5/patches/03-sqPluginsSCCSVersion.patch
@@ -1,15 +1,15 @@ --- opensmalltalk-vm-sun-v5.0.26/platforms/Cross/plugins/sqPluginsSCCSVersion.h Thu Feb 11 17:20:06 2021 +++ p0/opensmalltalk-vm-sun-v5.0.26/platforms/Cross/plugins/sqPluginsSCCSVersion.h Fri Feb 12 09:32:59 2021 --- opensmalltalk-vm-sun-v5.0.27/platforms/Cross/plugins/sqPluginsSCCSVersion.h Mon Mar 29 15:32:44 2021 +++ p0/opensmalltalk-vm-sun-v5.0.27/platforms/Cross/plugins/sqPluginsSCCSVersion.h Tue Mar 30 18:07:31 2021 @@ -9,10 +9,10 @@ */ #if SUBVERSION -static char SvnRawPluginsRevisionString[] = "$Rev$"; +static char SvnRawPluginsRevisionString[] = "$Rev: 202102111620 $"; +static char SvnRawPluginsRevisionString[] = "$Rev: 202103291332 $"; # define PLUGINS_REV_START (SvnRawPluginsRevisionString + 6) -static char SvnRawPluginsRepositoryURL[] = "$URL$"; +static char SvnRawPluginsRepositoryURL[] = "$URL: stes@phobos:src/opensmalltalk $"; +static char SvnRawPluginsRepositoryURL[] = "$URL: stes@pallas:src/opensmalltalk $"; # define URL_START (SvnRawPluginsRepositoryURL + 6) static char * @@ -18,11 +18,11 @@ # undef URL_START #elif GIT -static char GitRawPluginsRevisionString[] = "$Rev$"; +static char GitRawPluginsRevisionString[] = "$Rev: 202102111620 $"; +static char GitRawPluginsRevisionString[] = "$Rev: 202103291332 $"; # define PLUGINS_REV_START (GitRawPluginsRevisionString + 6) -static char GitRawPluginsRepositoryURL[] = "$URL$"; +static char GitRawPluginsRepositoryURL[] = "$URL: stes@phobos:src/opensmalltalk $"; +static char GitRawPluginsRepositoryURL[] = "$URL: stes@pallas:src/opensmalltalk $"; # define URL_START (GitRawPluginsRepositoryURL + 6) static char * components/runtime/squeak5/pkg5
@@ -8,6 +8,7 @@ "library/glib2", "library/libffi", "library/security/openssl", "shell/ksh93", "system/library", "system/library/dbus", "system/library/freetype-2", components/runtime/squeak5/squeak.ips
@@ -8,7 +8,7 @@ CK=/usr/bin/ckformat DBX= PLUGIN_REV=5.0-202102111620 PLUGIN_REV=5.0-202103291332 LIB32=/usr/lib/squeak/$PLUGIN_REV LIB64=/usr/lib/amd64/squeak/$PLUGIN_REV
@@ -28,10 +28,9 @@ # sometimes the Stack VM is generated from a different VMMaker as the Cog VM COMPONENT_NAME= squeak-5c COMPONENT_VERSION= 5.0.2945 COMPONENT_REVISION= 1 GIT_TAG= sun-v5.0.26 PLUGIN_REV= 5.0-202102111620-cog COMPONENT_VERSION= 5.0.2948 GIT_TAG= sun-v5.0.27 PLUGIN_REV= 5.0-202103291332-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 @@ -45,7 +44,7 @@ COMPONENT_SRC= opensmalltalk-vm-$(GIT_TAG) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= sha256:470a55c51da928bce248a6c1c239fa5c74cb5141b9a06119640c75602bbcf163 COMPONENT_ARCHIVE_HASH= sha256:84d22bfba6a9f1b9dfbc8d3be14343a7fb5cbe09bb9c6146900f61a7ba37b2f8 COMPONENT_ARCHIVE_URL= https://codeload.github.com/cstes/opensmalltalk-vm/tar.gz/$(GIT_TAG) TEST_TARGET= $(NO_TESTS) @@ -53,11 +52,6 @@ # some builds seem to be broken with -Bdirect # but issue is not reproducable # LD_B_DIRECT= # try to install the 32bit version before the 64bit version build : $(BUILD_32) $(INSTALL_32) $(BUILD_64) install : $(INSTALL_64) include $(WS_MAKE_RULES)/common.mk @@ -124,17 +118,17 @@ REQUIRED_PACKAGES += library/audio/gstreamer REQUIRED_PACKAGES += library/libffi REQUIRED_PACKAGES += system/library/freetype-2 REQUIRED_PACKAGES += x11/library/libxext REQUIRED_PACKAGES += x11/library/libxevie # Auto-generated dependencies REQUIRED_PACKAGES += SUNWcs REQUIRED_PACKAGES += library/audio/pulseaudio REQUIRED_PACKAGES += library/desktop/cairo REQUIRED_PACKAGES += library/desktop/pango REQUIRED_PACKAGES += library/glib2 REQUIRED_PACKAGES += library/security/openssl REQUIRED_PACKAGES += shell/ksh93 REQUIRED_PACKAGES += system/library REQUIRED_PACKAGES += system/library/math REQUIRED_PACKAGES += x11/library/libx11 REQUIRED_PACKAGES += x11/library/libxext REQUIRED_PACKAGES += x11/library/libxrender components/runtime/squeak5c/manifests/sample-manifest.p5m
@@ -32,44 +32,44 @@ 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-202102111620-cog/B3DAcceleratorPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620-cog/DESPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620-cog/FileAttributesPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620-cog/ImmX11Plugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620-cog/LocalePlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620-cog/MD5Plugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620-cog/SHA2Plugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620-cog/Squeak3D.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620-cog/SqueakFFIPrims.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620-cog/SqueakSSL.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620-cog/UUIDPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620-cog/UnicodePlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620-cog/UnixOSProcessPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620-cog/XDisplayControlPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620-cog/squeak file path=usr/lib/$(MACH64)/squeak/5.0-202102111620-cog/vm-display-X11.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620-cog/vm-display-null.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620-cog/vm-sound-null.so file path=usr/lib/$(MACH64)/squeak/5.0-202102111620-cog/vm-sound-pulse.so file path=usr/lib/squeak/5.0-202102111620-cog/B3DAcceleratorPlugin.so file path=usr/lib/squeak/5.0-202102111620-cog/DESPlugin.so file path=usr/lib/squeak/5.0-202102111620-cog/FileAttributesPlugin.so file path=usr/lib/squeak/5.0-202102111620-cog/ImmX11Plugin.so file path=usr/lib/squeak/5.0-202102111620-cog/LocalePlugin.so file path=usr/lib/squeak/5.0-202102111620-cog/MD5Plugin.so file path=usr/lib/squeak/5.0-202102111620-cog/SHA2Plugin.so file path=usr/lib/squeak/5.0-202102111620-cog/Squeak3D.so file path=usr/lib/squeak/5.0-202102111620-cog/SqueakFFIPrims.so file path=usr/lib/squeak/5.0-202102111620-cog/SqueakSSL.so file path=usr/lib/squeak/5.0-202102111620-cog/UUIDPlugin.so file path=usr/lib/squeak/5.0-202102111620-cog/UnicodePlugin.so file path=usr/lib/squeak/5.0-202102111620-cog/UnixOSProcessPlugin.so file path=usr/lib/squeak/5.0-202102111620-cog/XDisplayControlPlugin.so file path=usr/lib/squeak/5.0-202102111620-cog/squeak file path=usr/lib/squeak/5.0-202102111620-cog/vm-display-X11.so file path=usr/lib/squeak/5.0-202102111620-cog/vm-display-null.so file path=usr/lib/squeak/5.0-202102111620-cog/vm-sound-null.so file path=usr/lib/squeak/5.0-202102111620-cog/vm-sound-pulse.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332-cog/B3DAcceleratorPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332-cog/DESPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332-cog/FileAttributesPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332-cog/ImmX11Plugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332-cog/LocalePlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332-cog/MD5Plugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332-cog/SHA2Plugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332-cog/Squeak3D.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332-cog/SqueakFFIPrims.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332-cog/SqueakSSL.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332-cog/UUIDPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332-cog/UnicodePlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332-cog/UnixOSProcessPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332-cog/XDisplayControlPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332-cog/squeak file path=usr/lib/$(MACH64)/squeak/5.0-202103291332-cog/vm-display-X11.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332-cog/vm-display-null.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332-cog/vm-sound-null.so file path=usr/lib/$(MACH64)/squeak/5.0-202103291332-cog/vm-sound-pulse.so file path=usr/lib/squeak/5.0-202103291332-cog/B3DAcceleratorPlugin.so file path=usr/lib/squeak/5.0-202103291332-cog/DESPlugin.so file path=usr/lib/squeak/5.0-202103291332-cog/FileAttributesPlugin.so file path=usr/lib/squeak/5.0-202103291332-cog/ImmX11Plugin.so file path=usr/lib/squeak/5.0-202103291332-cog/LocalePlugin.so file path=usr/lib/squeak/5.0-202103291332-cog/MD5Plugin.so file path=usr/lib/squeak/5.0-202103291332-cog/SHA2Plugin.so file path=usr/lib/squeak/5.0-202103291332-cog/Squeak3D.so file path=usr/lib/squeak/5.0-202103291332-cog/SqueakFFIPrims.so file path=usr/lib/squeak/5.0-202103291332-cog/SqueakSSL.so file path=usr/lib/squeak/5.0-202103291332-cog/UUIDPlugin.so file path=usr/lib/squeak/5.0-202103291332-cog/UnicodePlugin.so file path=usr/lib/squeak/5.0-202103291332-cog/UnixOSProcessPlugin.so file path=usr/lib/squeak/5.0-202103291332-cog/XDisplayControlPlugin.so file path=usr/lib/squeak/5.0-202103291332-cog/squeak file path=usr/lib/squeak/5.0-202103291332-cog/vm-display-X11.so file path=usr/lib/squeak/5.0-202103291332-cog/vm-display-null.so file path=usr/lib/squeak/5.0-202103291332-cog/vm-sound-null.so file path=usr/lib/squeak/5.0-202103291332-cog/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 components/runtime/squeak5c/patches/01-Makefile-amd64.patch
@@ -1,15 +1,27 @@ --- opensmalltalk-vm-sun-v5.0.11/platforms/unix/config/Makefile.in Wed Aug 26 15:38:04 2020 +++ p0/opensmalltalk-vm-sun-v5.0.11/platforms/unix/config/Makefile.in Thu Aug 27 07:33:34 2020 @@ -67,6 +67,9 @@ --- opensmalltalk-vm-sun-v5.0.26/platforms/unix/config/Makefile.in Thu Feb 11 17:20:06 2021 +++ p0/opensmalltalk-vm-sun-v5.0.26/platforms/unix/config/Makefile.in Mon Mar 29 16:48:16 2021 @@ -49,7 +49,7 @@ # VM -$(squeak) : config.sh $(SQLIBS) version.o +$(squeak) : $(SQLIBS) version.o $(LINK) $(squeak) $(SQLIBS) version.o $(LIBS) [plibs] vm/vm.a @echo @size $(squeak) @@ -67,8 +67,11 @@ getversion : ${cfgdir}/getversion.c ${topdir}/platforms/Cross/vm/sqSCCSVersion.h $(LINK) getversion $(INCLUDES) ${cfgdir}/getversion.c -plugins : config.sh $(PLUGINS_LA) +ckformat : ${topdir}/src/ckformat.c + $(LINK) $@ $? + plugins : config.sh $(PLUGINS_LA) +plugins : $(PLUGINS_LA) + # nuke everything but the mvm script; plugins.ext and plugins.int are assumed # to be copied from the parent or grandparent directory @@ -77,10 +80,10 @@ # unix launch scripts @@ -23,3 +35,28 @@ # npsqueak @@ -135,7 +138,7 @@ NPOBJS = vm-display-Quartz/sqUnixSafari.o vm-sound-MacOSX/sqUnixSoundMacOSX.o vm-display-Quartz/sqUnixQuartz.o NPLIBS = $(NPOBJS) -framework CoreAudio -framework AudioToolbox -NPSqueak : config.sh $(SQLIBS) version.o $(NPOBJS) +NPSqueak : $(SQLIBS) version.o $(NPOBJS) gcc -bundle -flat_namespace -undefined suppress -o NPSqueak \ $(NPLIBS) $(SQLIBS) version.o $(LIBS) vm/vm.a @@ -153,15 +156,6 @@ @Makefile_rpm@ @Makefile_deb@ -# VMM configuration changes - -config.sh : $(vmmcfg)/plugins.int $(vmmcfg)/plugins.ext libtool - ./config.status - @echo - @echo "configuration changed: please run make again" - @echo - @exit 1 - # bookkeeping LIBTOOL_DEPS = @LIBTOOL_DEPS@ libtool: $(LIBTOOL_DEPS) components/runtime/squeak5c/patches/02-sqSCCSVersion.patch
@@ -1,19 +1,19 @@ --- opensmalltalk-vm-sun-v5.0.26/platforms/Cross/vm/sqSCCSVersion.h Thu Feb 11 17:20:06 2021 +++ p0/opensmalltalk-vm-sun-v5.0.26/platforms/Cross/vm/sqSCCSVersion.h Fri Feb 12 11:31:59 2021 --- opensmalltalk-vm-sun-v5.0.27/platforms/Cross/vm/sqSCCSVersion.h Mon Mar 29 15:32:44 2021 +++ p0/opensmalltalk-vm-sun-v5.0.27/platforms/Cross/vm/sqSCCSVersion.h Tue Mar 30 18:37:13 2021 @@ -28,13 +28,13 @@ #if SUBVERSION # define PREFIX "r" -static char SvnRawRevisionString[] = "$Rev$"; +static char SvnRawRevisionString[] = "$Rev: 202102111620-cog $"; +static char SvnRawRevisionString[] = "$Rev: 202103291332-cog $"; # define REV_START (SvnRawRevisionString + 6) -static char SvnRawRevisionDate[] = "$Date$"; +static char SvnRawRevisionDate[] = "$Date: Thu Feb 11 17:20:06 2021 +0100 $"; +static char SvnRawRevisionDate[] = "$Date: Mon Mar 29 15:32:44 2021 +0200 $"; # define DATE_START (SvnRawRevisionDate + 7) -static char SvnRawRepositoryURL[] = "$URL$"; +static char SvnRawRepositoryURL[] = "$URL: stes@phobos:src/opensmalltalk $"; +static char SvnRawRepositoryURL[] = "$URL: stes@pallas:src/opensmalltalk $"; # define URL_START (SvnRawRepositoryURL + 6) static char * @@ -22,19 +22,19 @@ #elif GIT # define PREFIX "" -static char GitRawRevisionString[] = "$Rev$"; +static char GitRawRevisionString[] = "$Rev: 202102111620-cog $"; +static char GitRawRevisionString[] = "$Rev: 202103291332-cog $"; # define REV_START (GitRawRevisionString + 6) -static char GitRawRevisionDate[] = "$Date$"; +static char GitRawRevisionDate[] = "$Date: Thu Feb 11 17:20:06 2021 +0100 $"; +static char GitRawRevisionDate[] = "$Date: Mon Mar 29 15:32:44 2021 +0200 $"; # define DATE_START (GitRawRevisionDate + 7) -static char GitRawRepositoryURL[] = "$URL$"; +static char GitRawRepositoryURL[] = "$URL: stes@phobos:src/opensmalltalk $"; +static char GitRawRepositoryURL[] = "$URL: stes@pallas:src/opensmalltalk $"; # define URL_START (GitRawRepositoryURL + 6) -static char GitRawRevisionShortHash[] = "$CommitHash$"; +static char GitRawRevisionShortHash[] = "$CommitHash: 55f686255 $"; +static char GitRawRevisionShortHash[] = "$CommitHash: 8ff3640cb $"; # define SHORTHASH_START (GitRawRevisionShortHash + 13) static char * components/runtime/squeak5c/patches/03-sqPluginsSCCSVersion.patch
@@ -1,15 +1,15 @@ --- opensmalltalk-vm-sun-v5.0.26/platforms/Cross/plugins/sqPluginsSCCSVersion.h Thu Feb 11 17:20:06 2021 +++ p0/opensmalltalk-vm-sun-v5.0.26/platforms/Cross/plugins/sqPluginsSCCSVersion.h Fri Feb 12 11:31:59 2021 --- opensmalltalk-vm-sun-v5.0.27/platforms/Cross/plugins/sqPluginsSCCSVersion.h Mon Mar 29 15:32:44 2021 +++ p0/opensmalltalk-vm-sun-v5.0.27/platforms/Cross/plugins/sqPluginsSCCSVersion.h Tue Mar 30 18:37:13 2021 @@ -9,10 +9,10 @@ */ #if SUBVERSION -static char SvnRawPluginsRevisionString[] = "$Rev$"; +static char SvnRawPluginsRevisionString[] = "$Rev: 202102111620-cog $"; +static char SvnRawPluginsRevisionString[] = "$Rev: 202103291332-cog $"; # define PLUGINS_REV_START (SvnRawPluginsRevisionString + 6) -static char SvnRawPluginsRepositoryURL[] = "$URL$"; +static char SvnRawPluginsRepositoryURL[] = "$URL: stes@phobos:src/opensmalltalk $"; +static char SvnRawPluginsRepositoryURL[] = "$URL: stes@pallas:src/opensmalltalk $"; # define URL_START (SvnRawPluginsRepositoryURL + 6) static char * @@ -18,11 +18,11 @@ # undef URL_START #elif GIT -static char GitRawPluginsRevisionString[] = "$Rev$"; +static char GitRawPluginsRevisionString[] = "$Rev: 202102111620-cog $"; +static char GitRawPluginsRevisionString[] = "$Rev: 202103291332-cog $"; # define PLUGINS_REV_START (GitRawPluginsRevisionString + 6) -static char GitRawPluginsRepositoryURL[] = "$URL$"; +static char GitRawPluginsRepositoryURL[] = "$URL: stes@phobos:src/opensmalltalk $"; +static char GitRawPluginsRepositoryURL[] = "$URL: stes@pallas:src/opensmalltalk $"; # define URL_START (GitRawPluginsRepositoryURL + 6) static char * components/runtime/squeak5c/pkg5
@@ -8,6 +8,7 @@ "library/glib2", "library/libffi", "library/security/openssl", "shell/ksh93", "system/library", "system/library/dbus", "system/library/freetype-2", components/runtime/squeak5c/squeak.ips
@@ -8,7 +8,7 @@ CK=/usr/bin/ckformat5c DBX= PLUGIN_REV=5.0-202102111620-cog PLUGIN_REV=5.0-202103291332-cog LIB32=/usr/lib/squeak/$PLUGIN_REV LIB64=/usr/lib/amd64/squeak/$PLUGIN_REV
