squeak5-vm: Update to 202206021410

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: squeak5-vm: Update to 202206021410
From: Atsushi Toyokura <asteria.at%gmail.com@localhost>
Date: Sat, 09 Jul 2022 09:25:04 +0000
Module Name:	pkgsrc-wip
Committed By:	Atsushi Toyokura <asteria.at%gmail.com@localhost>
Pushed By:	steleto
Date:		Sat Jul 9 18:25:04 2022 +0900
Changeset:	3636807618184eedbd3e9e126fc39979c91e8a4b

Modified Files:
	squeak5-vm/Makefile
	squeak5-vm/PLIST
	squeak5-vm/distinfo
	squeak5-vm/patches/patch-platforms_unix_config_configure.ac
	squeak5-vm/patches/patch-platforms_unix_plugins_SqueakSSL_openssl__overlay.h
	squeak5-vm/patches/patch-platforms_unix_vm-display-X11_acinclude.m4
	squeak5-vm/patches/patch-platforms_unix_vm_include__ucontext.h
	squeak5-vm/patches/patch-platforms_unix_vm_sqUnixMain.c
Added Files:
	squeak5-vm/patches/patch-platforms_unix_plugins_JoystickTabletPlugin_sqUnixJoystickTablet.c
	squeak5-vm/patches/patch-src_spur64.cog_cogitX64SysV.c
Removed Files:
	squeak5-vm/patches/patch-platforms_unix_plugins_UnicodePlugin_Makefile.inc
	squeak5-vm/patches/patch-platforms_unix_plugins_UnicodePlugin_acinclude.m4
	squeak5-vm/patches/patch-spur64src_vm_cogitX64SysV.c

Log Message:
squeak5-vm: Update to 202206021410

202206021410
------------

Release Version 2022.06 (for Squeak 6.0 and updated 5.3 bundles)

- Adds joystick/gamepad support on Linux
- Fixes support for OpenSSL3 on Linux
- Fixes resolution of fully-qualified domain names (FQDNs) longer than
  64 characters on Linux

This is a patch release. Also see the release notes of OSVM Version
2022.

Known Issues

- Memory leak on X11 (Linux) related to scale-factor lookup
  - 100-200 KiB every 3-6 seconds
  - See issue #642
  - Workaround via environment variable
    SQUEAK_DISPLAY_PER_MONITOR_SCALE=1
  - Does not affect -headless -vm-display-X11 -headless -nodisplay
    -vm-display-null (i.e., smalltalkCI is fine)

202205110711
------------

Please use the more recent patch release OSVM Version 2022.06

Release Version 2022

- Adds ARMv8/Aarch64/ARM64 JIT incl. support for Apple M1
- Adds "fast C primitives" via #FastCPrimitiveFlag
- Adds support for catching exceptions in FFI callouts
- Adds #primitiveScreenScaleFactor (for DPI-aware images)
- Adds primitives 568 and 578 complementing 88 (primitiveSuspend)
- Adds #primitiveMultipleBytecodeSetsActive to update image format for
  SistaV1
- Adds VectorEnginePlugin
- Fixes regressions in ARMv6 support
- Fixes performance regressions of -metal and -opengl backends on
  macOS
- Fixes -core-graphics backend on macOS
- Fixes Retina scaling on macOS, i.e., support "backing scale factor"
- Fixes primitive 126 to fail on graphics backends w/o composition
  buffer
- Fixes regressions in vm-display-fbdev on Linux
- Fixes time sync (e.g., for DST) on Windows
- Fixes UDP binding on Windows

Known Issues

- No support for OpenSSL3 (e.g., on Ubuntu 22.04)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3636807618184eedbd3e9e126fc39979c91e8a4b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 squeak5-vm/Makefile                                | 12 +++--
 squeak5-vm/PLIST                                   | 52 +++++++++------------
 squeak5-vm/distinfo                                | 22 ++++-----
 .../patch-platforms_unix_config_configure.ac       | 13 +++++-
 ...ins_JoystickTabletPlugin_sqUnixJoystickTablet.c | 54 ++++++++++++++++++++++
 ...forms_unix_plugins_SqueakSSL_openssl__overlay.h |  4 +-
 ...atforms_unix_plugins_UnicodePlugin_Makefile.inc |  9 ----
 ...atforms_unix_plugins_UnicodePlugin_acinclude.m4 | 26 -----------
 ...atch-platforms_unix_vm-display-X11_acinclude.m4 | 34 ++++++--------
 .../patch-platforms_unix_vm_include__ucontext.h    | 12 +++--
 .../patches/patch-platforms_unix_vm_sqUnixMain.c   | 26 ++++-------
 .../patches/patch-spur64src_vm_cogitX64SysV.c      | 15 ------
 .../patches/patch-src_spur64.cog_cogitX64SysV.c    | 15 ++++++
 13 files changed, 148 insertions(+), 146 deletions(-)

