Attachment 242423 Details for Bug 271652 – Patch

[patch] Patch

0001-editors-sly-Update-to-the-latest-commit-20230523.patch (text/plain), 3.85 KB, created by Olivier Certner on 2023-05-26 13:03:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Certner

Created: 2023-05-26 13:03:00 UTC

Size: 3.85 KB

patch

obsolete

>From 4a1c98c8f654d007d9f2643d3be406408fc615ca Mon Sep 17 00:00:00 2001
>From: Olivier Certner <olce.freebsd@certner.fr>
>Date: Fri, 26 May 2023 14:35:10 +0200
>Subject: [PATCH] editors/sly: Update to the latest commit (20230523)
>
>Since no official version has been released since 1.0.43, update to the latest
>commit (after some tests).  Tweak the version number to avoid bumping PORTEPOCH.
>
>PR:     271652
>---
> editors/sly/Makefile                 |  4 ++--
> editors/sly/distinfo                 |  6 +++---
> editors/sly/files/patch-doc_Makefile | 11 +----------
> editors/sly/files/patch-doc_sly.texi |  4 ++--
> editors/sly/files/patch-sly.el       |  8 ++++----
> 5 files changed, 12 insertions(+), 21 deletions(-)
>
>diff --git a/editors/sly/Makefile b/editors/sly/Makefile
>index d2d4c8b6aa21..d33de1e94981 100644
>--- a/editors/sly/Makefile
>+++ b/editors/sly/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	sly
>-DISTVERSION=	1.0.43
>-PORTREVISION=	8
>+DISTVERSION=	1.0.43-20230523
> CATEGORIES=	editors elisp
> PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
> 
>@@ -13,6 +12,7 @@ LICENSE=	PD
> USES=		emacs gmake
> USE_GITHUB=	yes
> GH_ACCOUNT=	joaotavora
>+GH_TAGNAME=	e6bc13d9f55e3763e6daea527cb88a776c479d8e
> 
> NO_ARCH=	yes
> 
>diff --git a/editors/sly/distinfo b/editors/sly/distinfo
>index 668407632de4..8364d98da01a 100644
>--- a/editors/sly/distinfo
>+++ b/editors/sly/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1613556780
>-SHA256 (joaotavora-sly-1.0.43_GH0.tar.gz) = 84b2d8326a429dcc621022d2ebbde7ed4813594d7445f264cb6ff5bf5f3bf9e9
>-SIZE (joaotavora-sly-1.0.43_GH0.tar.gz) = 1835404
>+TIMESTAMP = 1685093015
>+SHA256 (joaotavora-sly-1.0.43-20230523-e6bc13d9f55e3763e6daea527cb88a776c479d8e_GH0.tar.gz) = 9dcc07863f96ff6d3b9fd8cb329d8155e111a99f56fd3576688cc87a852222b5
>+SIZE (joaotavora-sly-1.0.43-20230523-e6bc13d9f55e3763e6daea527cb88a776c479d8e_GH0.tar.gz) = 1840930
>diff --git a/editors/sly/files/patch-doc_Makefile b/editors/sly/files/patch-doc_Makefile
>index d280eeef6021..f9acd14c51d7 100644
>--- a/editors/sly/files/patch-doc_Makefile
>+++ b/editors/sly/files/patch-doc_Makefile
>@@ -1,14 +1,5 @@
>---- doc/Makefile.orig	2021-01-14 09:12:56 UTC
>+--- doc/Makefile.orig	2023-05-23 12:54:52 UTC
> +++ doc/Makefile
>-@@ -14,7 +14,7 @@ INSTALL_CMD=install -m 644
>- # Info files generated here.
>- infofiles=sly.info
>- 
>--TEXI = sly.texi contributors.texi
>-+TEXI = sly.texi
>- 
>- help:
>- 	@echo -e "\
> @@ -38,7 +38,7 @@ sly.info: $(TEXI)
>  	makeinfo $<
>  
>diff --git a/editors/sly/files/patch-doc_sly.texi b/editors/sly/files/patch-doc_sly.texi
>index 4dce84be1ce8..ba98f728b9d5 100644
>--- a/editors/sly/files/patch-doc_sly.texi
>+++ b/editors/sly/files/patch-doc_sly.texi
>@@ -1,6 +1,6 @@
>---- doc/sly.texi.orig	2021-01-14 09:12:56 UTC
>+--- doc/sly.texi.orig	2023-05-23 12:54:52 UTC
> +++ doc/sly.texi
>-@@ -3157,17 +3157,13 @@ buffer you can enter Lisp expressions and evaluate the
>+@@ -3202,17 +3202,13 @@ buffer you can enter Lisp expressions and evaluate the
>  @unnumberedsec Hackers of the good hack
>  
>  @SLY{} is a fork of SLIME which is itself an Extension
>diff --git a/editors/sly/files/patch-sly.el b/editors/sly/files/patch-sly.el
>index 4f9c8a3cf619..22aa9c81ed7c 100644
>--- a/editors/sly/files/patch-sly.el
>+++ b/editors/sly/files/patch-sly.el
>@@ -1,6 +1,6 @@
>---- sly.el.orig	2021-01-14 09:12:56 UTC
>+--- sly.el.orig	2023-05-23 12:54:52 UTC
> +++ sly.el
>-@@ -7463,22 +7463,30 @@ can be found."
>+@@ -7475,22 +7475,30 @@ can be found."
>  ;;;###autoload
>  (add-hook 'lisp-mode-hook 'sly-editing-mode)
>  
>@@ -33,8 +33,8 @@
>    (dolist (buffer (buffer-list))
>      (with-current-buffer buffer
>        (when (eq major-mode 'lisp-mode)
>--        (sly-editing-mode 1)
>--        (ignore-errors (funcall 'slime-mode -1))))))
>+-        (unless sly-editing-mode (sly-editing-mode 1))
>+-        (ignore-errors (and (featurep 'slime) (funcall 'slime-mode -1)))))))
> - (t
> -  (warn
> -   "`sly.el' loaded OK. To use SLY, customize `lisp-mode-hook' and remove `slime-lisp-mode-hook'.")))
>-- 
>2.40.1
>

Flags:

olce: maintainer-approval+

Actions: View | Diff

Attachments on bug 271652: 242422 | 242423 | 242429 | 242477