[bug#64640] [PATCH gnome-team 1/2] gnu: Unify gsettings-desktop-schemas and gsettings-desktop-schemas-next.

[bug#64640] [PATCH gnome-team 1/2] gnu: Unify gsettings-desktop-schemas and gsettings-desktop-schemas-next.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (gsettings-desktop-schemas-next): Remove variable.
(gnome-desktop)[propagated-inputs]: Use gsettings-desktop-schemas instead of
gsettings-desktop-schemas-next.
(gnome-settings-daemon)[inputs]: Likewise.
(mutter)[propagated-inputs]: Likewise.
(gnome-weather)[inputs]: Likewise.
(gnome-calculator)[inputs]: Likewise.
---
 gnu/packages/gnome.scm | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 27e8949fa1..823dff40b5 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2245,7 +2245,7 @@ (define-public gnome-desktop
            xorg-server-for-tests))
     (propagated-inputs
      ;; Required by gnome-desktop-3.0.pc.
-     (list gsettings-desktop-schemas-next
+     (list gsettings-desktop-schemas
            gtk
            gtk+
            iso-codes
@@ -2714,21 +2714,6 @@ (define-public gsettings-desktop-schemas
 schemas for settings shared by various components of the GNOME desktop.")
     (license license:lgpl2.1+)))
 
-(define-public gsettings-desktop-schemas-next
-  (package
-    (inherit gsettings-desktop-schemas)
-    (name "gsettings-desktop-schemas-next") ;to avoid propagation conflicts
-    (version "42.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "mirror://gnome/sources/" name "/"
-                           (version-major version)  "/"
-                           name "-" version ".tar.xz"))
-       (sha256
-        (base32
-         "1li3fcqwnw20f4j0i21i88fygm0hli8gmzkn4apgf8ynkrd371k6"))))))
-
 (define-public python-liblarch
   (package
     (name "python-liblarch")
@@ -5990,7 +5975,7 @@ (define-public gnome-settings-daemon
            geoclue
            geocode-glib-with-libsoup2
            gnome-desktop
-           gsettings-desktop-schemas-next
+           gsettings-desktop-schemas
            lcms
            libcanberra
            libgudev
@@ -7924,7 +7909,7 @@ (define-public mutter
            python-dbusmock
            tini))                       ;acting as init (zombie reaper)
     (propagated-inputs
-     (list gsettings-desktop-schemas-next ;required by libmutter.pc
+     (list gsettings-desktop-schemas      ;required by libmutter.pc
            gtk+                           ;required by libmutter.pc
            ;; mutter-clutter-1.0.pc and mutter-cogl-1.0.pc refer to these:
            at-spi2-core
@@ -9966,7 +9951,7 @@ (define-public gnome-weather
            bash-minimal
            geoclue
            gjs
-           gsettings-desktop-schemas-next
+           gsettings-desktop-schemas
            gtk
            libadwaita
            libgweather4))
@@ -10768,7 +10753,7 @@ (define-public gnome-calculator
            python
            vala))
     (inputs
-     (list gsettings-desktop-schemas-next
+     (list gsettings-desktop-schemas
            gtksourceview
            libadwaita
            libgee
-- 
2.41.0

[bug#64640] [PATCH gnome-team 2/2] gnu: gsettings-desktop-schemas: Update to 44.0.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (gsettings-desktop-schemas): Update to 44.0.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 823dff40b5..7ba1a9f6b0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2678,7 +2678,7 @@ (define-public evince
 (define-public gsettings-desktop-schemas
   (package
     (name "gsettings-desktop-schemas")
-    (version "42.0")
+    (version "44.0")
     (source
      (origin
        (method url-fetch)
@@ -2687,7 +2687,7 @@ (define-public gsettings-desktop-schemas
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "1li3fcqwnw20f4j0i21i88fygm0hli8gmzkn4apgf8ynkrd371k6"))))
+         "03pc3wlfmf07586x89h63fr42pdpvqx64ak4ks298nchmmff8bgb"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
-- 
2.41.0

[bug#64640] [PATCH gnome-team 0/2] Update gsettings-desktop-schemas.

[Liliana Marie Prikler]

Hi Guix,

sorry for only submitting a small series when gnome-team really could
use some love right now.  I failed to notice that "packages" on CI
doesn't actually build packages and thus we're stuck with a giant
webkitgtk build that I personally don't have the resources for.
Anyway, here's an update to gsettings-desktop-schemas that will be
needed going forward for sure.

Liliana Marie Prikler (2):
  gnu: Unify gsettings-desktop-schemas and
    gsettings-desktop-schemas-next.
  gnu: gsettings-desktop-schemas: Update to 44.0.

 gnu/packages/gnome.scm | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)


base-commit: d67507cacf934b970f67567bced4e044c3ca9753
-- 
2.41.0

[bug#64640] [PATCH gnome-team 0/2] Update gsettings-desktop-schemas.

[Maxim Cournoyer]

Hi,

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

> Hi Guix,
>

[...]

> I failed to notice that "packages" on CI
> doesn't actually build packages and thus we're stuck with a giant
> webkitgtk build that I personally don't have the resources for.

What is "packages" on CI?

> Anyway, here's an update to gsettings-desktop-schemas that will be
> needed going forward for sure.

Good.  Just to confirm, that's to be pushed and be built on the
gnome-team branch, as implied in the subject prefix, right?

-- 
Thanks,
Maxim

[bug#64640] [PATCH gnome-team 2/2] gnu: gsettings-desktop-schemas: Update to 44.0.

[Maxim Cournoyer]

Hi,

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

> * gnu/packages/gnome.scm (gsettings-desktop-schemas): Update to 44.0.
> ---
>  gnu/packages/gnome.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 823dff40b5..7ba1a9f6b0 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -2678,7 +2678,7 @@ (define-public evince
>  (define-public gsettings-desktop-schemas
>    (package
>      (name "gsettings-desktop-schemas")
> -    (version "42.0")
> +    (version "44.0")
>      (source
>       (origin
>         (method url-fetch)
> @@ -2687,7 +2687,7 @@ (define-public gsettings-desktop-schemas
>                             name "-" version ".tar.xz"))
>         (sha256
>          (base32
> -         "1li3fcqwnw20f4j0i21i88fygm0hli8gmzkn4apgf8ynkrd371k6"))))
> +         "03pc3wlfmf07586x89h63fr42pdpvqx64ak4ks298nchmmff8bgb"))))
>      (build-system meson-build-system)
>      (arguments
>       `(#:phases (modify-phases %standard-phases

That'll probably break a bunch of stuff, but I understand it was too
expensive for you to test before hand.  It's not the end of the world,
since we'll catch the breakage on the gnome-team branch and can fix it
up there, so feel free to push.

-- 
Thanks,
Maxim

[bug#64640] [PATCH gnome-team 0/2] Update gsettings-desktop-schemas.

[Liliana Marie Prikler]

Am Samstag, dem 15.07.2023 um 22:58 -0400 schrieb Maxim Cournoyer:
> Hi,
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> 
> > Hi Guix,
> > 
> 
> [...]
> 
> > I failed to notice that "packages" on CI
> > doesn't actually build packages and thus we're stuck with a giant
> > webkitgtk build that I personally don't have the resources for.
> 
> What is "packages" on CI?
One of the options for the stuff to build.  I suppose, it's just the
package cache.

> > Anyway, here's an update to gsettings-desktop-schemas that will be
> > needed going forward for sure.
> 
> Good.  Just to confirm, that's to be pushed and be built on the
> gnome-team branch, as implied in the subject prefix, right?
Indeed.  As for your second mail, that branch has already seen some
disruptive patches, e.g. towards glib, gtk, etc.  The point is to
update all the things to GNOME 44 and this is some low level
requirement to do so.

Cheers

[bug#64640] [PATCH gnome-team 0/2] Update gsettings-desktop-schemas.

[Maxim Cournoyer]

Hi Liliana,

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

> Am Samstag, dem 15.07.2023 um 22:58 -0400 schrieb Maxim Cournoyer:
>> Hi,
>> 
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>> 
>> > Hi Guix,
>> > 
>> 
>> [...]
>> 
>> > I failed to notice that "packages" on CI
>> > doesn't actually build packages and thus we're stuck with a giant
>> > webkitgtk build that I personally don't have the resources for.
>> 
>> What is "packages" on CI?
> One of the options for the stuff to build.  I suppose, it's just the
> package cache.
>
>> > Anyway, here's an update to gsettings-desktop-schemas that will be
>> > needed going forward for sure.
>> 
>> Good.  Just to confirm, that's to be pushed and be built on the
>> gnome-team branch, as implied in the subject prefix, right?
> Indeed.  As for your second mail, that branch has already seen some
> disruptive patches, e.g. towards glib, gtk, etc.  The point is to
> update all the things to GNOME 44 and this is some low level
> requirement to do so.

Sounds great.  I think I'll have the opportunity to join the GNOME
update party soon.

-- 
Thanks,
Maxim

[bug#64640] [PATCH gnome-team 2/2] gnu: gsettings-desktop-schemas: Update to 44.0.

[Liliana Marie Prikler]

Am Samstag, dem 15.07.2023 um 23:00 -0400 schrieb Maxim Cournoyer:
> Hi,
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> 
> > * gnu/packages/gnome.scm (gsettings-desktop-schemas): Update to
> > 44.0.
> > ---
> >  gnu/packages/gnome.scm | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> > index 823dff40b5..7ba1a9f6b0 100644
> > --- a/gnu/packages/gnome.scm
> > +++ b/gnu/packages/gnome.scm
> > @@ -2678,7 +2678,7 @@ (define-public evince
> >  (define-public gsettings-desktop-schemas
> >    (package
> >      (name "gsettings-desktop-schemas")
> > -    (version "42.0")
> > +    (version "44.0")
> >      (source
> >       (origin
> >         (method url-fetch)
> > @@ -2687,7 +2687,7 @@ (define-public gsettings-desktop-schemas
> >                             name "-" version ".tar.xz"))
> >         (sha256
> >          (base32
> > -        
> > "1li3fcqwnw20f4j0i21i88fygm0hli8gmzkn4apgf8ynkrd371k6"))))
> > +        
> > "03pc3wlfmf07586x89h63fr42pdpvqx64ak4ks298nchmmff8bgb"))))
> >      (build-system meson-build-system)
> >      (arguments
> >       `(#:phases (modify-phases %standard-phases
> 
> That'll probably break a bunch of stuff, but I understand it was too
> expensive for you to test before hand.  It's not the end of the
> world, since we'll catch the breakage on the gnome-team branch and
> can fix it up there, so feel free to push.
Done and pushed, followed-up by an automatic master merge (i.e. master
into gnome-team).  I hope that we will actually see CI on gnome-team do
useful things following from now.  Remember that GNOME 45 hits in
September, although GNOME 44 will remain stable still.

Cheers

bug#64640: [PATCH gnome-team 2/2] gnu: gsettings-desktop-schemas: Update to 44.0.

[Liliana Marie Prikler]

Am Sonntag, dem 23.07.2023 um 10:19 +0200 schrieb Liliana Marie
Prikler:
> Done and pushed
Then why don't you send it to done?  Silly me.