bug#46964: [ELPA]: [PATCH] Replace modus-*-theme with modus-themes from :core

[Protesilaos Stavrou <info@protesilaos.com>]

[-- Attachment #1: Type: text/plain, Size: 2227 bytes --]

On 2021-03-17, 09:04 +0200, Protesilaos Stavrou <info@protesilaos.com> wrote:

> On 2021-03-13, 12:10 -0500, Stefan Monnier <monnier@iro.umontreal.ca> 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:
<https://protesilaos.com/codelog/2021-03-17-modus-themes-packaging-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

[-- Attachment #2: modus-operandi-theme.el --]
[-- Type: text/plain, Size: 2011 bytes --]

;;; modus-operandi-theme.el --- Accessible light theme (WCAG AAA) -*- lexical-binding:t -*-

;; Copyright (c) 2019-2021  Free Software Foundation, Inc.

;; Author: Protesilaos Stavrou <info@protesilaos.com>
;; 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 <https://www.gnu.org/licenses/>.

;;; 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:
;; <https://lists.gnu.org/archive/html/emacs-devel/2021-03/msg00300.html>.
;;
;; The web page of the change log is also available:
;; <https://protesilaos.com/modus-themes-changelog/>.
;;
;; An Info manual should be distributed with the Modus themes.
;; Evaluate this form to access it directly:
;;
;;    (info "(modus-themes) Top")

;;; Code:

\f

(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