unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Michael Rohleder <mike@rohleder.de>
To: Brett Gilio <brettg@gnu.org>
Cc: Tobias Geerinckx-Rice <me@tobias.gr>, 43096@debbugs.gnu.org
Subject: [bug#43096] [PATCH] gnu: emacs-erc-status-sidebar: Update to 0.1-2.b589b742.
Date: Sun, 30 Aug 2020 03:29:48 +0200	[thread overview]
Message-ID: <87y2lw3oqb.fsf@rohleder.de> (raw)
In-Reply-To: <87sgc65i01.fsf@gnu.org> (Brett Gilio's message of "Fri, 28 Aug 2020 20:59:58 -0500")


[-- Attachment #1.1: Type: text/plain, Size: 704 bytes --]

Hey Brett, hey Tobias,

Brett Gilio <brettg@gnu.org> writes:
>> It's kind of a weird case where it is both? The LICENSE file has always
>> been GPL3, but the code header erroneously stated it as expat-style.
>>
>> https://github.com/drewbarbs/erc-status-sidebar/commit/b589b74245591257c9e666bd5cd25812e04b7a34
>>
>> I kind of lean on the side of a separate patch since the license never
>> really changed, but was an error both upstream and on our end as well.
>>
>> Brett Gilio
>
> Actually, the change of commits may not be necessary at all. There is no
> code changes between the commits, and the license file is intact.
>

Ok, here are 2 patches, one for the license and one for removing
emacs-seq:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: Fix license. --]
[-- Type: text/x-patch, Size: 959 bytes --]

From 340699d5ceb2db40824a403399556536f2e07e23 Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike@rohleder.de>
Date: Sun, 30 Aug 2020 02:48:32 +0200
Subject: [PATCH] gnu: emacs-erc-status-sidebar: Correct license.

* gnu/packages/emacs-xyz.scm (emacs-erc-status-sidebar)[license]: Set to GPL3+.
---
 gnu/packages/emacs-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ff789ffedf..9975fc8366 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3509,7 +3509,7 @@ IRC bouncer with ERC.")
 ERC, an Emacs client for IRC (Internet Relay Chat).  It relies on the
 @code{erc-track} module, and displays all the same information
 @code{erc-track} does in the mode line, but in an alternative format.")
-      (license license:expat))))
+      (license license:gpl3+))))
 
 (define-public emacs-shut-up
   (package
-- 
2.28.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: Fix for emacs27. --]
[-- Type: text/x-patch, Size: 1205 bytes --]

From 028021a0654c3a82d951ec991d63d392c421324d Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike@rohleder.de>
Date: Sun, 30 Aug 2020 03:03:48 +0200
Subject: [PATCH] gnu: emacs-erc-status-sidebar: Fix for emacs27.

* gnu/packages/emacs-xyz.scm (emacs-erc-status-sidebar)[propagated-inputs]: remove emacs-seq.

This package works well with the seq library that is provided with emacs.
Current emacs-seq (0.20) is broken for emacs27. A fix seems on it's
way: https://lists.gnu.org/archive/html/emacs-devel/2020-08/msg00996.html
---
 gnu/packages/emacs-xyz.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 9975fc8366..a2427112aa 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3501,7 +3501,6 @@ IRC bouncer with ERC.")
          (sha256
           (base32 "1hwlhzgx03z8891sblz56zdp8zj0izh72kxykgcnz5rrkyc3vfi3"))))
       (build-system emacs-build-system)
-      (propagated-inputs `(("emacs-seq" ,emacs-seq)))
       (home-page "https://github.com/drewbarbs/erc-status-sidebar")
       (synopsis "Hexchat-like activity overview for ERC channels")
       (description
-- 
2.28.0


[-- Attachment #1.4: Type: text/plain, Size: 149 bytes --]


-- 
"How should I know if it works? That's what beta testers are for. I only
coded it."
(Attributed to Linus Torvalds, somewhere in a posting)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]

  reply	other threads:[~2020-08-30  1:31 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-29  1:11 [bug#43096] [PATCH] gnu: emacs-erc-status-sidebar: Update to 0.1-2.b589b742 Michael Rohleder
2020-08-29  1:45 ` Brett Gilio
2020-08-29  1:51   ` Tobias Geerinckx-Rice via Guix-patches via
2020-08-29  1:58     ` Brett Gilio
2020-08-29  1:59       ` Brett Gilio
2020-08-30  1:29         ` Michael Rohleder [this message]
2020-12-18 13:18           ` bug#43096: " Ludovic Courtès
2020-08-30  9:22 ` [bug#43096] " Nicolas Goaziou
2020-09-01  3:48   ` Michael Rohleder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87y2lw3oqb.fsf@rohleder.de \
    --to=mike@rohleder.de \
    --cc=43096@debbugs.gnu.org \
    --cc=brettg@gnu.org \
    --cc=me@tobias.gr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).