On Fri, Nov 29 2024, Kirill A. Korinsky wrote: > ports@, Timo, > > I'd like to update x11/stumpwm to 24.11 which was released a few hours ago. > > Old patches was merged and we don't need it anymore, but new one is > required for our build which was backported to usptream as usual. > > Thus, if you use stumpish from stumpwm-contrib, the last updated brokes it > on OpenBSD and here the fix: > https://github.com/stumpwm/stumpwm-contrib/pull/298 > > Changelog: https://github.com/stumpwm/stumpwm/releases/tag/24.11 > > Tested on -current/amd64. > > Feedback? Ok? > > Index: Makefile > =================================================================== > RCS file: /home/cvs/ports/x11/stumpwm/Makefile,v > diff -u -p -r1.25 Makefile > --- Makefile 3 Nov 2024 00:40:12 -0000 1.25 > +++ Makefile 29 Nov 2024 18:31:22 -0000 > @@ -1,8 +1,7 @@ > COMMENT= easily hackable Common LISP window manager > > -VERSION= 23.11 > +VERSION= 24.11 > DISTNAME= stumpwm-${VERSION} > -REVISION= 9 > > CATEGORIES= x11 > > Index: distinfo > =================================================================== > RCS file: /home/cvs/ports/x11/stumpwm/distinfo,v > diff -u -p -r1.9 distinfo > --- distinfo 31 Jul 2024 08:47:49 -0000 1.9 > +++ distinfo 29 Nov 2024 18:31:24 -0000 > @@ -1,8 +1,8 @@ > SHA256 (alexandria-20220707-git.tgz) = > jmFzEg3oeGx64P77qBAtgmIPrELpqt6VSvkTXghw1rE= > SHA256 (cl-ppcre-2.1.1.tar.gz) = iWMRebcWSNnmxWWpKPaJap1XQqogg7nBtwX+C0XYXe8= > SHA256 (clx-0.7.6.tar.gz) = vMnNc25+KOwrgIXOHJaG4C/77pJX4QcvXE/Dk+M0Z+g= > -SHA256 (stumpwm-23.11.tar.gz) = AeX6TsZGa41YF9gQXkH58WKOiYyHcLvrY3f62yPuSBc= > +SHA256 (stumpwm-24.11.tar.gz) = Hype3zDciJcjSEVRTqknR4ZFz4+2sFubp/56iYcg4I0= > SIZE (alexandria-20220707-git.tgz) = 56838 > SIZE (cl-ppcre-2.1.1.tar.gz) = 159055 > SIZE (clx-0.7.6.tar.gz) = 462763 > -SIZE (stumpwm-23.11.tar.gz) = 287178 > +SIZE (stumpwm-24.11.tar.gz) = 287797 > Index: patches/patch-load-stumpwm_lisp_in > =================================================================== > RCS file: patches/patch-load-stumpwm_lisp_in > diff -N patches/patch-load-stumpwm_lisp_in > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-load-stumpwm_lisp_in 29 Nov 2024 19:33:59 -0000 > @@ -0,0 +1,16 @@ > +https://github.com/stumpwm/stumpwm/pull/1218 > + > +Index: load-stumpwm.lisp.in > +--- load-stumpwm.lisp.in.orig > ++++ load-stumpwm.lisp.in > +@@ -5,5 +5,9 @@ > + > + (require 'asdf) > + > +-(asdf:load-asd #p"@STUMPWM_ASDF_DIR@/stumpwm.asd") > ++(asdf:initialize-source-registry > ++ '(:source-registry > ++ (:directory "@STUMPWM_ASDF_DIR@") > ++ :inherit-configuration)) > ++ > + (asdf:load-system "stumpwm") > Index: patches/patch-make-image_lisp_in > =================================================================== > RCS file: patches/patch-make-image_lisp_in > diff -N patches/patch-make-image_lisp_in > --- patches/patch-make-image_lisp_in 3 Nov 2024 00:40:12 -0000 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,34 +0,0 @@ > -Contains: > - - > https://github.com/stumpwm/stumpwm/commit/20d839f2ddfdfd25a8460152bc5dc45a9354e773 > - - > https://github.com/stumpwm/stumpwm/commit/f271a45e05fb25d70cdd4c12717d908fd9e27dee > - > -Should be removed at the next release > - > -Index: make-image.lisp.in > ---- make-image.lisp.in.orig > -+++ make-image.lisp.in > -@@ -1,3 +1,5 @@ > -+(require :uiop) > -+ > - (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)
Yeah, ok by me. Timo