diffs:
diff --git a/squeak5-vm/Makefile b/squeak5-vm/Makefile
index 55f6c2bf41..eb60cd9431 100644
--- a/squeak5-vm/Makefile
+++ b/squeak5-vm/Makefile
@@ -6,7 +6,7 @@ PKGVERSION=	5.0-${GITHUB_TAG}
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=OpenSmalltalk/}
 GITHUB_PROJECT=	opensmalltalk-vm
-GITHUB_TAG=	202003021730
+GITHUB_TAG=	202206021410
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://opensmalltalk.org/
@@ -36,19 +36,19 @@ SUBST_MESSAGE.sccs=	Set version infomation to the VM.
 SUBST_FILES.sccs=	platforms/Cross/vm/sqSCCSVersion.h
 SUBST_FILES.sccs+=	platforms/Cross/plugins/sqPluginsSCCSVersion.h
 SUBST_SED.sccs=		-e "s,\$$Rev,\$$Rev: ${GITHUB_TAG} ,g"
-SUBST_SED.sccs+=	-e "s,\$$Date,\$$Date: Mon 2 Mar 2020 18:30:55 +0100 ,g"
+SUBST_SED.sccs+=	-e "s,\$$Date,\$$Date: Tue 10 May 2022 15:49:26 +0300 ,g"
 SUBST_SED.sccs+=	-e "s,\$$URL,\$$URL: `${ID} -un`@`${HOSTNAME_CMD}`:${WRKSRC} ,g"
-SUBST_SED.sccs+=	-e "s,\$$CommitHash,\$$CommitHash: 6a0bc9626 ,g"
+SUBST_SED.sccs+=	-e "s,\$$CommitHash,\$$CommitHash: c9fd36530 ,g"
 
 INSTALLATION_DIRS+=	bin
 
-NOT_PAX_MPROTECT_SAFE+=	lib/squeak/${PKGVERSION}/squeak
+NOT_PAX_MPROTECT_SAFE+=	lib/squeak/${PKGVERSION}-64bit/squeak
 
 pre-build:
 	cd ${WRKSRC}/platforms/unix/config && ${MAKE_PROGRAM}
 
 do-build:
-	cd ${WRKSRC}/build.linux64x64/squeak.cog.spur/build && yes | ${BASH} ./mvm
+	cd ${WRKSRC}/building/linux64x64/squeak.cog.spur/build && yes | ${BASH} ./mvm
 
 do-install:
 	cd ${WRKSRC}/products/sqcogspur64linuxht && find bin -type f | while read file; do \
@@ -66,11 +66,13 @@ do-install:
 	cd ${WRKSRC}/products/sqcogspur64linuxht && find lib -type f -name "*.a" | while read file; do \
 		${INSTALL_DATA} $$file ${DESTDIR}${PREFIX}/$$file; \
 	done
+	cd ${DESTDIR}${PREFIX}/bin && ${LN} -s spur64 squeak
 
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/squeak5-vm/PLIST b/squeak5-vm/PLIST
index 1b10746dd4..e07a13bf25 100644
--- a/squeak5-vm/PLIST
+++ b/squeak5-vm/PLIST
@@ -1,33 +1,23 @@
 @comment $NetBSD$
+bin/spur64
 bin/squeak
