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: Sun, 09 Apr 2023 17:27:28 +0000 Message-ID: <873559q83j.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> <87pm8hf1z0.fsf@posteo.net> <87y1n417hl.fsf@posteo.net> <877cumaijd.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="5685"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Jonas Bernoulli , emacs-devel@gnu.org, Eli Zaretskii To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Apr 09 19:28:37 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 1plYqD-0001Jl-DH for ged-emacs-devel@m.gmane-mx.org; Sun, 09 Apr 2023 19:28:37 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1plYpH-0000H6-13; Sun, 09 Apr 2023 13:27:39 -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 1plYpF-0000Gw-7Q for emacs-devel@gnu.org; Sun, 09 Apr 2023 13:27:37 -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 1plYpA-0000NQ-Hu for emacs-devel@gnu.org; Sun, 09 Apr 2023 13:27:34 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 2EBBC240094 for ; Sun, 9 Apr 2023 19:27:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1681061250; bh=QQuIszY0ShDPjr1cbu/GKaLMqbUD1abyj0r7gymIrDI=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=T/1BkdzNLYCKQh7LLyVl10HNzvwCsgKHbA+EBJPyxfNfZAxWrrLyg9/Q8hmNAQfKv m5Nqwy5oL850DVzo+T/+XtG32hxqpG6lyR1hmYADhgmlBq9LFLwmL7mSIFNvG3DAA1 VcVv+DIo64virLcNthUObpm2SvLsjc6TBmRuX/j+0TEfFFlKAyYB9JleNQmAAmTgqy HQUp4XHm9NIJMAwaEMcNg7gQI+/1jOwdqMCY9fHTx1U6n00NkM5ix/0JxgVikEgwfg ncqE4XMdodAurJt6eQoF3V8BGN2TvB4TBQtcWPgkiTA0fGRXTiOhz/PAvDLZKtdgzw L3fvDW3ZHAHGA== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4PvfDx1QL9z9rxD; Sun, 9 Apr 2023 19:27:29 +0200 (CEST) In-Reply-To: (Stefan Monnier's message of "Sun, 09 Apr 2023 11:29:46 -0400") 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=unavailable 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:305209 Archived-At: --=-=-= Content-Type: text/plain Stefan Monnier writes: >> As mentioned in my other message, we are also missing >> `loaddefs-generate'. I am not exactly sure what motivated the change, >> so I don't know if checking the version and doing what was done prior to >> 29 would be enough: > > I'd check (fboundp 'loaddefs-generate) to select between the old and the > new code. Ok, I have modified the patch: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Prepare-package.el-to-be-published-on-GNU-ELPA.patch >From e63ac132cc8d220e642836f8f246d82147793f57 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. For the background and motivation behind these changes, please consult this thread: https://lists.gnu.org/archive/html/emacs-devel/2023-03/msg00995.html. --- lisp/emacs-lisp/package.el | 51 ++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 0258ed52bee..2657a4f98b4 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 "27.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) @@ -1084,16 +1088,20 @@ package-generate-autoloads (autoload-timestamps nil) (backup-inhibited t) (version-control 'never)) - (loaddefs-generate - pkg-dir output-file nil - (prin1-to-string - '(add-to-list - 'load-path - ;; Add the directory that will contain the autoload file to - ;; the load path. We don't hard-code `pkg-dir', to avoid - ;; issues if the package directory is moved around. - (or (and load-file-name (file-name-directory load-file-name)) - (car load-path))))) + (if (fboundp 'loaddefs-generate) + (loaddefs-generate + pkg-dir output-file nil + (prin1-to-string + '(add-to-list + 'load-path + ;; Add the directory that will contain the autoload file to + ;; the load path. We don't hard-code `pkg-dir', to avoid + ;; issues if the package directory is moved around. + (or (and load-file-name (file-name-directory load-file-name)) + (car load-path))))) + (with-suppressed-warnings ((obsolete package-autoload-ensure-default-file)) + (package-autoload-ensure-default-file output-file)) + (make-directory-autoloads pkg-dir output-file)) (let ((buf (find-buffer-visiting output-file))) (when buf (kill-buffer buf))) auto-name)) @@ -1124,7 +1132,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 +1169,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 +1205,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) @@ -1211,7 +1221,10 @@ package-buffer-info :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 +2315,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. @@ -4571,7 +4582,9 @@ 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)) + (not (eq (if (fboundp 'custom--standard-value) + (custom--standard-value (car ent)) + (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)))) -- 2.30.2 --=-=-= Content-Type: text/plain Eli, are you OK with this being done? -- Philip Kaludercic --=-=-=--