From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Protesilaos Stavrou Newsgroups: gmane.emacs.bugs Subject: bug#46964: [ELPA]: [PATCH] Replace modus-*-theme with modus-themes from :core Date: Thu, 18 Mar 2021 09:55:17 +0200 Message-ID: <87eegcaobe.fsf@protesilaos.com> References: <87y2f0fq8v.fsf@protesilaos.com> <87sg58tkg7.fsf@tcd.ie> <87h7lofe6b.fsf@protesilaos.com> <87mtvfpgf2.fsf@protesilaos.com> <878s6wqq40.fsf@tcd.ie> <874khk6t7d.fsf@protesilaos.com> <87mtvb1s3r.fsf@protesilaos.com> <871rcmojgc.fsf@protesilaos.com> <87eegep8ga.fsf@protesilaos.com> 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="32726"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: "Basil L. Contovounesios" , 46964@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Mar 18 08:56:11 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1lMnVp-0008Nc-Vi for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 18 Mar 2021 08:56:10 +0100 Original-Received: from localhost ([::1]:43904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMnVp-0000pu-1l for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 18 Mar 2021 03:56:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:48422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMnVi-0000pk-08 for bug-gnu-emacs@gnu.org; Thu, 18 Mar 2021 03:56:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:33366) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lMnVh-0007Ot-PK for bug-gnu-emacs@gnu.org; Thu, 18 Mar 2021 03:56:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lMnVh-0001Qp-O5 for bug-gnu-emacs@gnu.org; Thu, 18 Mar 2021 03:56:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Protesilaos Stavrou Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 18 Mar 2021 07:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46964 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 46964-submit@debbugs.gnu.org id=B46964.16160541325467 (code B ref 46964); Thu, 18 Mar 2021 07:56:01 +0000 Original-Received: (at 46964) by debbugs.gnu.org; 18 Mar 2021 07:55:32 +0000 Original-Received: from localhost ([127.0.0.1]:44912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lMnVD-0001Q6-RP for submit@debbugs.gnu.org; Thu, 18 Mar 2021 03:55:32 -0400 Original-Received: from relay8-d.mail.gandi.net ([217.70.183.201]:43731) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lMnVB-0001Pp-01 for 46964@debbugs.gnu.org; Thu, 18 Mar 2021 03:55:29 -0400 X-Originating-IP: 94.46.225.161 Original-Received: from kronos (unknown [94.46.225.161]) (Authenticated sender: public@protesilaos.com) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 750991BF203; Thu, 18 Mar 2021 07:55:20 +0000 (UTC) In-Reply-To: <87eegep8ga.fsf@protesilaos.com> (Protesilaos Stavrou's message of "Wed, 17 Mar 2021 09:04:21 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:202573 Archived-At: --=-=-= Content-Type: text/plain On 2021-03-17, 09:04 +0200, Protesilaos Stavrou wrote: > On 2021-03-13, 12:10 -0500, Stefan Monnier wrote: > >>> I suggest a 3 step process: >>> >>> 1- Add the new `modus-themes` GNU ELPA package. >> >> Done. > > I can confirm as much. Thank you! My plan now is to produce a patch > for replacing the old packages with the new one. I will post here once > I am done. I made the necessary changes to the old files, based on what Basil had shared earlier. I attach modus-operandi, while the same has been done for modus-vivendi. You can retrieve those from the following branches: * https://gitlab.com/protesilaos/modus-themes/-/tree/elpa/modus-operandi-theme * https://gitlab.com/protesilaos/modus-themes/-/tree/elpa/modus-vivendi-theme Then I applied the following change to elpa.git: elpa-packages | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/elpa-packages b/elpa-packages index 98bf5a7f4d..0dbd7187ae 100644 --- a/elpa-packages +++ b/elpa-packages @@ -213,8 +213,8 @@ ("mmm-mode" :url "https://github.com/purcell/mmm-mode.git" :auto-sync t) - ("modus-operandi-theme":url "https://gitlab.com/protesilaos/modus-themes") - ("modus-vivendi-theme" :url "https://gitlab.com/protesilaos/modus-themes") + ("modus-operandi-theme":url "https://gitlab.com/protesilaos/modus-themes" :branch "elpa/modus-operandi-theme") + ("modus-vivendi-theme" :url "https://gitlab.com/protesilaos/modus-themes" :branch "elpa/modus-vivendi-theme") ("modus-themes" :core ("etc/themes/modus-themes.el" "etc/themes/modus-operandi-theme.el" "etc/themes/modus-vivendi-theme.el" To make elpa.git's "make" commands work, I had to explicitly change branch to point at my remote. Anyhow, the new tarball installs properly. So unless I have missed something, this should be okay now. In the meantime, I published an announcement regarding the changes: . I will update it once we are done with this point. Hopefully this should be enough. Thanks again for your time and efforts! -- Protesilaos Stavrou protesilaos.com --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=modus-operandi-theme.el ;;; modus-operandi-theme.el --- Accessible light theme (WCAG AAA) -*- lexical-binding:t -*- ;; Copyright (c) 2019-2021 Free Software Foundation, Inc. ;; Author: Protesilaos Stavrou ;; URL: https://gitlab.com/protesilaos/modus-themes ;; Version: 0.13.1 ;; Package-Requires: ((emacs "26.1") (modus-themes "1.2.4")) ;; Keywords: faces, theme, accessibility ;; This file is NOT part of GNU Emacs. ;; This program is free software; you can redistribute it and/or ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; ;; This program is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License ;; along with this program. If not, see . ;;; Commentary: ;; ;; This package is obsolete. It has been replaced by `modus-themes', ;; which includes the modus-operandi and modus-vivendi themes. ;; ;; Users updating to the new `modus-themes' package, are advised to read ;; the anouncement on the emacs-devel mailing list: ;; . ;; ;; The web page of the change log is also available: ;; . ;; ;; An Info manual should be distributed with the Modus themes. ;; Evaluate this form to access it directly: ;; ;; (info "(modus-themes) Top") ;;; Code: (require 'modus-themes) (eval-and-compile (let ((msg "Package `modus-operandi-theme' is obsolete; use the new `modus-themes'")) (if (and noninteractive (fboundp 'byte-compile-warn)) (byte-compile-warn msg) (message "%s" msg)))) (provide 'modus-operandi-theme) ;;; modus-operandi-theme.el ends here --=-=-=--