-lib/squeak/${PKGVERSION}/B3DAcceleratorPlugin.a
-lib/squeak/${PKGVERSION}/B3DAcceleratorPlugin.so
-lib/squeak/${PKGVERSION}/FileAttributesPlugin.a
-lib/squeak/${PKGVERSION}/FileAttributesPlugin.so
-lib/squeak/${PKGVERSION}/ImmX11Plugin.a
-lib/squeak/${PKGVERSION}/ImmX11Plugin.so
-lib/squeak/${PKGVERSION}/LocalePlugin.a
-lib/squeak/${PKGVERSION}/LocalePlugin.so
-lib/squeak/${PKGVERSION}/Squeak3D.a
-lib/squeak/${PKGVERSION}/Squeak3D.so
-lib/squeak/${PKGVERSION}/SqueakFFIPrims.a
-lib/squeak/${PKGVERSION}/SqueakFFIPrims.so
-lib/squeak/${PKGVERSION}/SqueakSSL.a
-lib/squeak/${PKGVERSION}/SqueakSSL.so
-lib/squeak/${PKGVERSION}/UUIDPlugin.a
-lib/squeak/${PKGVERSION}/UUIDPlugin.so
-lib/squeak/${PKGVERSION}/UnicodePlugin.a
-lib/squeak/${PKGVERSION}/UnicodePlugin.so
-lib/squeak/${PKGVERSION}/UnixOSProcessPlugin.a
-lib/squeak/${PKGVERSION}/UnixOSProcessPlugin.so
-lib/squeak/${PKGVERSION}/XDisplayControlPlugin.a
-lib/squeak/${PKGVERSION}/XDisplayControlPlugin.so
-lib/squeak/${PKGVERSION}/squeak
-lib/squeak/${PKGVERSION}/vm-display-X11.a
-lib/squeak/${PKGVERSION}/vm-display-X11.so
-lib/squeak/${PKGVERSION}/vm-display-null.a
-lib/squeak/${PKGVERSION}/vm-display-null.so
-lib/squeak/${PKGVERSION}/vm-sound-OSS.a
-lib/squeak/${PKGVERSION}/vm-sound-OSS.so
-lib/squeak/${PKGVERSION}/vm-sound-null.a
-lib/squeak/${PKGVERSION}/vm-sound-null.so
+lib/squeak/${PKGVERSION}-64bit/B3DAcceleratorPlugin.so
+lib/squeak/${PKGVERSION}-64bit/DESPlugin.so
+lib/squeak/${PKGVERSION}-64bit/FileAttributesPlugin.so
+lib/squeak/${PKGVERSION}-64bit/ImmX11Plugin.so
+lib/squeak/${PKGVERSION}-64bit/LocalePlugin.so
+lib/squeak/${PKGVERSION}-64bit/MD5Plugin.so
+lib/squeak/${PKGVERSION}-64bit/SHA2Plugin.so
+lib/squeak/${PKGVERSION}-64bit/Squeak3D.so
+lib/squeak/${PKGVERSION}-64bit/SqueakFFIPrims.so
+lib/squeak/${PKGVERSION}-64bit/SqueakSSL.so
+lib/squeak/${PKGVERSION}-64bit/UUIDPlugin.so
+lib/squeak/${PKGVERSION}-64bit/UnicodePlugin.so
+lib/squeak/${PKGVERSION}-64bit/UnixOSProcessPlugin.so
+lib/squeak/${PKGVERSION}-64bit/VectorEnginePlugin.so
+lib/squeak/${PKGVERSION}-64bit/XDisplayControlPlugin.so
+lib/squeak/${PKGVERSION}-64bit/squeak
+lib/squeak/${PKGVERSION}-64bit/vm-display-X11.so
+lib/squeak/${PKGVERSION}-64bit/vm-display-null.so
+lib/squeak/${PKGVERSION}-64bit/vm-sound-OSS.so
+lib/squeak/${PKGVERSION}-64bit/vm-sound-null.so
diff --git a/squeak5-vm/distinfo b/squeak5-vm/distinfo
index ebff7d5b8c..6645f68848 100644
--- a/squeak5-vm/distinfo
+++ b/squeak5-vm/distinfo
@@ -1,22 +1,20 @@
 $NetBSD$
 
-SHA1 (opensmalltak-vm-202003021730.tar.gz) = 3711fc9ea7e154b61724d4a2529dcc12e08cca02
-RMD160 (opensmalltak-vm-202003021730.tar.gz) = ce56ec2bdd767dcde6636adeffb338bbf6e7001c
-SHA512 (opensmalltak-vm-202003021730.tar.gz) = 62f37bd3ae133280b34dc2a703300b2a782a5e03eec92487af0a2e19b44e73eb15caa7684b1b227fe5bbcda9b28a2ad1b6f18b932205396c66138a1757717de6
-Size (opensmalltak-vm-202003021730.tar.gz) = 63428361 bytes
+BLAKE2s (opensmalltak-vm-202206021410.tar.gz) = 5dad73622373eaab242b869751e20e8b402c846d8c892d64b5b5dae8ef18f8c6
+SHA512 (opensmalltak-vm-202206021410.tar.gz) = a72b221eb76178d8d80134b58523bddb5ae480d1497a4b1cbd7079268b9687f3ddf06e391557abcb2e8ec0db972ebbb9529affea8eed41753252ac986abc3905
+Size (opensmalltak-vm-202206021410.tar.gz) = 54790671 bytes
 SHA1 (patch-platforms_Cross_plugins_SqueakFFIPrims_sqFFIPlugin.c) = 6422c6e53716f5ad009235b7b3ae728ae1ef554f
 SHA1 (patch-platforms_unix_config_bin.squeak.sh.in) = eca83ca07948b5abce150bd4be4b5a7a8e1630eb
