diff mbox series

[bug#68556,gnome-team,v3,3/7] gnu: gnome-shell-extension-noannoyance: Switch to fork.

Message ID b1903ed6f3988ce380337298a3af9fd08bf437e2.camel@planete-kraus.eu
State New
Headers show
Series None | expand

Commit Message

Vivien Kraus Jan. 20, 2024, 9:06 a.m. UTC 
Hello!

Le samedi 20 janvier 2024 à 01:40 +0100, Liliana Marie Prikler a
écrit :
> >  (define-public gnome-shell-extension-noannoyance
> >    (let ((revision "1")
> > -        (commit "b759d10fd2799bc084007fdd927b62637c3dbd2c"))
> > +        (commit "5e9e6a1878d2a1d961f5d59505f15339c5b7e17e"))
> Remember to bump the revision.
> >      (package
> > +      ;; This is the “fork” version:
> > +      ;;
> > https://extensions.gnome.org/extension/6109/noannoyance-fork/
> The comment here is not great.  What does "This is the fork version"
> mean when standing alone?  To me, it means absolutely nothing,
> despite
> knowing the context behind.
> 
> Maybe explain "While the original version at <first link> is not
> updated to current gnome, this fork <fork link> supports newer
> versions." or something like that.

The situation is not very easy to explain. I discovered that our commit
is 6 ahead of the commit published as version 17 for NoAnnoyance v2. I
don’t really want to know how it relates to “NoAnnoyance” the original
extension, because it has been forked around 2017 between f21d09a
(“change to GPL v2 license”) and 866084e (“Rewrite”), which may be
something like version 4 in extensions.gnome.org.

In any case, since we are continuing the version number scheme of
NoAnnoyance v2, this is version 17-6. I tried to explain this as
quickly as possible, what do you think?

Best regards,

Vivien

Comments

Liliana Marie Prikler Jan. 20, 2024, 10:11 a.m. UTC | #1 
Am Samstag, dem 20.01.2024 um 10:06 +0100 schrieb Vivien Kraus:
> Hello!
> 
> Le samedi 20 janvier 2024 à 01:40 +0100, Liliana Marie Prikler a
> écrit :
> > >  (define-public gnome-shell-extension-noannoyance
> > >    (let ((revision "1")
> > > -        (commit "b759d10fd2799bc084007fdd927b62637c3dbd2c"))
> > > +        (commit "5e9e6a1878d2a1d961f5d59505f15339c5b7e17e"))
> > Remember to bump the revision.
> > >      (package
> > > +      ;; This is the “fork” version:
> > > +      ;;
> > > https://extensions.gnome.org/extension/6109/noannoyance-fork/
> > The comment here is not great.  What does "This is the fork
> > version"
> > mean when standing alone?  To me, it means absolutely nothing,
> > despite
> > knowing the context behind.
> > 
> > Maybe explain "While the original version at <first link> is not
> > updated to current gnome, this fork <fork link> supports newer
> > versions." or something like that.
> 
> The situation is not very easy to explain. I discovered that our
> commit is 6 ahead of the commit published as version 17 for
> NoAnnoyance v2.
> I don’t really want to know how it relates to “NoAnnoyance” the
> original extension, because it has been forked around 2017 between
> f21d09a (“change to GPL v2 license”) and 866084e (“Rewrite”), which
> may be something like version 4 in extensions.gnome.org.
> 
> In any case, since we are continuing the version number scheme of
> NoAnnoyance v2, this is version 17-6. I tried to explain this as
> quickly as possible, what do you think?
LGTM, but you might also want to explain that we're counting commits
since the common fork (maybe it's easier to swap commit and revision in
the let).

Cheers
diff mbox series

Patch

From 9d1d9c5f74f43ea60ed2ce9842cf821529ad6f27 Mon Sep 17 00:00:00 2001
Message-ID: <9d1d9c5f74f43ea60ed2ce9842cf821529ad6f27.1705740965.git.vivien@planete-kraus.eu>
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Wed, 17 Jan 2024 23:32:42 +0100
Subject: [PATCH] gnu: gnome-shell-extension-noannoyance: Switch to fork.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The NoAnnoyance “v2” project has not been ported to GNOME 44, so we switch to
a maintained fork.  The version number is computed in continuity with
NoAnnoyance v2.

* gnu/packages/gnome-xyz.scm (gnome-shell-extension-noannoyance): Switch to
the fork.  Bump version to 17 and revision to 6.
[arguments]: Convert to list of G-Expressions.

Change-Id: Ic74d832020dfe3857e1abf450f5d7876cc921a28
---
 gnu/packages/gnome-xyz.scm | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index b6c1f6d3cb..026aaefd64 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -952,26 +952,32 @@  (define-public gnome-shell-extension-dash-to-panel
     (license license:gpl2+)))
 
 (define-public gnome-shell-extension-noannoyance
-  (let ((revision "1")
-        (commit "b759d10fd2799bc084007fdd927b62637c3dbd2c"))
+  ;; There are different forks of the NoAnnoyance extension. This is the one
+  ;; named “NoAnnoyance (fork)” at
+  ;; https://extensions.gnome.org/extension/6109/noannoyance-fork/ because it
+  ;; supports newer GNOME Shell versions than the previously used “NoAnnoyance
+  ;; v2”.
+  (let ((revision "6")
+        ;; “NoAnnoyance v2” version 17 correlates with
+        ;; c6804a47063659f9f48d13a0942b78ce98aac72b
+        (commit "5e9e6a1878d2a1d961f5d59505f15339c5b7e17e"))
     (package
       (name "gnome-shell-extension-noannoyance")
-      ;; XXX: There is no version noted anywhere in the source.  Thus, infer it
-      ;;      from <https://extensions.gnome.org/extension/2182/noannoyance/>.
-      (version (git-version "16" revision commit))
+      (version (git-version "17" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/bdaase/noannoyance")
+                      (url "https://github.com/jirkavrba/noannoyance")
                       (commit commit)))
                 (sha256
                  (base32
-                  "0hh7fdqvx54h9j41ia2jl0nq1d5i66k7blw41ya6hkh7201r4anp"))
+                  "0br9zrwvn499kh3db84hhw1kl02jpchwb5ldfp892p15vwih8yrf"))
                 (file-name (git-file-name name version))))
       (build-system copy-build-system)
       (arguments
-       '(#:install-plan
-         '(("." "share/gnome-shell/extensions/noannoyance@daase.net"))))
+       (list
+        #:install-plan
+        #~'(("." "share/gnome-shell/extensions/noannoyance@vrba.dev"))))
       (synopsis "Remove 'Window is ready' annotation")
       (description "One of the many extensions that remove this message.
 It uses ES6 syntax and claims to be more actively maintained than others.")

base-commit: 49897f2dde7f469c83c496fad2699d3a05f72701
prerequisite-patch-id: 3faeeda7e58b64d088b388b6ebb44b927964912b
prerequisite-patch-id: bc167ce608743cf16b648091eb5775e57b9e0953
-- 
2.41.0