[bug#68344] [PATCH gnome-team 0/2] Another gnome-team world rebuild

[bug#68344] [PATCH gnome-team 0/2] Another gnome-team world rebuild

[Vivien Kraus via Guix-patches via]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 577 bytes --]

Dear guix,

I forgot to update these to for GNOME 44.7. I’m not sure the
font-abattis-cantarell is an update at all, because I can’t find the 0.303.1
tag in the repository.

These are a world rebuild, unfortunately.

Best regards,

Vivien

Vivien Kraus (2):
  gnu: atkmm@2.28: Update to 2.28.3.
  gnu: font-abattis-cantarell: Update to 0.303.1.

 gnu/packages/fonts.scm | 63 +++++++++++++++++++++---------------------
 gnu/packages/gtk.scm   |  4 +--
 2 files changed, 33 insertions(+), 34 deletions(-)


base-commit: 2cbb1a6e1e2679c7db74b6b906d223fb3661d09f
-- 
2.41.0

[bug#68344] [PATCH gnome-team 1/2] gnu: atkmm@2.28: Update to 2.28.3.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (atkmm-2.28): Update to 2.28.3.

Change-Id: Ia563253263106e07c7a0699615b6ea3a8d88e760
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 8b4fe7d681..f90ec2cf3f 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1788,7 +1788,7 @@ (define-public atkmm-2.28
   (package
     (inherit atkmm)
     (name "atkmm")
-    (version "2.28.1")
+    (version "2.28.3")
     (source
      (origin
        (method url-fetch)
@@ -1797,7 +1797,7 @@ (define-public atkmm-2.28
                        (version-major+minor version)  "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "1b8vycqzr3lfvk2l73f4kk74hj48081zbh9r1r2ilr3h8xh7cs0i"))))
+        (base32 "0scricjx6p7acxrxmj232d6qi42zdkjh90xila6vw2d9hss8h83w"))))
     (propagated-inputs
      (modify-inputs (package-propagated-inputs atkmm)
        (replace "glibmm" glibmm-2.64)))))
-- 
2.41.0

[bug#68344] [PATCH gnome-team 2/2] gnu: font-abattis-cantarell: Update to 0.303.1.

[Vivien Kraus via Guix-patches via]

* gnu/packages/fonts.scm (font-abattis-cantarell): Update to 0.303.1.
[source]: Use the provided mirror tarball.

Change-Id: I1635000e0bac61e034ff6e290685681222d23c6b
---
 gnu/packages/fonts.scm | 63 +++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 7516e1642b..16920208f0 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -289,41 +289,40 @@ (define-public font-canada1500
     (license license:cc0)))
 
 (define-public font-abattis-cantarell
-  ;; Use the latest commit, as the last released version, 0.303, has problems
-  ;; with the newer statmake.  The dependency has been removed in the latest
-  ;; code base.
-  (let ((commit "e049149faf0c15b0711e8d790e2333be923f0486")
-        (revision "0"))
-    (package
-      (name "font-abattis-cantarell")
-      (version (git-version "0.303" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://gitlab.gnome.org/GNOME/cantarell-fonts")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "032csq99bkmmgh9mmmbrgg4fzxgkcsvxv4wy595qms72mmlgmcc7"))))
-      (build-system meson-build-system)
-      (arguments
-       (list #:configure-flags #~(list "-Dbuildstatics=true")))
-      (native-inputs
-       (list gettext-minimal
-             psautohint
-             python
-             python-cffsubr
-             python-fontmath
-             python-ufo2ft))
-      (home-page "https://wiki.gnome.org/Projects/CantarellFonts")
-      (synopsis "Cantarell sans-serif typeface")
-      (description "The Cantarell font family is a contemporary Humanist
+  (package
+    (name "font-abattis-cantarell")
+    (version "0.303.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://gnome/sources/cantarell-fonts/"
+                           (version-major+minor version)
+                           "/"
+                           "cantarell-fonts-"
+                           version
+                           ".tar.xz"))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0484acq1hxi4jjc3b4dlqnam68i9377m7mzxh7imfgn6b433lipr"))))
+    (build-system meson-build-system)
+    (arguments
+     (list
+      #:configure-flags #~(list "-Dbuildstatics=true")))
+    (native-inputs
+     (list gettext-minimal
+           psautohint
+           python
+           python-cffsubr
+           python-fontmath
+           python-ufo2ft))
+    (home-page "https://wiki.gnome.org/Projects/CantarellFonts")
+    (synopsis "Cantarell sans-serif typeface")
+    (description
+     "The Cantarell font family is a contemporary Humanist
 sans-serif designed for on-screen reading.  It is used by GNOME@tie{}3.
 This package contains both the non-variable as well as the variable versions
 of the font.")
-      (license license:silofl1.1))))
+    (license license:silofl1.1)))
 
 (define-public font-lato
   (package
-- 
2.41.0

[bug#68344] [PATCH gnome-team 2/2] gnu: font-abattis-cantarell: Update to 0.303.1.

[Vivien Kraus via Guix-patches via]

Le mardi 09 janvier 2024 à 12:46 +0100, Vivien Kraus a écrit :
> * gnu/packages/fonts.scm (font-abattis-cantarell): Update to 0.303.1.
> [source]: Use the provided mirror tarball.

The mirror tells me 0.303.1 has been uploaded on “2021-Dec-10”, while
our commit is from 2023-Apr-4, so this is not an update at all. I’m not
sure we should apply this one.

Best regards,

Vivien

[bug#68344] [PATCH gnome-team 2/2] gnu: font-abattis-cantarell: Update to 0.303.1.

[Maxim Cournoyer]

Hi,

Vivien Kraus <vivien@planete-kraus.eu> writes:

> Le mardi 09 janvier 2024 à 12:46 +0100, Vivien Kraus a écrit :
>> * gnu/packages/fonts.scm (font-abattis-cantarell): Update to 0.303.1.
>> [source]: Use the provided mirror tarball.
>
> The mirror tells me 0.303.1 has been uploaded on “2021-Dec-10”, while
> our commit is from 2023-Apr-4, so this is not an update at all. I’m not
> sure we should apply this one.

What happened?  Did 'guix refresh' get things wrong?  Perhaps ask in the
#gnome channel if it's not clear from their repository.

-- 
Thanks,
Maxim

[bug#68344] [PATCH gnome-team 2/2] gnu: font-abattis-cantarell: Update to 0.303.1.

[Liliana Marie Prikler]

Am Dienstag, dem 09.01.2024 um 11:43 -0500 schrieb Maxim Cournoyer:
> Hi,
> 
> Vivien Kraus <vivien@planete-kraus.eu> writes:
> 
> > Le mardi 09 janvier 2024 à 12:46 +0100, Vivien Kraus a écrit :
> > > * gnu/packages/fonts.scm (font-abattis-cantarell): Update to
> > > 0.303.1.
> > > [source]: Use the provided mirror tarball.
> > 
> > The mirror tells me 0.303.1 has been uploaded on “2021-Dec-10”,
> > while our commit is from 2023-Apr-4, so this is not an update at
> > all. I’m not sure we should apply this one.
> 
> What happened?  Did 'guix refresh' get things wrong?  Perhaps ask in
> the #gnome channel if it's not clear from their repository.
Seconded, the cantarell font in our repos is probably recent enough.

For atkmm, I already sent #68308, so this appears to be a duplicate?

Cheers

bug#68344: [PATCH gnome-team 2/2] gnu: font-abattis-cantarell: Update to 0.303.1.

[Maxim Cournoyer]

Hi,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> Am Dienstag, dem 09.01.2024 um 11:43 -0500 schrieb Maxim Cournoyer:
>> Hi,
>> 
>> Vivien Kraus <vivien@planete-kraus.eu> writes:
>> 
>> > Le mardi 09 janvier 2024 à 12:46 +0100, Vivien Kraus a écrit :
>> > > * gnu/packages/fonts.scm (font-abattis-cantarell): Update to
>> > > 0.303.1.
>> > > [source]: Use the provided mirror tarball.
>> > 
>> > The mirror tells me 0.303.1 has been uploaded on “2021-Dec-10”,
>> > while our commit is from 2023-Apr-4, so this is not an update at
>> > all. I’m not sure we should apply this one.
>> 
>> What happened?  Did 'guix refresh' get things wrong?  Perhaps ask in
>> the #gnome channel if it's not clear from their repository.
> Seconded, the cantarell font in our repos is probably recent enough.

I just checked in the git repo, our commit is (much) newer.  Closing,
since the second patch was submitted by Liliana earlier.

-- 
Thanks,
Maxim

[bug#68344] [PATCH gnome-team 2/2] gnu: font-abattis-cantarell: Update to 0.303.1.

[Vivien Kraus via Guix-patches via]

Le mardi 09 janvier 2024 à 20:24 +0100, Liliana Marie Prikler a écrit :
> For atkmm, I already sent #68308, so this appears to be a duplicate?

Oh sorry, I did not find it because I searched for gnome-team issue and
it appears to not be listed.

[bug#68344] [PATCH gnome-team 2/2] gnu: font-abattis-cantarell: Update to 0.303.1.

[Maxim Cournoyer]

Hi Vivien,

Vivien Kraus <vivien@planete-kraus.eu> writes:

> Le mardi 09 janvier 2024 à 20:24 +0100, Liliana Marie Prikler a écrit :
>> For atkmm, I already sent #68308, so this appears to be a duplicate?
>
> Oh sorry, I did not find it because I searched for gnome-team issue and
> it appears to not be listed.

If you were part of the gnome-team, per etc/teams.scm.in, you'd have
received a notification.  I encourage you to register yourself there; I
can do so on your behalf if needed.

-- 
Thanks,
Maxim