-SHA1 (patch-platforms_unix_config_configure.ac) = 59b4e0ed084e5b02d4dc434448b2f8e1a6c2f7c8
+SHA1 (patch-platforms_unix_config_configure.ac) = 465b211778a8d70bc2d030f0e8987f0e48edc1c2
 SHA1 (patch-platforms_unix_config_make.cfg.in) = d3bc685372bf4104f2b3db78625681e26c0c29d9
 SHA1 (patch-platforms_unix_config_make.ext.in) = d9fcf9124568ffac544d9bb388883647f4d01e26
 SHA1 (patch-platforms_unix_config_squeak.sh.in) = 29b074f629fd773a6d14acdd28d5f0054f2ee59d
+SHA1 (patch-platforms_unix_plugins_JoystickTabletPlugin_sqUnixJoystickTablet.c) = 039d233d6f51462a08c05449b82d983cfe1825e0
 SHA1 (patch-platforms_unix_plugins_SerialPlugin_sqUnixSerial.c) = 3e84fbb1a22ea899d8f61bd220c2407e73c1ef06
-SHA1 (patch-platforms_unix_plugins_SqueakSSL_openssl__overlay.h) = f74ab00c09a026c7df6bde4f647d77f12437884a
-SHA1 (patch-platforms_unix_plugins_UnicodePlugin_Makefile.inc) = 71aebebf64ddc205dd8d30f495bb19706d3216e2
-SHA1 (patch-platforms_unix_plugins_UnicodePlugin_acinclude.m4) = 53c5afc8dee6e31bd01a7611e2e30030e7059496
-SHA1 (patch-platforms_unix_vm-display-X11_acinclude.m4) = b6d13d74a7c3f5428f4cefa068a9ba3f15ac6556
-SHA1 (patch-platforms_unix_vm_include__ucontext.h) = f4e944f3f1a74a363157efe4cb1fcf03dc127fc0
+SHA1 (patch-platforms_unix_plugins_SqueakSSL_openssl__overlay.h) = f66f067c8876a3c0a22d8728a65c3e8811411b31
+SHA1 (patch-platforms_unix_vm-display-X11_acinclude.m4) = 6fe2caffdcafa00185102d79dbb1dd50c3c814ee
+SHA1 (patch-platforms_unix_vm_include__ucontext.h) = ef722fe06ac5e565e9303a7467cbee1b23f9d0bd
 SHA1 (patch-platforms_unix_vm_sqUnixITimerHeartbeat.c) = 96b6f1094b07c9456f9b6cc56b2bc7237e6c24f0
 SHA1 (patch-platforms_unix_vm_sqUnixITimerTickerHeartbeat.c) = 2714da2e76226d5194a07ad1ea5ead3edc39d7fd
-SHA1 (patch-platforms_unix_vm_sqUnixMain.c) = 371f69c1e78914c3187003e89524485a6e930628
-SHA1 (patch-spur64src_vm_cogitX64SysV.c) = e1759c6a501bd611a3796134e71fcb37ab27ace8
+SHA1 (patch-platforms_unix_vm_sqUnixMain.c) = f000e949fde87f81fdada5be84a40a9842a1d1bd
+SHA1 (patch-src_spur64.cog_cogitX64SysV.c) = f0a60621d6bfc3aa101da95d1fa354829f3e5d56
diff --git a/squeak5-vm/patches/patch-platforms_unix_config_configure.ac b/squeak5-vm/patches/patch-platforms_unix_config_configure.ac
index 46bea41fa1..9e8257e36b 100644
--- a/squeak5-vm/patches/patch-platforms_unix_config_configure.ac
+++ b/squeak5-vm/patches/patch-platforms_unix_config_configure.ac
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- platforms/unix/config/configure.ac.orig	2019-01-17 23:23:50.000000000 +0000
+--- platforms/unix/config/configure.ac.orig	2022-06-02 14:10:44.000000000 +0000
 +++ platforms/unix/config/configure.ac
