From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.devel Subject: Re: Request to add Package to GNU ELPA Date: Thu, 06 Apr 2023 15:46:11 +0000 Message-ID: <87pm8hf1z0.fsf@posteo.net> References: <87tty24ap2.fsf@bernoul.li> <87wn2y5em5.fsf@posteo.net> <87r0t44zbx.fsf@bernoul.li> <87sfde7lh4.fsf@posteo.net> <87lej6ju1m.fsf@bernoul.li> <875yaayyly.fsf@posteo.net> <87bkk2xcjz.fsf@posteo.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="582"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org, Stefan Monnier To: Jonas Bernoulli Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Apr 06 17:46:58 2023 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pkRpB-000AS2-K9 for ged-emacs-devel@m.gmane-mx.org; Thu, 06 Apr 2023 17:46:57 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pkRoA-0006l8-9o; Thu, 06 Apr 2023 11:45:54 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pkRo9-0006kk-3O for emacs-devel@gnu.org; Thu, 06 Apr 2023 11:45:53 -0400 Original-Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pkRo3-0007x9-1T for emacs-devel@gnu.org; Thu, 06 Apr 2023 11:45:52 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 6211C240358 for ; Thu, 6 Apr 2023 17:45:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1680795944; bh=PMvruDFuBcFqMC0SBsyTsINFusJ7mO6Pb6XBpjpjr2E=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=piO/haKcfAlJ7J81woyOaHMoT8DlVnL720LMV5Nuv9UAcMlVj6B6g8lduEIohIYcK Ifvmt0PY2uLxrZNW5/avWSGMf77E8XcNZ/ZJdaob7DxwJt52H9cbU/3WfH2w3ZgG+z uUnxJa+j8wfKH5kGkdmfvsJBtFBaedfRloXV5uf3wiWzmYlZ/0BWD+q+HOyY6QeFlc Ei4+F52XTYWvqxHgVzKkrQbMHXmvWQWNNu/rjcTwGCgIwtGcOk0w6nK9c0sSwoOhcM VwYKtLHicOxQeXEEOfzxM4Chgzu41STt+rVqrDzd+e1raCz2CcvXykuJv4RTW8F6/+ jAv5AYwCIjwJw== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Psm6v5NZPz6tmv; Thu, 6 Apr 2023 17:45:43 +0200 (CEST) In-Reply-To: <87bkk2xcjz.fsf@posteo.net> (Philip Kaludercic's message of "Wed, 05 Apr 2023 21:08:00 +0000") Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM Received-SPF: pass client-ip=185.67.36.65; envelope-from=philipk@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:305145 Archived-At: --=-=-= Content-Type: text/plain Philip Kaludercic writes: > Philip Kaludercic writes: > >> 1. Update package.el to be published on ELPA > > It might be that this would be enough to publish package.el with support > back to 27.1, with the help of Compat: Stefan fell out of the CCs, so I've added him again since I am most interested in what he thinks of these changes, added here again as a patch: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Prepare-package.el-to-be-published-on-GNU-ELPA.patch >From 1fcf56725848984ef6da50ef2b7a130e1ffd3282 Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Wed, 5 Apr 2023 23:16:39 +0200 Subject: [PATCH] Prepare package.el to be published on GNU ELPA * lisp/emacs-lisp/package.el: Add Compat as a dependency. (package--native-compile-async): Check if 'native-comp-available-p' is bound. (lm-homepage, lm-website): Use backwards-compatible alias 'lm-homepage'. (package-buffer-info): Call 'lm-maintainer' if 'lm-maintainers' is not defined. (describe-package-1): Avoid using 'make-separator-line' if not bound. (package-report-bug): Expand 'custom--standard-value' definition. Check out these discussions for more context: https://lists.gnu.org/archive/html/emacs-devel/2023-03/msg00995.html. --- lisp/emacs-lisp/package.el | 39 +++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 0258ed52bee..6b68c84a211 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -5,9 +5,12 @@ ;; Author: Tom Tromey ;; Daniel Hackney ;; Created: 10 Mar 2007 -;; Version: 1.1.0 +;; Version: 1.1.1 ;; Keywords: tools -;; Package-Requires: ((tabulated-list "1.0")) +;; Package-Requires: ((emacs "26.1") (compat "29.1.0.0")) + +;; This is a GNU ELPA :core package. Avoid functionality that is not +;; compatible with the version of Emacs recorded above. ;; This file is part of GNU Emacs. @@ -147,6 +150,7 @@ (eval-when-compile (require 'subr-x)) (eval-when-compile (require 'epg)) ;For setf accessors. (eval-when-compile (require 'inline)) ;For `define-inline' +(require 'compat nil 'noerror) (require 'seq) (require 'tabulated-list) @@ -1124,7 +1128,8 @@ package--native-compile-async "Native compile installed package PKG-DESC asynchronously. This assumes that `pkg-desc' has already been activated with `package-activate-1'." - (when (native-comp-available-p) + (when (and (fboundp 'native-comp-available-p) + (native-comp-available-p)) (let ((warning-minimum-level :error)) (native-compile-async (package-desc-dir pkg-desc) t)))) @@ -1160,9 +1165,10 @@ package--prepare-dependencies (declare-function lm-header "lisp-mnt" (header)) (declare-function lm-header-multiline "lisp-mnt" (header)) -(declare-function lm-website "lisp-mnt" (&optional file)) +(declare-function lm-homepage "lisp-mnt" (&optional file)) (declare-function lm-keywords-list "lisp-mnt" (&optional file)) (declare-function lm-maintainers "lisp-mnt" (&optional file)) +(declare-function lm-maintainer "lisp-mnt" (&optional file)) (declare-function lm-authors "lisp-mnt" (&optional file)) (defun package-buffer-info () @@ -1195,7 +1201,7 @@ package-buffer-info (or (lm-header "package-version") (lm-header "version"))) (pkg-version (package-strip-rcs-id version-info)) (keywords (lm-keywords-list)) - (website (lm-website))) + (website (lm-homepage))) (unless pkg-version (if version-info (error "Unrecognized package version: %s" version-info) @@ -1208,10 +1214,13 @@ package-buffer-info :kind 'single :url website :keywords keywords - :maintainer + :maintainer (lm-maintainer) ;; For backward compatibility, use a single string if there's only ;; one maintainer (the most common case). - (let ((maints (lm-maintainers))) (if (cdr maints) maints (car maints))) + (if (fboundp 'lm-maintainers) + (let ((maints (lm-maintainers))) + (if (cdr maints) maints (car maints))) + (lm-maintainer)) :authors (lm-authors))))) (defun package--read-pkg-desc (kind) @@ -2302,8 +2311,6 @@ package-strip-rcs-id ;; to make sure we use a "canonical name"! (if l (package-version-join l))))) -(declare-function lm-website "lisp-mnt" (&optional file)) - ;;;###autoload (defun package-install-from-buffer () "Install a package from the current buffer. @@ -2902,8 +2909,11 @@ describe-package-1 ;; Insert news if available. (when news - (insert "\n" (make-separator-line) "\n" - (propertize "* News" 'face 'package-help-section-name) + (newline) + (when (fboundp 'make-separator-line) + (insert (make-separator-line)) + (newline)) + (insert (propertize "* News" 'face 'package-help-section-name) "\n\n") (insert-file-contents news)) @@ -4571,8 +4581,11 @@ package-report-bug (dolist (ent (get (cdr group) 'custom-group)) (when (and (custom-variable-p (car ent)) (boundp (car ent)) - (not (eq (custom--standard-value (car ent)) - (default-toplevel-value (car ent)))) + (not (eq + ;; We are not using `custom--standard-value' + ;; to retain compatibility for Emacs 27. + (eval (car (get (car ent) 'standard-value)) t) + (default-toplevel-value (car ent)))) (file-in-directory-p (car group) (package-desc-dir desc))) (push (car ent) vars)))) (dlet ((reporter-prompt-for-summary-p t)) -- 2.39.2 --=-=-= Content-Type: text/plain elpa-admin.el appears to be handling the changes well, I'll still have to try and install it on an older Emacs to see if everything works as expected. --=-=-=--