From 9ab50a57ac414f6476295fa75563e215d4115ae2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 8 Nov 2025 09:59:34 +0100
Subject: [PATCH] Revert "gnu: squeak-vm: Fix build and modernize definition."
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6ab1890aba1fd9b1f3a2dc46f1d7ec183452617d.

This commit is incomplete as it doesn’t include the introduced patch file.

Change-Id: Ie4ec1a143c256748b09f34f131e78a010443f12c
---
 gnu/local.mk               |  1 -
 gnu/packages/smalltalk.scm | 55 +++++++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index abc28926efee2a547e58c7c01f3907b4d1d139cc..bf605632252d83660b58678b1211b2d6d7e27c6e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2077,7 +2077,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/smalltalk-multiplication-overflow.patch	\
   %D%/packages/patches/soci-mysql-ddl-types.patch		\
   %D%/packages/patches/sqlite-hurd.patch			\
-  %D%/packages/patches/squeak-vm-gcc-14-fix.patch		\
   %D%/packages/patches/stepmania-ffmpeg-compat.patch			\
   %D%/packages/patches/stk-5.0.1-fix-typo.patch			\
   %D%/packages/patches/strace-readlink-tests.patch		\
diff --git a/gnu/packages/smalltalk.scm b/gnu/packages/smalltalk.scm
index b6de66b2d95647fe885b64468cd2e494e5cac77d..f6f22a14a046e4798632d9fe21a2e455f730a4ee 100644
--- a/gnu/packages/smalltalk.scm
+++ b/gnu/packages/smalltalk.scm
@@ -229,9 +229,9 @@ such as ones for networking and GUI programming.")
      (origin
        (method url-fetch)
        (uri (string-append "http://squeakvm.org/unix/release/"
-                           "Squeak-" version "-src-no-mp3.tar.gz"))
+                           "Squeak-" version "-src.tar.gz"))
        (sha256
-        (base32 "01miyjpka9x24xsp4j54mm9zjiaci670sss50qvd94y5q2iq9cx7"))
+        (base32 "0bpwbnpy2sb4gylchfx50sha70z36bwgdxraym4vrr93l8pd3dix"))
        (modules '((guix build utils)))
        (snippet
         ;; Make builds bit-reproducible.
@@ -243,29 +243,8 @@ such as ones for networking and GUI programming.")
               "ux_version = \"GNU\";\n"))
            (substitute* "unix/vm/config.cmake"
              (("\\(VM_BUILD_STRING.*")
-              "(VM_BUILD_STRING \\\"Built with GNU Guix\\\")"))))
-       (patches (search-patches "squeak-vm-gcc-14-fix.patch"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list #:tests? #f                  ;no check target
-           #:configure-flags
-           #~(list (string-append "-DVM_HOST=" #$(nix-system->gnu-triplet
-                                                  (or (%current-target-system)
-                                                      (%current-system))))
-                   (string-append "-DVM_VERSION=" #$version)
-                   "-DCMAKE_VERBOSE_MAKEFILE=ON")
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'unpack 'chdir
-                 (lambda _
-                   (chdir "unix")))
-               (add-after 'chdir 'remove-hardcoded-PATH
-                 (lambda _
-                   ;; Remove hard-coded FHS PATH entries.
-                   (substitute* '("cmake/squeak.in"
-                                  "cmake/squeak.sh.in")
-                     (("^PATH=.*") "")))))))
-    (native-inputs (list pkg-config))
+              "(VM_BUILD_STRING \\\"Built with GNU Guix\\\")"))
+           #t))))
     (inputs
      (list alsa-lib
            dbus
@@ -274,6 +253,32 @@ such as ones for networking and GUI programming.")
            libxrender
            mesa
            pulseaudio))
+    (native-inputs
+     (list pkg-config))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ;no check target
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'remove-hardcoded-PATH
+           (lambda _
+             ;; Remove hard-coded FHS PATH entries.
+             (substitute* '("unix/cmake/squeak.in"
+                            "unix/cmake/squeak.sh.in")
+               (("^PATH=.*") ""))
+             #t))
+         (add-before 'configure 'enter-build-directory
+           (lambda _
+             (mkdir "build")
+             (chdir "build")
+             #t))
+         (replace 'configure
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (invoke "../unix/cmake/configure"
+                       (string-append "--prefix=" out)
+                       "--without-quartz")
+               #t))))))
     (synopsis "Smalltalk programming language and environment")
     (description "Squeak is a full-featured implementation of the Smalltalk
 programming language and environment based on (and largely compatible with)