-@@ -141,10 +141,12 @@ test "x$exec_prefix" = xNONE && exec_pre
+@@ -152,10 +152,12 @@ test "x$exec_prefix" = xNONE && exec_pre
  imgdir=`eval echo ${libdir}/squeak`
  expanded_relative_imgdir=`eval echo lib/squeak/${VM_VERSION}`
  plgdir='${imgdir}/`${blddir}/getversion VERSION_TAG`'
@@ -15,3 +15,12 @@ $NetBSD$
  
  AC_DEFINE(OS_TYPE, "unix", [OS type])
  
+@@ -268,7 +270,7 @@ case $target in
+ 		PKG_CONFIG=/usr/bin/i686-linux-gnu-pkg-config
+ 		;;
+ 	*)
+-		PKG_CONFIG=/usr/bin/pkg-config
++		PKG_CONFIG=pkg-config
+ 		;;
+ esac
+ 
diff --git a/squeak5-vm/patches/patch-platforms_unix_plugins_JoystickTabletPlugin_sqUnixJoystickTablet.c b/squeak5-vm/patches/patch-platforms_unix_plugins_JoystickTabletPlugin_sqUnixJoystickTablet.c
new file mode 100644
index 0000000000..a9b684b5bb
--- /dev/null
+++ b/squeak5-vm/patches/patch-platforms_unix_plugins_JoystickTabletPlugin_sqUnixJoystickTablet.c
@@ -0,0 +1,54 @@
+$NetBSD$
+
+--- platforms/unix/plugins/JoystickTabletPlugin/sqUnixJoystickTablet.c.orig	2022-06-02 14:10:44.000000000 +0000
++++ platforms/unix/plugins/JoystickTabletPlugin/sqUnixJoystickTablet.c
+@@ -29,6 +29,7 @@
+ /* Author: davidf%afeka.ac.il@localhost
+  */
+ 
++#if __linux__
+ #include <assert.h>
+ #include <limits.h>
+ #include <stdio.h>
+@@ -354,3 +355,41 @@ int tabletResultSize(void)
+   return 0;
+ }
+ 
++#else
++#include "sq.h"
++#include "JoystickTabletPlugin.h"
++
++/* we don't have any joysticks */
++
++void *joySticks= 0;
++
++int joystickRead(int index)	{ return 0; }
++int joystickInit(void)		{ return 0; }
++
++/* we don't have any tablets either */
++
++int tabletInit(void)
++{
++  return 0;
++}
++
++int tabletGetParameters(int cursorIndex, int result[])
++{
++  return 0;
++}
++
++int tabletRead(int cursorIndex, int result[])
++{
++  return 0;
++}
++
++int tabletResultSize(void)
++{
++  return 0;
++}
++
++int joystickShutdown(void)
++{
++  return 0;
++}
++#endif	/* __linux__ */
diff --git a/squeak5-vm/patches/patch-platforms_unix_plugins_SqueakSSL_openssl__overlay.h b/squeak5-vm/patches/patch-platforms_unix_plugins_SqueakSSL_openssl__overlay.h
index 27615b4c15..f436220a28 100644
--- a/squeak5-vm/patches/patch-platforms_unix_plugins_SqueakSSL_openssl__overlay.h
+++ b/squeak5-vm/patches/patch-platforms_unix_plugins_SqueakSSL_openssl__overlay.h
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- platforms/unix/plugins/SqueakSSL/openssl_overlay.h.orig	2018-10-19 04:12:21.000000000 +0000
+--- platforms/unix/plugins/SqueakSSL/openssl_overlay.h.orig	2022-06-02 14:10:44.000000000 +0000
 +++ platforms/unix/plugins/SqueakSSL/openssl_overlay.h
