Index | Thread | Search

From:
Kirill A. Korinsky <kirill@korins.ky>
Subject:
Re: stumpwm: avoid remove .fasl after udpate
To:
Timo Myyrä <timo.myyra@bittivirhe.fi>, OpenBSD ports <ports@openbsd.org>, izder456 <izder456@disroot.org>, Klemens Nanni <kn@openbsd.org>
Date:
Sat, 02 Nov 2024 21:48:18 +0100

Download raw body.

Thread
This is friendly reminder about this diff.

ok?

On Sat, 19 Oct 2024 16:08:37 +0200,
Kirill A. Korinsky <kirill@korins.ky> wrote:
>
> On Wed, 09 Oct 2024 06:14:54 +0200,
> Timo Myyrä <timo.myyra@bittivirhe.fi> wrote:
> >
> >
> > The code looks ok, I haven't tested it. But let's wait a bit to see how
> > upstream will handle the issue before patching the port.
> >
>
> Upstream had merged this patch with fixing typos in comments
> https://github.com/stumpwm/stumpwm/commit/20d839f2ddfdfd25a8460152bc5dc45a9354e773
>

Index: Makefile
===================================================================
RCS file: /home/cvs/ports/x11/stumpwm/Makefile,v
diff -u -p -r1.24 Makefile
--- Makefile	1 Nov 2024 07:34:51 -0000	1.24
+++ Makefile	2 Nov 2024 20:47:35 -0000
@@ -2,7 +2,7 @@ COMMENT=		easily hackable Common LISP wi
 
 VERSION=		23.11
 DISTNAME=		stumpwm-${VERSION}
-REVISION=		8
+REVISION=		9
 
 CATEGORIES=		x11
 
Index: patches/patch-make-image_lisp_in
===================================================================
RCS file: /home/cvs/ports/x11/stumpwm/patches/patch-make-image_lisp_in,v
diff -u -p -r1.1 patch-make-image_lisp_in
--- patches/patch-make-image_lisp_in	18 Feb 2024 07:46:17 -0000	1.1
+++ patches/patch-make-image_lisp_in	19 Oct 2024 14:17:57 -0000
@@ -7,3 +7,22 @@ Index: make-image.lisp.in
  (in-package #:cl-user)
  
  (let* ((expected-warnings
+@@ -48,7 +50,17 @@
+     (uiop:symbol-call '#:asdf '#:register-immutable-system system-name)))
+ 
+ (sb-ext:save-lisp-and-die "stumpwm" :toplevel (lambda ()
+-                                                ;; asdf requires sbcl_home to be set, so set it to the value when the image was built
++                                                ;; stumpwm might be built in a fake enviroment, so use uiop:restore-image
++                                                ;; to compute the real uiop:*user-cache* for that user
++                                                (uiop:restore-image)
++                                                ;; and clean the asdf configuration to avoid some cached paths as well
++                                                (asdf:clear-configuration)
++                                                (asdf:clear-output-translations)
++                                                (asdf:initialize-output-translations
++                                                 '(:output-translations
++                                                   :enable-user-cache
++                                                   :ignore-inherited-configuration))
++                                                ;; asdf requires SBCL_HOME to be set, so set it to the value when the image was built
+                                                 (alexandria:when-let ((home #.(sb-ext:posix-getenv "SBCL_HOME")))
+                                                   (sb-posix:putenv (format nil "SBCL_HOME=~A" home)))
+                                                 (stumpwm:stumpwm)


--
wbr, Kirill