-@@ -516,6 +516,7 @@ static size_t _sqo_lib_paths(size_t cons
+@@ -524,6 +524,7 @@ static size_t _sqo_lib_paths(size_t cons
      _SQO_ADD_LIB("/lib");
      _SQO_ADD_LIB("/usr/lib");
      _SQO_ADD_LIB("/usr/local/lib");
diff --git a/squeak5-vm/patches/patch-platforms_unix_plugins_UnicodePlugin_Makefile.inc b/squeak5-vm/patches/patch-platforms_unix_plugins_UnicodePlugin_Makefile.inc
deleted file mode 100644
index fc550cea67..0000000000
--- a/squeak5-vm/patches/patch-platforms_unix_plugins_UnicodePlugin_Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD$
-
---- platforms/unix/plugins/UnicodePlugin/Makefile.inc.orig	2018-10-19 04:12:21.000000000 +0000
-+++ platforms/unix/plugins/UnicodePlugin/Makefile.inc
-@@ -1,2 +1,2 @@
--XCPPFLAGS=	-I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0  -I/usr/lib/glib-2.0/include -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -I/usr/lib/i386-linux-gnu/glib-2.0/include
--XLDFLAGS= -lpangocairo-1.0 -lcairo -lpango-1.0 -lgobject-2.0 -lglib-2.0
-+#XCPPFLAGS=	-I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0  -I/usr/lib/glib-2.0/include -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -I/usr/lib/i386-linux-gnu/glib-2.0/include
-+#XLDFLAGS= -lpangocairo-1.0 -lcairo -lpango-1.0 -lgobject-2.0 -lglib-2.0
diff --git a/squeak5-vm/patches/patch-platforms_unix_plugins_UnicodePlugin_acinclude.m4 b/squeak5-vm/patches/patch-platforms_unix_plugins_UnicodePlugin_acinclude.m4
deleted file mode 100644
index 17fbec725a..0000000000
--- a/squeak5-vm/patches/patch-platforms_unix_plugins_UnicodePlugin_acinclude.m4
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
---- platforms/unix/plugins/UnicodePlugin/acinclude.m4.orig	2018-10-19 04:12:21.000000000 +0000
-+++ platforms/unix/plugins/UnicodePlugin/acinclude.m4
-@@ -1,12 +1,9 @@
--# -*- sh -*-
--
--AC_MSG_CHECKING([for PangoCairo libraries])
--save_CPPFLAGS="$CPPFLAGS"
--CPPFLAGS="-I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -I/usr/lib/i386-linux-gnu/glib-2.0/include"
--AC_TRY_COMPILE([#include <pango/pangocairo.h>],[{}],[
--  AC_MSG_RESULT(yes)
--],[
--  AC_MSG_RESULT(no)
--  AC_PLUGIN_DISABLE
--])
--CPPFLAGS="$save_CPPFLAGS"
-+# -*- sh -*-
-+AC_MSG_CHECKING([for PangoCairo libraries])
-+PKG_CHECK_MODULES([pangocairo], [pangocairo], [
-+		      AC_MSG_RESULT(yes)
-+		      CFLAGS="$CFLAGS $pangocairo_CFLAGS"
-+		      LDFLAGS="$LDFLAGS $pangocairo_LIBS"
-+		  ],[
-+		      AC_MSG_RESULT(no)
-+		  ])
diff --git a/squeak5-vm/patches/patch-platforms_unix_vm-display-X11_acinclude.m4 b/squeak5-vm/patches/patch-platforms_unix_vm-display-X11_acinclude.m4
index 23d9f438ac..c5d8e3b7cc 100644
--- a/squeak5-vm/patches/patch-platforms_unix_vm-display-X11_acinclude.m4
+++ b/squeak5-vm/patches/patch-platforms_unix_vm-display-X11_acinclude.m4
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- platforms/unix/vm-display-X11/acinclude.m4.orig	2018-10-19 04:12:21.000000000 +0000
+--- platforms/unix/vm-display-X11/acinclude.m4.orig	2022-06-02 14:10:44.000000000 +0000
 +++ platforms/unix/vm-display-X11/acinclude.m4
-@@ -45,18 +45,19 @@ if test "$have_x" = "yes"; then
+@@ -45,16 +45,16 @@ if test "$have_x" = "yes"; then
      INCLUDES="${INCLUDES} -I${x_includes}"
      X_INCLUDES="-I${x_includes}"
    fi
@@ -10,27 +10,19 @@ $NetBSD$
 +  PKG_CHECK_MODULES([x11], [x11], [
      AC_DEFINE([USE_X11], [1], [Use X11])
      AC_DEFINE_UNQUOTED([VM_X11DIR], "${x_libraries}", [X11 libraries])
--    AC_SEARCH_LIBS([XShmAttach],[Xext])
-+    PKG_CHECK_MODULES([xext], [xext])
-+
+-    AC_SEARCH_LIBS([XShmAttach],[Xext], [
++    PKG_CHECK_MODULES([xext], [xext], [
+       AC_DEFINE([HAVE_LIBXEXT], [1], [Have Xext library])
+     ])
      if test "$have_gl" = ""; then have_gl="no"; fi
      if test "$have_gl" = "yes"; then
--        AC_CHECK_HEADERS([GL/gl.h gl/gl.h gl.h], [
--          have_gl=yes
--          AC_DEFINE([USE_X11_GLX], [1], [Use X11 GLX])
--          AC_SEARCH_LIBS([glIsEnabled],[GL])
--          break
--        ])
-+      PKG_CHECK_MODULES([gl], [gl], [
-+        AC_CHECK_HEADERS([GL/gl.h gl/gl.h gl.h])
-+        have_gl=yes
-+        AC_DEFINE([USE_X11_GLX], [1], [Use X11 GLX])
-+        break
-+      ])
-     else
-         AC_DEFINE([USE_X11_GLX], [0], [Use X11 GLX])
-     fi
-@@ -77,9 +78,10 @@ X_INCLUDES=${INCLUDES}
+       AC_CHECK_HEADERS([GL/gl.h gl/gl.h gl.h], [
+-        AC_SEARCH_LIBS([glIsEnabled],[GL], [
++        PKG_CHECK_MODULES([gl], [gl], [
+           have_gl=yes 
+           AC_DEFINE([USE_X11_GLX], [1], [Use X11 GLX])
+           break
+@@ -88,9 +88,10 @@ X_INCLUDES=${INCLUDES}
  AC_SUBST(X_INCLUDES)
  
  LIBS=${VMLIBS}
diff --git a/squeak5-vm/patches/patch-platforms_unix_vm_include__ucontext.h b/squeak5-vm/patches/patch-platforms_unix_vm_include__ucontext.h
index 6f86fc8ccc..d474ee9435 100644
--- a/squeak5-vm/patches/patch-platforms_unix_vm_include__ucontext.h
+++ b/squeak5-vm/patches/patch-platforms_unix_vm_include__ucontext.h
@@ -1,13 +1,15 @@
 $NetBSD$
 
---- platforms/unix/vm/include_ucontext.h.orig	2018-10-19 04:12:21.000000000 +0000
+--- platforms/unix/vm/include_ucontext.h.orig	2022-06-02 14:10:44.000000000 +0000
 +++ platforms/unix/vm/include_ucontext.h
-@@ -46,6 +46,8 @@
- # define _PC_IN_UCONTEXT uc_mcontext.mc_eip
- #elif __FreeBSD__ && __amd64__
+@@ -93,6 +93,10 @@
  # define _PC_IN_UCONTEXT uc_mcontext.mc_rip
+ # define _FP_IN_UCONTEXT uc_mcontext.mc_rbp
+ # define _SP_IN_UCONTEXT uc_mcontext.mc_rsp
 +#elif __NetBSD__ && __amd64__
 +# define _PC_IN_UCONTEXT uc_mcontext.__gregs[_REG_RIP]
++# define _FP_IN_UCONTEXT uc_mcontext.__gregs[_REG_RBP]
++# define _SP_IN_UCONTEXT uc_mcontext.__gregs[_REG_RSP]
  #elif __OpenBSD__ && __i386__
  # define _PC_IN_UCONTEXT sc_eip
- #elif __OpenBSD__ && __amd64__
+ # define _FP_IN_UCONTEXT sc_ebp
diff --git a/squeak5-vm/patches/patch-platforms_unix_vm_sqUnixMain.c b/squeak5-vm/patches/patch-platforms_unix_vm_sqUnixMain.c
index 0983daf0dd..13ce2ececd 100644
--- a/squeak5-vm/patches/patch-platforms_unix_vm_sqUnixMain.c
+++ b/squeak5-vm/patches/patch-platforms_unix_vm_sqUnixMain.c
@@ -1,21 +1,11 @@
 $NetBSD$
 
---- platforms/unix/vm/sqUnixMain.c.orig	2020-03-02 17:30:55.000000000 +0000
+--- platforms/unix/vm/sqUnixMain.c.orig	2022-06-02 14:10:44.000000000 +0000
 +++ platforms/unix/vm/sqUnixMain.c
-@@ -933,6 +933,9 @@ reportStackState(char *msg, char *date, 
- # elif __FreeBSD__ && __amd64__
- 			void *fp = (void *)(uap ? uap->uc_mcontext.mc_rbp : 0);
- 			void *sp = (void *)(uap ? uap->uc_mcontext.mc_rsp : 0);
-+# elif __NetBSD__ && __x86_64__
-+			void *fp = (void *)(uap ? _UC_MACHINE_FP(uap) : 0);
-+			void *sp = (void *)(uap ? _UC_MACHINE_SP(uap) : 0);
- # elif __OpenBSD__ && __i386__
- 			void *fp = (void *)(uap ? uap->sc_ebp : 0);
- 			void *sp = (void *)(uap ? uap->sc_esp : 0);
-@@ -1008,6 +1011,19 @@ printRegisterState(ucontext_t *uap)
- 			regs->mc_edi, regs->mc_edi, regs->mc_ebp, regs->mc_esp,
- 			regs->mc_eip);
- 	return regs->mc_eip;
+@@ -999,6 +999,19 @@ printRegisterState(FILE *file,ucontext_t
+ 			v(regs[REG_R12]),v(regs[REG_R13]),v(regs[REG_R14]),v(regs[REG_R15]),
+ 			v(regs[REG_RIP]));
+ 	return v(regs[REG_RIP]);
 +#elif __NetBSD__ && __x86_64__
 +	__greg_t *regs = &uap->uc_mcontext.__gregs;
 +	printf(	"\trax 0x%08lx rbx 0x%08lx rcx 0x%08lx rdx 0x%08lx\n"
@@ -29,6 +19,6 @@ $NetBSD$
 +			regs[_REG_R12], regs[_REG_R13], regs[_REG_R14], regs[_REG_R15],
 +			regs[_REG_RIP]);
 +	return (void *)regs[_REG_RIP];
- #elif __linux__ && __x86_64__
- 	greg_t *regs = (greg_t *)&uap->uc_mcontext.gregs;
- 	printf(	"\trax 0x%08lx rbx 0x%08lx rcx 0x%08lx rdx 0x%08lx\n"
+ # elif __OpenBSD__ && __x86_64__
+ 	fprintf(file,
+ 			"    rax %14p rbx %14p rcx %14p rdx %14p\n"
diff --git a/squeak5-vm/patches/patch-spur64src_vm_cogitX64SysV.c b/squeak5-vm/patches/patch-spur64src_vm_cogitX64SysV.c
deleted file mode 100644
index 5ceb7568a6..0000000000
--- a/squeak5-vm/patches/patch-spur64src_vm_cogitX64SysV.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- spur64src/vm/cogitX64SysV.c.orig	2021-02-18 16:42:20.999184653 +0000
-+++ spur64src/vm/cogitX64SysV.c
-@@ -22288,9 +22288,7 @@ dispatchConcretize(AbstractInstruction *
- 			((self_in_dispatchConcretize->operands))[2] = 0;
- 			return savedSize1;
- 		}
--		if ((reg20 == RAX)
--		 || ((reg20 == RBP)
--		 || (reg20 == RSP))) {
-+		if (reg20 == RAX) {
- 			offset38 = 0;
- 		}
- 		else {
diff --git a/squeak5-vm/patches/patch-src_spur64.cog_cogitX64SysV.c b/squeak5-vm/patches/patch-src_spur64.cog_cogitX64SysV.c
new file mode 100644
index 0000000000..5669fe0be8
--- /dev/null
+++ b/squeak5-vm/patches/patch-src_spur64.cog_cogitX64SysV.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/spur64.cog/cogitX64SysV.c.orig	2022-06-02 14:10:44.000000000 +0000
++++ src/spur64.cog/cogitX64SysV.c
+@@ -22979,9 +22979,7 @@ dispatchConcretize(AbstractInstruction *
+ 			((self_in_dispatchConcretize->operands))[2] = 0;
+ 			return savedSize1;
+ 		}
+-		if ((reg20 == RAX)
+-		 || ((reg20 == RBP)
+-		 || (reg20 == RSP))) {
++		if (reg20 == RAX) {
+ 			offset38 = 0;
+ 		}
+ 		else {
Prev by Date: squeak6: Import squeak6.0 as wip/squeak6
Next by Date: Update Qt6 to version 6.3.1
Previous by Thread: squeak6: Import squeak6.0 as wip/squeak6
Next by Thread: Update Qt6 to version 6.3.1
Indexes:
Home | Main Index | Thread Index | Old Index