[bug#73956] [PATCH rust-team] Add rust-libadwaita-0.6

[bug#73956] [PATCH rust-team] Add rust-libadwaita-0.6

[paul via Guix-patches via]

Hi Guix,

I'm sending a patchset based on the rust-team branch adding 
rust-libadwaita-0.6 .

Thank you for your work,

giacomo

[bug#73956] [PATCH rust-team 01/27] gnu: Add rust-cfg-expr-0.17.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-cfg-expr-0.17): New variable.
(rust-cfg-expr-0.15): inherit from rust-cfg-expr-0.17.

Change-Id: I540636bc6f1ab66f7ca238bf4e90fb2917308241
---
 gnu/packages/crates-io.scm | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 85259d2cbf..459fa6b7cd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12266,17 +12266,17 @@ (define-public rust-cfg-aliases-0.1
        (sha256
         (base32 "17p821nc6jm830vzl2lmwz60g3a30hcm33nk6l257i1rjdqw85px"))))))
 
-(define-public rust-cfg-expr-0.15
+(define-public rust-cfg-expr-0.17
   (package
     (name "rust-cfg-expr")
-    (version "0.15.8")
+    (version "0.17.0")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "cfg-expr" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "00lgf717pmf5qd2qsxxzs815v6baqg38d6m5i6wlh235p14asryh"))))
+                "174y5f7035cx99d83hn1m97xd5xr83nd5fpkcxr3w8nkqihh12fh"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -12291,6 +12291,25 @@ (define-public rust-cfg-expr-0.15
 expressions.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-cfg-expr-0.15
+  (package
+    (inherit rust-cfg-expr-0.17)
+    (name "rust-cfg-expr")
+    (version "0.15.8")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "cfg-expr" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "00lgf717pmf5qd2qsxxzs815v6baqg38d6m5i6wlh235p14asryh"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-smallvec" ,rust-smallvec-1)
+        ("rust-target-lexicon" ,rust-target-lexicon-0.12))
+       #:cargo-development-inputs
+       (("rust-similar-asserts" ,rust-similar-asserts-1))))))
+
 (define-public rust-cfg-expr-0.10
   (package
     (inherit rust-cfg-expr-0.15)

base-commit: 14a0c80510da486fbe825f7d71544e309d482a65
-- 
2.46.0

[bug#73956] [PATCH rust-team 02/27] gnu: Add rust-system-deps-7.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-system-deps-7): New variable;
(rust-system-deps-6): inherit from rust-system-deps-6.

Change-Id: I28dd3c7406fbd1656e8df77bae0b38a71c91f07b
---
 gnu/packages/crates-io.scm | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 459fa6b7cd..dc5aa6f1ab 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -80024,31 +80024,31 @@ (define-public rust-syslog-3
         ("rust-log" ,rust-log-0.3)
         ("rust-unix-socket" ,rust-unix-socket-0.5))))))
 
-(define-public rust-system-deps-6
+(define-public rust-system-deps-7
   (package
     (name "rust-system-deps")
-    (version "6.2.2")
+    (version "7.0.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "system-deps" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0j93ryw031n3h8b0nfpj5xwh3ify636xmv8kxianvlyyipmkbrd3"))
+        (base32 "01d0fllzpkfybzadyaq1vlx70imzj56dxs4rk9w2f4ikkypkmlk6"))
        (snippet
         #~(begin (delete-file "src/tests/lib/libteststatic.a")))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f                      ;source is missing some test files
        #:cargo-inputs
-       (("rust-cfg-expr" ,rust-cfg-expr-0.15)
+       (("rust-cfg-expr" ,rust-cfg-expr-0.17)
         ("rust-heck" ,rust-heck-0.5)
         ("rust-pkg-config" ,rust-pkg-config-0.3)
         ("rust-toml" ,rust-toml-0.8)
         ("rust-version-compare" ,rust-version-compare-0.2))
        #:cargo-development-inputs
        (("rust-assert-matches" ,rust-assert-matches-1)
-        ("rust-itertools" ,rust-itertools-0.12)
+        ("rust-itertools" ,rust-itertools-0.13)
         ("rust-lazy-static" ,rust-lazy-static-1))))
     (home-page "https://github.com/gdesmott/system-deps")
     (synopsis "Define system dependencies in @file{Cargo.toml}")
@@ -80058,6 +80058,33 @@ (define-public rust-system-deps-6
 well.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-system-deps-6
+  (package
+    (inherit rust-system-deps-7)
+    (name "rust-system-deps")
+    (version "6.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "system-deps" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0j93ryw031n3h8b0nfpj5xwh3ify636xmv8kxianvlyyipmkbrd3"))
+       (snippet
+        #~(begin (delete-file "src/tests/lib/libteststatic.a")))))
+    (arguments
+     `(#:tests? #f                      ;source is missing some test files
+       #:cargo-inputs
+       (("rust-cfg-expr" ,rust-cfg-expr-0.15)
+        ("rust-heck" ,rust-heck-0.5)
+        ("rust-pkg-config" ,rust-pkg-config-0.3)
+        ("rust-toml" ,rust-toml-0.8)
+        ("rust-version-compare" ,rust-version-compare-0.2))
+       #:cargo-development-inputs
+       (("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-itertools" ,rust-itertools-0.12)
+        ("rust-lazy-static" ,rust-lazy-static-1))))))
+
 (define-public rust-system-deps-3
   (package
     (inherit rust-system-deps-6)
-- 
2.46.0

[bug#73956] [PATCH rust-team 03/27] gnu: Add rust-glib-sys-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-glib-sys-0.20): New variable;
(rust-glib-sys-0.19): inherit from rust-glib-sys-0.20.

Change-Id: I8191a5a11ac63d20b6e69366469c58bbefef66e2
---
 gnu/packages/crates-gtk.scm | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index b46b0945b0..0a13970983 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1948,24 +1948,24 @@ (define-public rust-glib-macros-0.10
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))))
 
-(define-public rust-glib-sys-0.19
+(define-public rust-glib-sys-0.20
   (package
     (name "rust-glib-sys")
-    (version "0.19.8")
+    (version "0.20.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "glib-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "19f4q8x77vd7c1d9ikw492yskq5kpd7k04qb8xnh1c427a6w2baw"))))
+        (base32 "0avm6dr3q2xvlad7fcbq7an7qasaqf3k480dn19s99ngi1fwm7jz"))))
     (build-system cargo-build-system)
     (arguments
      `(;; XXX: Tests are sensitive to the version of glib, even though
        ;; the library supports a wide range.  Skip for now.
        #:tests? #f
        #:cargo-inputs (("rust-libc" ,rust-libc-0.2)
-                       ("rust-system-deps" ,rust-system-deps-6))
+                       ("rust-system-deps" ,rust-system-deps-7))
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))))
     (native-inputs (list pkg-config))
@@ -1975,6 +1975,27 @@ (define-public rust-glib-sys-0.19
     (description "This package provides FFI bindings to libglib-2.0.")
     (license license:expat)))
 
+(define-public rust-glib-sys-0.19
+  (package
+    (inherit rust-glib-sys-0.20)
+    (name "rust-glib-sys")
+    (version "0.19.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "glib-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "19f4q8x77vd7c1d9ikw492yskq5kpd7k04qb8xnh1c427a6w2baw"))))
+    (arguments
+     `(;; XXX: Tests are sensitive to the version of glib, even though
+       ;; the library supports a wide range.  Skip for now.
+       #:tests? #f
+       #:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+                       ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-glib-sys-0.18
   (package
     (inherit rust-glib-sys-0.19)
-- 
2.46.0

[bug#73956] [PATCH rust-team 04/27] gnu: Add rust-bitflags-2.6.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-bitflags-2.6): New variable;
(rust-bitflags-2): inherit from rust-bitflags-2.6.

Change-Id: Ic8935500734edb26da6c1dcb529715308729f266
---
 gnu/packages/crates-io.scm | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index dc5aa6f1ab..cc8491a98a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8264,17 +8264,17 @@ (define-public rust-bitfield-0.14
      "This Rust crate provides macros to generate bitfield-like struct.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-bitflags-2
+(define-public rust-bitflags-2.6
   (package
     (name "rust-bitflags")
-    (version "2.5.0")
+    (version "2.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "bitflags" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1h91vdx1il069vdiiissj8ymzj130rbiic0dbs77yxjgjim9sjyg"))))
+        (base32 "1pkidwzn3hnxlsl8zizh0bncgbjnw7c41cx7bby26ncbzmiznj5h"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; Not all files included.
@@ -8300,6 +8300,36 @@ (define-public rust-bitflags-2
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-bitflags-2
+  (package
+    (inherit rust-bitflags-2.6)
+    (name "rust-bitflags")
+    (version "2.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "bitflags" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1h91vdx1il069vdiiissj8ymzj130rbiic0dbs77yxjgjim9sjyg"))))
+    (arguments
+     `(#:tests? #f      ; Not all files included.
+       #:cargo-inputs
+       (("rust-arbitrary" ,rust-arbitrary-1)
+        ("rust-bytemuck" ,rust-bytemuck-1)
+        ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
+        ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-arbitrary" ,rust-arbitrary-1)
+        ("rust-bytemuck" ,rust-bytemuck-1)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-serde-test" ,rust-serde-test-1)
+        ("rust-trybuild" ,rust-trybuild-1)
+        ("rust-zerocopy" ,rust-zerocopy-0.6))))))
+
 (define-public rust-bitflags-1
   (package
     (inherit rust-bitflags-2)
-- 
2.46.0

[bug#73956] [PATCH rust-team 05/27] gnu: Add rust-gobject-sys-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gobject-sys-0.20): New variable;
(rust-gobject-sys-0.19): inherit from rust-gobject-sys-0.20.

Change-Id: I05a5b63039af42946de6f371d743b34e8fe9bce9
---
 gnu/packages/crates-gtk.scm | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 0a13970983..f08b2f5105 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2122,22 +2122,22 @@ (define-public rust-glib-sys-0.9
        (("rust-shell-words" ,rust-shell-words-0.1)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
-(define-public rust-gobject-sys-0.19
+(define-public rust-gobject-sys-0.20
   (package
     (name "rust-gobject-sys")
-    (version "0.19.8")
+    (version "0.20.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "gobject-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "17lb7dfbpcg8zchwlfbc08kckwf0a7d9n5ly3pyic13f5ljpws9f"))))
+        (base32 "0qk4d5ifybf5cnsv8bss85afz7vpxlqffawxq87cyy44zz979im4"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19)
+     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.20)
                        ("rust-libc" ,rust-libc-0.2)
-                       ("rust-system-deps" ,rust-system-deps-6))
+                       ("rust-system-deps" ,rust-system-deps-7))
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))))
     (native-inputs (list pkg-config))
@@ -2147,6 +2147,25 @@ (define-public rust-gobject-sys-0.19
     (description "This package provides FFI bindings to libgobject-2.0.")
     (license license:expat)))
 
+(define-public rust-gobject-sys-0.19
+  (package
+    (inherit rust-gobject-sys-0.20)
+    (name "rust-gobject-sys")
+    (version "0.19.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gobject-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "17lb7dfbpcg8zchwlfbc08kckwf0a7d9n5ly3pyic13f5ljpws9f"))))
+    (arguments
+     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-gobject-sys-0.18
   (package
     (inherit rust-gobject-sys-0.19)
-- 
2.46.0

[bug#73956] [PATCH rust-team 06/27] gnu: Add rust-gio-sys-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gio-sys-0.20): New variable;
(rust-gio-sys-0.19): inherit from rust-gio-sys-0.20.

Change-Id: Iededb3836d87b3098be7e9893d19f892aad611c0
---
 gnu/packages/crates-gtk.scm | 45 ++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index f08b2f5105..9ef2ba62a7 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1325,26 +1325,26 @@ (define-public rust-gio-0.8
         ("rust-serial-test" ,rust-serial-test-0.1)
         ("rust-serial-test-derive" ,rust-serial-test-derive-0.1))))))
 
-(define-public rust-gio-sys-0.19
+(define-public rust-gio-sys-0.20
   (package
     (name "rust-gio-sys")
-    (version "0.19.8")
+    (version "0.20.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "gio-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1vylsskpipfwl7mvffp1s0227d0k5amyhd32dfnp3mhl8yx47mrc"))))
+        (base32 "0ya7i4m3jirrhryy6h8x5kgp3fxn6m4111009ws5aiz0ilvgqzjg"))))
     (build-system cargo-build-system)
     (arguments
      `(;; XXX: Tests are sensitive to the version of glib, even though
        ;; the library supports a wide range.  Skip for now.
        #:tests? #f
-       #:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19)
-                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+       #:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.20)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.20)
                        ("rust-libc" ,rust-libc-0.2)
-                       ("rust-system-deps" ,rust-system-deps-6)
+                       ("rust-system-deps" ,rust-system-deps-7)
                        ("rust-windows-sys" ,rust-windows-sys-0.52))
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))
@@ -1364,6 +1364,39 @@ (define-public rust-gio-sys-0.19
     (description "This package provides FFI bindings to libgio-2.0.")
     (license license:expat)))
 
+(define-public rust-gio-sys-0.19
+  (package
+    (inherit rust-gio-sys-0.20)
+    (name "rust-gio-sys")
+    (version "0.19.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gio-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1vylsskpipfwl7mvffp1s0227d0k5amyhd32dfnp3mhl8yx47mrc"))))
+    (arguments
+     `(;; XXX: Tests are sensitive to the version of glib, even though
+       ;; the library supports a wide range.  Skip for now.
+       #:tests? #f
+       #:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-system-deps" ,rust-system-deps-6)
+                       ("rust-windows-sys" ,rust-windows-sys-0.52))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))
+       #:phases (modify-phases %standard-phases
+                  (add-before 'check 'extend-include-path
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      (let ((gio-headers (search-input-directory
+                                          inputs "include/gio-unix-2.0")))
+                        ;; Tests rely on these headers.
+                        (setenv "C_INCLUDE_PATH"
+                                (string-append gio-headers ":"
+                                               (getenv "C_INCLUDE_PATH")))))))))))
+
 (define-public rust-gio-sys-0.18
   (package
     (inherit rust-gio-sys-0.19)
-- 
2.46.0

[bug#73956] [PATCH rust-team 07/27] gnu: Add rust-glib-macros-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-glib-macros-0.20): New variable;
(rust-glib-macros-0.19): inherit from rust-glib-macros-0.20.

Change-Id: I07a067580461208e78f059dbcfcde5c99e90554c
---
 gnu/packages/crates-gtk.scm | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 9ef2ba62a7..1cb41e3527 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1829,17 +1829,22 @@ (define-public rust-glib-0.9
        #:cargo-development-inputs
        (("rust-tempfile" ,rust-tempfile-3))))))
 
-(define-public rust-glib-macros-0.19
+(define-public rust-glib-macros-0.20
   (package
     (name "rust-glib-macros")
-    (version "0.19.9")
+    (version "0.20.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "glib-macros" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1mzsh8jkg8vldvgvr9gsaidvn2myn5cbdn8a6m8rgbhlg8kv0aa4"))))
+        (base32 "1mqwhk5qnd9vbvsb335n1j6m5pbqnfycm7b3jxhhlwnm1kvqigx6"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (substitute* "Cargo.toml"
+             (("version = \"2.0.68\"") "version = \">= 2.0\""))))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-heck" ,rust-heck-0.5)
@@ -1847,7 +1852,7 @@ (define-public rust-glib-macros-0.19
                        ("rust-proc-macro2" ,rust-proc-macro2-1)
                        ("rust-quote" ,rust-quote-1)
                        ("rust-syn" ,rust-syn-2))
-       #:cargo-development-inputs (("rust-glib" ,rust-glib-0.19)
+       #:cargo-development-inputs (("rust-glib" ,rust-glib-0.20)
                                    ("rust-trybuild2" ,rust-trybuild2-1))))
     (native-inputs (list pkg-config))
     (inputs (list glib))
@@ -1857,6 +1862,27 @@ (define-public rust-glib-macros-0.19
      "This package provides Rust bindings for the GLib library, proc macros crate.")
     (license license:expat)))
 
+(define-public rust-glib-macros-0.19
+  (package
+    (inherit rust-glib-macros-0.20)
+    (name "rust-glib-macros")
+    (version "0.19.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "glib-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1mzsh8jkg8vldvgvr9gsaidvn2myn5cbdn8a6m8rgbhlg8kv0aa4"))))
+    (arguments
+     `(#:cargo-inputs (("rust-heck" ,rust-heck-0.5)
+                       ("rust-proc-macro-crate" ,rust-proc-macro-crate-3)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))
+       #:cargo-development-inputs (("rust-glib" ,rust-glib-0.19)
+                                   ("rust-trybuild2" ,rust-trybuild2-1))))))
+
 (define-public rust-glib-macros-0.18
   (package
     (inherit rust-glib-macros-0.19)
-- 
2.46.0

[bug#73956] [PATCH rust-team 08/27] gnu: Add rust-glib-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-glib-0.20): New variable.
(rust-glib-0.19): inherit from rust-glib-0.20.

Change-Id: I3b25b24922d7fed60376c82f21f3c3ff16a1cc55
---
 gnu/packages/crates-gtk.scm | 53 +++++++++++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 1cb41e3527..5dcb9ec6d2 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1586,32 +1586,32 @@ (define-public rust-gir-format-check-0.1
     (description "File format checker in Rust.")
     (license license:expat)))
 
-(define-public rust-glib-0.19
+(define-public rust-glib-0.20
   (package
     (name "rust-glib")
-    (version "0.19.9")
+    (version "0.20.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "glib" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0i2ak1scmzfmfxbm2dr146jl4y9mafxf1ald05jr8iimy5wh4r9r"))))
+        (base32 "1zw5xd2772vakf95pslvzmmnzg6f9wnj9vkcpkyzj2v5sg31xkxd"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags
        '("--release" "--"
          "--skip=structured_log")
-       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2.6)
                        ("rust-futures-channel" ,rust-futures-channel-0.3)
                        ("rust-futures-core" ,rust-futures-core-0.3)
                        ("rust-futures-executor" ,rust-futures-executor-0.3)
                        ("rust-futures-task" ,rust-futures-task-0.3)
                        ("rust-futures-util" ,rust-futures-util-0.3)
-                       ("rust-gio-sys" ,rust-gio-sys-0.19)
-                       ("rust-glib-macros" ,rust-glib-macros-0.19)
-                       ("rust-glib-sys" ,rust-glib-sys-0.19)
-                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+                       ("rust-gio-sys" ,rust-gio-sys-0.20)
+                       ("rust-glib-macros" ,rust-glib-macros-0.20)
+                       ("rust-glib-sys" ,rust-glib-sys-0.20)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.20)
                        ("rust-libc" ,rust-libc-0.2)
                        ("rust-log" ,rust-log-0.4)
                        ("rust-memchr" ,rust-memchr-2)
@@ -1629,6 +1629,43 @@ (define-public rust-glib-0.19
     (description "This package provides Rust bindings for the GLib library.")
     (license license:expat)))
 
+(define-public rust-glib-0.19
+  (package
+    (inherit rust-glib-0.20)
+    (name "rust-glib")
+    (version "0.19.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "glib" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0i2ak1scmzfmfxbm2dr146jl4y9mafxf1ald05jr8iimy5wh4r9r"))))
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--"
+         "--skip=structured_log")
+       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-futures-executor" ,rust-futures-executor-0.3)
+                       ("rust-futures-task" ,rust-futures-task-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-gio-sys" ,rust-gio-sys-0.19)
+                       ("rust-glib-macros" ,rust-glib-macros-0.19)
+                       ("rust-glib-sys" ,rust-glib-sys-0.19)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.5)
+        ("rust-gir-format-check" ,rust-gir-format-check-0.1)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-trybuild2" ,rust-trybuild2-1))))))
+
 (define-public rust-glib-0.18
   (package
     (inherit rust-glib-0.19)
-- 
2.46.0

[bug#73956] [PATCH rust-team 09/27] gnu: Add rust-cairo-sys-rs-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-cairo-sys-rs-0.20): New variable;
(rust-cairo-sys-rs-0.19): inherit from rust-cairo-sys-rs-0.20.

Change-Id: I5044a639615ae9f41b778ad690ba645f463043bd
---
 gnu/packages/crates-gtk.scm | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 5dcb9ec6d2..e18b6701d2 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -350,22 +350,22 @@ (define-public rust-cairo-rs-0.8
        (("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
-(define-public rust-cairo-sys-rs-0.19
+(define-public rust-cairo-sys-rs-0.20
   (package
     (name "rust-cairo-sys-rs")
-    (version "0.19.2")
+    (version "0.20.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "cairo-sys-rs" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0r0yp0lph77lm4blrn6fvdmz2i3r8ibkkjg6nmwbvvv4jq8v6fzx"))))
+        (base32 "13x85l52nl2izmdb48zzpkhhh1a4dsgqlp8gys4n1f5r2kwr10j2"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19)
+     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.20)
                        ("rust-libc" ,rust-libc-0.2)
-                       ("rust-system-deps" ,rust-system-deps-6)
+                       ("rust-system-deps" ,rust-system-deps-7)
                        ("rust-windows-sys" ,rust-windows-sys-0.52)
                        ("rust-x11" ,rust-x11-2))))
     (native-inputs (list pkg-config))
@@ -375,6 +375,25 @@ (define-public rust-cairo-sys-rs-0.19
     (description "This package provides FFI bindings to libcairo.")
     (license license:expat)))
 
+(define-public rust-cairo-sys-rs-0.19
+  (package
+    (inherit rust-cairo-sys-rs-0.20)
+    (name "rust-cairo-sys-rs")
+    (version "0.19.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cairo-sys-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0r0yp0lph77lm4blrn6fvdmz2i3r8ibkkjg6nmwbvvv4jq8v6fzx"))))
+    (arguments
+     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-system-deps" ,rust-system-deps-6)
+                       ("rust-windows-sys" ,rust-windows-sys-0.52)
+                       ("rust-x11" ,rust-x11-2))))))
+
 (define-public rust-cairo-sys-rs-0.18
   (package
     (inherit rust-cairo-sys-rs-0.19)
-- 
2.46.0

[bug#73956] [PATCH rust-team 10/27] gnu: Add rust-freetype-sys-0.21.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-freetype-sys-0.21): New variable;
(rust-freetype-sys-0.20): inherit from rust-freetype-sys-0.21.

Change-Id: I6833de0940a7f03f1d91dbb7e4c6f4e9f992581e
---
 gnu/packages/crates-io.scm | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cc8491a98a..921ade5e2b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -28337,17 +28337,17 @@ (define-public rust-freetype-rs-0.26
         ("rust-freetype-sys" ,rust-freetype-sys-0.13)
         ("rust-libc" ,rust-libc-0.2))))))
 
-(define-public rust-freetype-sys-0.20
+(define-public rust-freetype-sys-0.21
   (package
     (name "rust-freetype-sys")
-    (version "0.20.1")
+    (version "0.21.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "freetype-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0d5iiv95ap3lwy7b0hxbc8caa9ng1fg3wlwrvb7rld39jrdxqzhf"))
+        (base32 "1bsmjhjb26hzpzhj82c9196m0ls5m43zkgmqp67ambwjk6ylmf6x"))
        (snippet
         #~(begin
             (use-modules (guix build utils))
@@ -28372,6 +28372,34 @@ (define-public rust-freetype-sys-0.20
      "This package provides low level binding for FreeType font library.")
     (license license:expat)))
 
+(define-public rust-freetype-sys-0.20
+  (package
+    (inherit rust-freetype-sys-0.21)
+    (name "rust-freetype-sys")
+    (version "0.20.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "freetype-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0d5iiv95ap3lwy7b0hxbc8caa9ng1fg3wlwrvb7rld39jrdxqzhf"))
+       (snippet
+        #~(begin
+            (use-modules (guix build utils))
+            (delete-file-recursively "freetype2")
+            ;; Inspired by Debian's patch for bzip2-sys.
+            (delete-file "build.rs")
+            (with-output-to-file "build.rs"
+              (lambda _
+                (format #t "fn main() {~@
+                        println!(\"cargo:rustc-link-lib=freetype\");~@
+                        }~%")))))))
+    (arguments
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3))))))
+
 (define-public rust-freetype-sys-0.17
   (package
     (inherit rust-freetype-sys-0.20)
-- 
2.46.0

[bug#73956] [PATCH rust-team 11/27] gnu: Add rust-freetype-rs-0.37.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-freetype-rs-0.37): New variable;
(rust-freetype-rs-0.35): inherit from rust-freetype-rs-0.37.

Change-Id: I4836c67456a1acf3108dae3343b7db3055d8616b
---
 gnu/packages/crates-io.scm | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 921ade5e2b..29e0687779 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -28273,21 +28273,21 @@ (define-public rust-freetype-0.7
     (description "This package provides bindings for Freetype used by Servo.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-freetype-rs-0.35
+(define-public rust-freetype-rs-0.37
   (package
     (name "rust-freetype-rs")
-    (version "0.35.0")
+    (version "0.37.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "freetype-rs" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1gzfb9fax3d3s691ys99nfihpzwl7hacvxnwvlxg4sph1fzd5ymi"))))
+        (base32 "05albg00302i1w4fxijb5wil7bdnn4gcknw20q2df2azj8dzilfi"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
-                       ("rust-freetype-sys" ,rust-freetype-sys-0.20)
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2.6)
+                       ("rust-freetype-sys" ,rust-freetype-sys-0.21)
                        ("rust-libc" ,rust-libc-0.2))
        #:cargo-development-inputs
        (("rust-unicode-normalization" ,rust-unicode-normalization-0.1))))
@@ -28298,6 +28298,25 @@ (define-public rust-freetype-rs-0.35
     (description "This package provides bindings for FreeType font library.")
     (license license:expat)))
 
+(define-public rust-freetype-rs-0.35
+  (package
+    (inherit rust-freetype-rs-0.37)
+    (name "rust-freetype-rs")
+    (version "0.35.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "freetype-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1gzfb9fax3d3s691ys99nfihpzwl7hacvxnwvlxg4sph1fzd5ymi"))))
+    (arguments
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-freetype-sys" ,rust-freetype-sys-0.20)
+                       ("rust-libc" ,rust-libc-0.2))
+       #:cargo-development-inputs
+       (("rust-unicode-normalization" ,rust-unicode-normalization-0.1))))))
+
 (define-public rust-freetype-rs-0.32
   (package
     (inherit rust-freetype-rs-0.35)
-- 
2.46.0

[bug#73956] [PATCH rust-team 12/27] gnu: Add rust-cairo-rs-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-cairo-rs-0.20): New variable;
(rust-cairo-rs-0.19): inherit from rust-cairo-rs-0.20.

Change-Id: Ib808c67be8bb32b36d76baf763d8d0d7feb39736
---
 gnu/packages/crates-gtk.scm | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index e18b6701d2..2b5fd25cdd 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -172,23 +172,23 @@ (define-public rust-atk-0.8
        #:cargo-development-inputs
        (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
 
-(define-public rust-cairo-rs-0.19
+(define-public rust-cairo-rs-0.20
   (package
     (name "rust-cairo-rs")
-    (version "0.19.4")
+    (version "0.20.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "cairo-rs" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0qp5rixgipdj9d8yd5458hzfxam1rgpzcxi90vq6q0v91r6jmb5j"))))
+        (base32 "0s9yafifi3pwf7jck0bhgwr4rlg483sqhlr32fb8q44lghafm878"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
-                       ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.19)
-                       ("rust-freetype-rs" ,rust-freetype-rs-0.35)
-                       ("rust-glib" ,rust-glib-0.19)
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2.6)
+                       ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.20)
+                       ("rust-freetype-rs" ,rust-freetype-rs-0.37)
+                       ("rust-glib" ,rust-glib-0.20)
                        ("rust-libc" ,rust-libc-0.2)
                        ("rust-thiserror" ,rust-thiserror-1))
        #:cargo-development-inputs (("rust-float-eq" ,rust-float-eq-1)
@@ -200,6 +200,28 @@ (define-public rust-cairo-rs-0.19
     (description "This package provides Rust bindings for the Cairo library.")
     (license license:expat)))
 
+(define-public rust-cairo-rs-0.19
+  (package
+    (inherit rust-cairo-rs-0.20)
+    (name "rust-cairo-rs")
+    (version "0.19.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cairo-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0qp5rixgipdj9d8yd5458hzfxam1rgpzcxi90vq6q0v91r6jmb5j"))))
+    (arguments
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.19)
+                       ("rust-freetype-rs" ,rust-freetype-rs-0.35)
+                       ("rust-glib" ,rust-glib-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs (("rust-float-eq" ,rust-float-eq-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-cairo-rs-0.18
   (package
     (inherit rust-cairo-rs-0.19)
-- 
2.46.0

[bug#73956] [PATCH rust-team 13/27] gnu: Add rust-pango-sys-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-pango-sys-0.20): New variable;
(rust-pango-sys-0.19): inherit from rust-pango-sys-0.20.

Change-Id: I32aa452b27484541884e4eaaea2cb7d5995768f1
---
 gnu/packages/crates-gtk.scm | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 2b5fd25cdd..0fef956a7c 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org>
 ;;; Copyright © 2023 Steve George <steve@futurile.net>
 ;;; Copyright © 2023 Sergio Pastor Pérez <sergio.pastorperez@outlook.es>
+;;; Copyright © 2024 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3366,23 +3367,23 @@ (define-public rust-pango-0.8
        #:cargo-development-inputs
        (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
 
-(define-public rust-pango-sys-0.19
+(define-public rust-pango-sys-0.20
   (package
     (name "rust-pango-sys")
-    (version "0.19.8")
+    (version "0.20.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pango-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "182bcd6255v5yvnskbhxnb6kwak240z7sn54si2b5h46l17xl0zz"))))
+        (base32 "0f5qyap96f01h7xa122s798hmz7rmc0c5fz299a0cbzigf8nbzc4"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19)
-                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.20)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.20)
                        ("rust-libc" ,rust-libc-0.2)
-                       ("rust-system-deps" ,rust-system-deps-6))
+                       ("rust-system-deps" ,rust-system-deps-7))
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))))
     (native-inputs (list pkg-config))
@@ -3392,6 +3393,26 @@ (define-public rust-pango-sys-0.19
     (description "This package provides FFI bindings to @code{libpango-1.0}.")
     (license license:expat)))
 
+(define-public rust-pango-sys-0.19
+  (package
+    (inherit rust-pango-sys-0.20)
+    (name "rust-pango-sys")
+    (version "0.19.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pango-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "182bcd6255v5yvnskbhxnb6kwak240z7sn54si2b5h46l17xl0zz"))))
+    (arguments
+     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-pango-sys-0.18
   (package
     (inherit rust-pango-sys-0.19)
-- 
2.46.0

[bug#73956] [PATCH rust-team 14/27] gnu: Add rust-libadwaita-sys-0.6.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-libadwaita-sys-0.6): New variable;
(rust-libadwaita-sys-0.5): inherit from rust-libadwaita-sys-0.6.

Change-Id: Iab000ff1bd6113193a40600bd030943bcbf66615
---
 gnu/packages/crates-gtk.scm | 41 +++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 0fef956a7c..1cfa8ffb9f 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -3162,28 +3162,28 @@ (define-public rust-libadwaita-0.5
     (description "Rust bindings for libadwaita.")
     (license license:expat)))
 
-(define-public rust-libadwaita-sys-0.5
+(define-public rust-libadwaita-sys-0.6
   (package
     (name "rust-libadwaita-sys")
-    (version "0.5.3")
+    (version "0.6.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "libadwaita-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "16n6xsy6jhbj0jbpz8yvql6c9b89a99v9vhdz5s37mg1inisl42y"))))
+        (base32 "1rhkc8siy6w77b00zbg7qzp1khn3p606hlkaf8dpmjxlnr1kycsj"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f  ; ‘AdwBannerClass’ undeclared
        #:cargo-inputs (("rust-gdk4-sys" ,rust-gdk4-sys-0.7)
-                       ("rust-gio-sys" ,rust-gio-sys-0.18)
-                       ("rust-glib-sys" ,rust-glib-sys-0.18)
-                       ("rust-gobject-sys" ,rust-gobject-sys-0.18)
+                       ("rust-gio-sys" ,rust-gio-sys-0.20)
+                       ("rust-glib-sys" ,rust-glib-sys-0.20)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.20)
                        ("rust-gtk4-sys" ,rust-gtk4-sys-0.7)
                        ("rust-libc" ,rust-libc-0.2)
-                       ("rust-pango-sys" ,rust-pango-sys-0.18)
-                       ("rust-system-deps" ,rust-system-deps-6))
+                       ("rust-pango-sys" ,rust-pango-sys-0.20)
+                       ("rust-system-deps" ,rust-system-deps-7))
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))))
     (native-inputs (list pkg-config))
@@ -3193,6 +3193,31 @@ (define-public rust-libadwaita-sys-0.5
     (description "FFI bindings for libadwaita.")
     (license license:expat)))
 
+(define-public rust-libadwaita-sys-0.5
+  (package
+    (inherit rust-libadwaita-sys-0.6)
+    (name "rust-libadwaita-sys")
+    (version "0.5.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libadwaita-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "16n6xsy6jhbj0jbpz8yvql6c9b89a99v9vhdz5s37mg1inisl42y"))))
+    (arguments
+     `(#:tests? #f  ; ‘AdwBannerClass’ undeclared
+       #:cargo-inputs (("rust-gdk4-sys" ,rust-gdk4-sys-0.7)
+                       ("rust-gio-sys" ,rust-gio-sys-0.18)
+                       ("rust-glib-sys" ,rust-glib-sys-0.18)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.18)
+                       ("rust-gtk4-sys" ,rust-gtk4-sys-0.7)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango-sys" ,rust-pango-sys-0.18)
+                       ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-pango-0.19
   (package
     (name "rust-pango")
-- 
2.46.0

[bug#73956] [PATCH rust-team 15/27] gnu: Add rust-gdk-pixbuf-sys-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gdk-pixbuf-sys-0.20): New variable;
(rust-gdk-pixbuf-sys-0.19): inherit from rust-gdk-pixbuf-sys-0.20.

Change-Id: Id994832ab591b70e7ba3392cf3c86c725ebb2212
---
 gnu/packages/crates-gtk.scm | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 1cfa8ffb9f..5df5695116 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -807,24 +807,24 @@ (define-public rust-gdk-pixbuf-0.8
        #:cargo-development-inputs
        (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
 
-(define-public rust-gdk-pixbuf-sys-0.19
+(define-public rust-gdk-pixbuf-sys-0.20
   (package
     (name "rust-gdk-pixbuf-sys")
-    (version "0.19.8")
+    (version "0.20.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "gdk-pixbuf-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0y93g24mdgskvyhva46xv3qyb1cvj5xpi0yqnh7cb31wz2j0byjf"))))
+        (base32 "0gdz43p4zsck7w6isin0zi3ydacg0c3l6yyqzgrza7drb6q46wv8"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-gio-sys" ,rust-gio-sys-0.19)
-                       ("rust-glib-sys" ,rust-glib-sys-0.19)
-                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+     `(#:cargo-inputs (("rust-gio-sys" ,rust-gio-sys-0.20)
+                       ("rust-glib-sys" ,rust-glib-sys-0.20)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.20)
                        ("rust-libc" ,rust-libc-0.2)
-                       ("rust-system-deps" ,rust-system-deps-6))
+                       ("rust-system-deps" ,rust-system-deps-7))
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))))
     (native-inputs (list pkg-config))
@@ -835,6 +835,27 @@ (define-public rust-gdk-pixbuf-sys-0.19
      "This package provides FFI bindings to @code{libgdk_pixbuf-2.0}.")
     (license license:expat)))
 
+(define-public rust-gdk-pixbuf-sys-0.19
+  (package
+    (inherit rust-gdk-pixbuf-sys-0.20)
+    (name "rust-gdk-pixbuf-sys")
+    (version "0.19.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gdk-pixbuf-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0y93g24mdgskvyhva46xv3qyb1cvj5xpi0yqnh7cb31wz2j0byjf"))))
+    (arguments
+     `(#:cargo-inputs (("rust-gio-sys" ,rust-gio-sys-0.19)
+                       ("rust-glib-sys" ,rust-glib-sys-0.19)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-gdk-pixbuf-sys-0.18
   (package
     (inherit rust-gdk-pixbuf-sys-0.19)
-- 
2.46.0

[bug#73956] [PATCH rust-team 16/27] gnu: Add rust-gio-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gio-0.20): New variable;
(rust-gio-0.19): inherit from rust-gio-0.20.

Change-Id: I152073e6b8d9892bd58e1f5ffc0b56b7ff562058
---
 gnu/packages/crates-gtk.scm | 43 ++++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 5df5695116..39c2021985 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1155,17 +1155,17 @@ (define-public rust-gdk4-sys-0.7
     (description "This package provides FFI bindings of GDK 4.")
     (license license:expat)))
 
-(define-public rust-gio-0.19
+(define-public rust-gio-0.20
   (package
     (name "rust-gio")
-    (version "0.19.8")
+    (version "0.20.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "gio" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1znz5ngfvv3gbndf6lzz3hs27hlb8ysls4axlfccrzvkscbz2jac"))))
+        (base32 "0g6l7a1n63a8myjpcv10mn214w0ypijf6rq812b3wn09zgl9kndq"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags
@@ -1176,8 +1176,8 @@ (define-public rust-gio-0.19
                        ("rust-futures-core" ,rust-futures-core-0.3)
                        ("rust-futures-io" ,rust-futures-io-0.3)
                        ("rust-futures-util" ,rust-futures-util-0.3)
-                       ("rust-gio-sys" ,rust-gio-sys-0.19)
-                       ("rust-glib" ,rust-glib-0.19)
+                       ("rust-gio-sys" ,rust-gio-sys-0.20)
+                       ("rust-glib" ,rust-glib-0.20)
                        ("rust-libc" ,rust-libc-0.2)
                        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
                        ("rust-smallvec" ,rust-smallvec-1)
@@ -1194,6 +1194,39 @@ (define-public rust-gio-0.19
     (description "This package provides Rust bindings for the Gio library.")
     (license license:expat)))
 
+(define-public rust-gio-0.19
+  (package
+    (inherit rust-gio-0.20)
+    (name "rust-gio")
+    (version "0.19.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gio" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1znz5ngfvv3gbndf6lzz3hs27hlb8ysls4axlfccrzvkscbz2jac"))))
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--"
+         "--skip=settings::test::bool_set_get"
+         "--skip=settings::test::string_get")
+       #:cargo-inputs (("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-futures-io" ,rust-futures-io-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-gio-sys" ,rust-gio-sys-0.19)
+                       ("rust-glib" ,rust-glib-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs
+       (("rust-futures" ,rust-futures-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-gir-format-check" ,rust-gir-format-check-0.1)
+        ("rust-serial-test" ,rust-serial-test-3))))))
+
 (define-public rust-gio-0.18
   (package
     (inherit rust-gio-0.19)
-- 
2.46.0

[bug#73956] [PATCH rust-team 17/27] gnu: Add rust-gdk-pixbuf-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gdk-pixbuf-0.20): New variable;
(rust-gdk-pixbuf-0.19): inherit from rust-gdk-pixbuf-0.20.

Change-Id: Icad085f2fdcb1221eb22d3afe620e0a3247bad59
---
 gnu/packages/crates-gtk.scm | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 39c2021985..a90570ca3e 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -634,22 +634,22 @@ (define-public rust-gdk-0.12
        #:cargo-development-inputs
        (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
 
-(define-public rust-gdk-pixbuf-0.19
+(define-public rust-gdk-pixbuf-0.20
   (package
     (name "rust-gdk-pixbuf")
-    (version "0.19.8")
+    (version "0.20.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "gdk-pixbuf" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "16c6kznkh3vi82843ays8awdm37fwjd1fblv6g3h64824shsnkk2"))))
+        (base32 "068vj60x1hbw0anhjvg2id3sr96d202wp18a4zc3f8z9m5qr1hn4"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.19)
-                       ("rust-gio" ,rust-gio-0.19)
-                       ("rust-glib" ,rust-glib-0.19)
+     `(#:cargo-inputs (("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.20)
+                       ("rust-gio" ,rust-gio-0.20)
+                       ("rust-glib" ,rust-glib-0.20)
                        ("rust-libc" ,rust-libc-0.2))
        #:cargo-development-inputs
        (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
@@ -661,6 +661,26 @@ (define-public rust-gdk-pixbuf-0.19
      "This package provides Rust bindings for the @code{GdkPixbuf} library.")
     (license license:expat)))
 
+(define-public rust-gdk-pixbuf-0.19
+  (package
+    (inherit rust-gdk-pixbuf-0.20)
+    (name "rust-gdk-pixbuf")
+    (version "0.19.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gdk-pixbuf" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "16c6kznkh3vi82843ays8awdm37fwjd1fblv6g3h64824shsnkk2"))))
+    (arguments
+     `(#:cargo-inputs (("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.19)
+                       ("rust-gio" ,rust-gio-0.19)
+                       ("rust-glib" ,rust-glib-0.19)
+                       ("rust-libc" ,rust-libc-0.2))
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
+
 (define-public rust-gdk-pixbuf-0.18
   (package
     (inherit rust-gdk-pixbuf-0.19)
-- 
2.46.0

[bug#73956] [PATCH rust-team 18/27] gnu: Add rust-pango-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-pango-0.20): New variable;
(rust-pango-0.19): inherit from rust-pango-0.20.

Change-Id: I9d06bcc3ddc380215212d807bfe7e8b6ffd3f090
---
 gnu/packages/crates-gtk.scm | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index a90570ca3e..dca6426abd 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -3292,23 +3292,23 @@ (define-public rust-libadwaita-sys-0.5
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))))))
 
-(define-public rust-pango-0.19
+(define-public rust-pango-0.20
   (package
     (name "rust-pango")
-    (version "0.19.8")
+    (version "0.20.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pango" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1kffxkk7730csly86fkgja50k1184zj9lz49sv7qb0059233439z"))))
+        (base32 "0mpkjnxcgng8mjf7y55q5d1md4qxswf90m5784hxg50hn5aal9ma"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-gio" ,rust-gio-0.19)
-                       ("rust-glib" ,rust-glib-0.19)
+     `(#:cargo-inputs (("rust-gio" ,rust-gio-0.20)
+                       ("rust-glib" ,rust-glib-0.20)
                        ("rust-libc" ,rust-libc-0.2)
-                       ("rust-pango-sys" ,rust-pango-sys-0.19))
+                       ("rust-pango-sys" ,rust-pango-sys-0.20))
        #:cargo-development-inputs
        (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
     (native-inputs (list pkg-config))
@@ -3318,6 +3318,26 @@ (define-public rust-pango-0.19
     (description "This package provides Rust bindings for the Pango library.")
     (license license:expat)))
 
+(define-public rust-pango-0.19
+  (package
+    (inherit rust-pango-0.20)
+    (name "rust-pango")
+    (version "0.19.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pango" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1kffxkk7730csly86fkgja50k1184zj9lz49sv7qb0059233439z"))))
+    (arguments
+     `(#:cargo-inputs (("rust-gio" ,rust-gio-0.19)
+                       ("rust-glib" ,rust-glib-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango-sys" ,rust-pango-sys-0.19))
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
+
 (define-public rust-pango-0.18
   (package
     (inherit rust-pango-0.19)
-- 
2.46.0

[bug#73956] [PATCH rust-team 19/27] gnu: Add rust-gdk4-sys-0.8.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gdk4-sys-0.8): New variable;
(rust-gdk4-sys-0.7): inherit from rust-gdk4-sys-0.8.

Change-Id: If4c314effafb342df87b1260a5c61c15d1f10b29
---
 gnu/packages/crates-gtk.scm | 41 +++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index dca6426abd..2c94824a77 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1143,8 +1143,40 @@ (define-public rust-gdk4-0.7
     (description "This package provides rust bindings of the GDK 4 library.")
     (license license:expat)))
 
+(define-public rust-gdk4-sys-0.8
+  (package
+    (name "rust-gdk4-sys")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gdk4-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1pb6vklx9ik7jx9cmrw2vywlx9ssqhll8q77ky8p8w56x2s8yhf9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.19)
+                       ("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.19)
+                       ("rust-gio-sys" ,rust-gio-sys-0.19)
+                       ("rust-glib-sys" ,rust-glib-sys-0.19)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango-sys" ,rust-pango-sys-0.19)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3)
+                       ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))
+    (native-inputs (list pkg-config))
+    (inputs (list cairo gdk-pixbuf glib gtk pango))
+    (home-page "https://gtk-rs.org/")
+    (synopsis "FFI bindings of GDK 4")
+    (description "This package provides FFI bindings of GDK 4.")
+    (license license:expat)))
+
 (define-public rust-gdk4-sys-0.7
   (package
+    (inherit rust-gdk4-sys-0.8)
     (name "rust-gdk4-sys")
     (version "0.7.2")
     (source
@@ -1154,7 +1186,6 @@ (define-public rust-gdk4-sys-0.7
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1w7yvir565sjrrw828lss07749hfpfsr19jdjzwivkx36brl7ayv"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f ; ‘GDK_MEMORY_A16’ undeclared
        #:cargo-inputs (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.18)
@@ -1167,13 +1198,7 @@ (define-public rust-gdk4-sys-0.7
                        ("rust-pkg-config" ,rust-pkg-config-0.3)
                        ("rust-system-deps" ,rust-system-deps-6))
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
-                                   ("rust-tempfile" ,rust-tempfile-3))))
-    (native-inputs (list pkg-config))
-    (inputs (list cairo gdk-pixbuf glib gtk pango))
-    (home-page "https://gtk-rs.org/")
-    (synopsis "FFI bindings of GDK 4")
-    (description "This package provides FFI bindings of GDK 4.")
-    (license license:expat)))
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-gio-0.20
   (package
-- 
2.46.0

[bug#73956] [PATCH rust-team 20/27] gnu: Add rust-gdk4-0.8.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gdk4-0.8): New variable;
(rust-gd4-0.7): inherit from rust-gdk4-0.8.

Change-Id: I66df513b683b44414e4994f0225dda6f391e3dad
---
 gnu/packages/crates-gtk.scm | 40 +++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 2c94824a77..d758f8ee92 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1112,8 +1112,39 @@ (define-public rust-gdk-sys-0.9
        (("rust-shell-words" ,rust-shell-words-0.1)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-gdk4-0.8
+  (package
+    (name "rust-gdk4")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gdk4" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "01qak43mrlszsy9cfsmqk1ql4228m2rylbg514g3fsidsjfmq9nv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cairo-rs" ,rust-cairo-rs-0.19)
+                       ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.19)
+                       ("rust-gdk4-sys" ,rust-gdk4-sys-0.8)
+                       ("rust-gio" ,rust-gio-0.19)
+                       ("rust-gl" ,rust-gl-0.14)
+                       ("rust-glib" ,rust-glib-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango" ,rust-pango-0.19))
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
+    (native-inputs (list pkg-config))
+    (inputs (list cairo gdk-pixbuf gtk))
+    (home-page "https://gtk-rs.org/")
+    (synopsis "Rust bindings of the GDK 4 library")
+    (description "This package provides rust bindings of the GDK 4 library.")
+    (license license:expat)))
+
 (define-public rust-gdk4-0.7
   (package
+    (inherit rust-gdk4-0.8)
     (name "rust-gdk4")
     (version "0.7.3")
     (source
@@ -1123,7 +1154,6 @@ (define-public rust-gdk4-0.7
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1xiacc63p73apr033gjrb9dsk0y4yxnsljwfxbwfry41snd03nvy"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f ; `Errors` doesn't implement `std::fmt::Display`
        #:cargo-inputs (("rust-cairo-rs" ,rust-cairo-rs-0.18)
@@ -1135,13 +1165,7 @@ (define-public rust-gdk4-0.7
                        ("rust-libc" ,rust-libc-0.2)
                        ("rust-pango" ,rust-pango-0.18))
        #:cargo-development-inputs
-       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
-    (native-inputs (list pkg-config))
-    (inputs (list cairo gdk-pixbuf gtk))
-    (home-page "https://gtk-rs.org/")
-    (synopsis "Rust bindings of the GDK 4 library")
-    (description "This package provides rust bindings of the GDK 4 library.")
-    (license license:expat)))
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
 
 (define-public rust-gdk4-sys-0.8
   (package
-- 
2.46.0

[bug#73956] [PATCH rust-team 21/27] gnu: Add rust-graphene-sys-0.19.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-graphene-sys-0.19): New variable;
(rust-graphene-sys-0.18): inherit from rust-graphene-sys-0.19.

Change-Id: I873e8f73c25d19626a3086bf3e7a2dce1e47c152
---
 gnu/packages/crates-gtk.scm | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index d758f8ee92..737dea33f9 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2591,20 +2591,26 @@ (define-public rust-graphene-rs-0.18
     (description "Rust bindings for the Graphene library.")
     (license license:expat)))
 
-(define-public rust-graphene-sys-0.18
+(define-public rust-graphene-sys-0.19
   (package
     (name "rust-graphene-sys")
-    (version "0.18.1")
+    (version "0.19.8")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "graphene-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0n8zlg7z26lwpnvlqp1hjlgrs671skqwagdpm7r8i1zwx3748hfc"))))
+        (base32 "01dg4wgqxaqkdv0vl7hr14b6kbbm96gwdsb5a2ss9jxw8h4hwlrg"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (substitute* "Cargo.toml"
+             ;; Patch rust-pkg-config version.
+             (("version = \"0.3.29\"") "version = \">= 0.3.27\""))))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.18)
+     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19)
                        ("rust-libc" ,rust-libc-0.2)
                        ("rust-pkg-config" ,rust-pkg-config-0.3)
                        ("rust-system-deps" ,rust-system-deps-6))
@@ -2617,6 +2623,26 @@ (define-public rust-graphene-sys-0.18
     (description "FFI bindings to libgraphene-1.0.")
     (license license:expat)))
 
+(define-public rust-graphene-sys-0.18
+  (package
+    (inherit rust-graphene-sys-0.19)
+    (name "rust-graphene-sys")
+    (version "0.18.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "graphene-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0n8zlg7z26lwpnvlqp1hjlgrs671skqwagdpm7r8i1zwx3748hfc"))))
+    (arguments
+     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.18)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3)
+                       ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-gsk4-0.7
   (package
     (name "rust-gsk4")
-- 
2.46.0

[bug#73956] [PATCH rust-team 22/27] gnu: Add rust-gsk4-sys-0.8.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gsk4-sys-0.8): New variable;
(rust-gsk4-sys-0.7): inherit from rust-gsk4-sys-0.8.

Change-Id: I2a54b556fecca7f942b4843885b12307f6cf35af
---
 gnu/packages/crates-gtk.scm | 40 +++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 737dea33f9..b17211a6a6 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2673,8 +2673,39 @@ (define-public rust-gsk4-0.7
     (description "Rust bindings of the GSK 4 library.")
     (license license:expat)))
 
+(define-public rust-gsk4-sys-0.8
+  (package
+    (name "rust-gsk4-sys")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gsk4-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1p5kf912s8qs38lhzzwnm26v498wkp68mx92z38vnf3ccgr4n0i3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.19)
+                       ("rust-gdk4-sys" ,rust-gdk4-sys-0.8)
+                       ("rust-glib-sys" ,rust-glib-sys-0.19)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+                       ("rust-graphene-sys" ,rust-graphene-sys-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango-sys" ,rust-pango-sys-0.19)
+                       ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))
+    (native-inputs (list pkg-config))
+    (inputs (list cairo gdk-pixbuf graphene gtk pango))
+    (home-page "https://gtk-rs.org/")
+    (synopsis "FFI bindings of GSK 4")
+    (description "This package provides FFI bindings of GSK 4.")
+    (license license:expat)))
+
 (define-public rust-gsk4-sys-0.7
   (package
+    (inherit rust-gsk4-sys-0.8)
     (name "rust-gsk4-sys")
     (version "0.7.3")
     (source
@@ -2684,7 +2715,6 @@ (define-public rust-gsk4-sys-0.7
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0mbdlm9qi1hql48rr29vsj9vlqwc7gxg67wg1q19z67azwz9xg8j"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f  ; `GskFillRule` undeclared
        #:cargo-inputs (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.18)
@@ -2696,13 +2726,7 @@ (define-public rust-gsk4-sys-0.7
                        ("rust-pango-sys" ,rust-pango-sys-0.18)
                        ("rust-system-deps" ,rust-system-deps-6))
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
-                                   ("rust-tempfile" ,rust-tempfile-3))))
-    (native-inputs (list pkg-config))
-    (inputs (list cairo gdk-pixbuf graphene gtk pango))
-    (home-page "https://gtk-rs.org/")
-    (synopsis "FFI bindings of GSK 4")
-    (description "This package provides FFI bindings of GSK 4.")
-    (license license:expat)))
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-gstreamer-0.18
   (package
-- 
2.46.0

[bug#73956] [PATCH rust-team 23/27] gnu: Add rust-graphene-rs-0.19.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-graphene-rs-0.19): New variable;
(rust-graphene-rs-0.18): inherit from rust-graphene-rs-0.19.

Change-Id: Icb7bda2bc9268dee0b13d9e264b4390ddecdfbd5
---
 gnu/packages/crates-gtk.scm | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index b17211a6a6..e641d1a3ca 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2565,22 +2565,21 @@ (define-public rust-gobject-sys-0.9
        (("rust-shell-words" ,rust-shell-words-0.1)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
-(define-public rust-graphene-rs-0.18
+(define-public rust-graphene-rs-0.19
   (package
     (name "rust-graphene-rs")
-    (version "0.18.1")
+    (version "0.19.8")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "graphene-rs" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "00f4q1ra4haap5i7lazwhkdgnb49fs8adk2nm6ki6mjhl76jh8iv"))))
+        (base32 "1krblj6kbnixgkmz2b3494jmlm2xlv3qz5qm585frn943l1qdyzm"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f ; `Errors` doesn't implement `std::fmt::Display`
-       #:cargo-inputs (("rust-glib" ,rust-glib-0.18)
-                       ("rust-graphene-sys" ,rust-graphene-sys-0.18)
+     `(#:cargo-inputs (("rust-glib" ,rust-glib-0.19)
+                       ("rust-graphene-sys" ,rust-graphene-sys-0.19)
                        ("rust-libc" ,rust-libc-0.2))
        #:cargo-development-inputs
        (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
@@ -2591,6 +2590,26 @@ (define-public rust-graphene-rs-0.18
     (description "Rust bindings for the Graphene library.")
     (license license:expat)))
 
+(define-public rust-graphene-rs-0.18
+  (package
+    (inherit rust-graphene-rs-0.19)
+    (name "rust-graphene-rs")
+    (version "0.18.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "graphene-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "00f4q1ra4haap5i7lazwhkdgnb49fs8adk2nm6ki6mjhl76jh8iv"))))
+    (arguments
+     `(#:tests? #f ; `Errors` doesn't implement `std::fmt::Display`
+       #:cargo-inputs (("rust-glib" ,rust-glib-0.18)
+                       ("rust-graphene-sys" ,rust-graphene-sys-0.18)
+                       ("rust-libc" ,rust-libc-0.2))
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
+
 (define-public rust-graphene-sys-0.19
   (package
     (name "rust-graphene-sys")
-- 
2.46.0

[bug#73956] [PATCH rust-team 24/27] gnu: Add rust-gsk4-0.8.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gsk4-0.8): New variable;
(rust-gsk4-0.7): inherit from rust-gsk4-0.8.

Change-Id: Ief5de9ea607e6dd2be132cf98b177ecb315fd5c1
---
 gnu/packages/crates-gtk.scm | 39 +++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index e641d1a3ca..86feff444e 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2662,8 +2662,38 @@ (define-public rust-graphene-sys-0.18
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-gsk4-0.8
+  (package
+    (name "rust-gsk4")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gsk4" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1gi1f9s2nd5m2zfwb91vijpzr6nxbfa58inrwml497wkyr5qhqvm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cairo-rs" ,rust-cairo-rs-0.19)
+                       ("rust-gdk4" ,rust-gdk4-0.8)
+                       ("rust-glib" ,rust-glib-0.19)
+                       ("rust-graphene-rs" ,rust-graphene-rs-0.19)
+                       ("rust-gsk4-sys" ,rust-gsk4-sys-0.8)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango" ,rust-pango-0.19))
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
+    (native-inputs (list pkg-config))
+    (inputs (list gtk))
+    (home-page "https://gtk-rs.org/")
+    (synopsis "Rust bindings of the GSK 4 library")
+    (description "Rust bindings of the GSK 4 library.")
+    (license license:expat)))
+
 (define-public rust-gsk4-0.7
   (package
+    (inherit rust-gsk4-0.8)
     (name "rust-gsk4")
     (version "0.7.3")
     (source
@@ -2673,7 +2703,6 @@ (define-public rust-gsk4-0.7
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0zhzs2dkgiinhgc11akpn2harq3x5n1iq21dnc4h689g3lsqx58d"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f  ; `Errors` doesn't implement `std::fmt::Display`
        #:cargo-inputs (("rust-cairo-rs" ,rust-cairo-rs-0.18)
@@ -2684,13 +2713,7 @@ (define-public rust-gsk4-0.7
                        ("rust-libc" ,rust-libc-0.2)
                        ("rust-pango" ,rust-pango-0.18))
        #:cargo-development-inputs
-       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
-    (native-inputs (list pkg-config))
-    (inputs (list gtk))
-    (home-page "https://gtk-rs.org/")
-    (synopsis "Rust bindings of the GSK 4 library")
-    (description "Rust bindings of the GSK 4 library.")
-    (license license:expat)))
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
 
 (define-public rust-gsk4-sys-0.8
   (package
-- 
2.46.0

[bug#73956] [PATCH rust-team 25/27] gnu: Add rust-gtk4-sys-0.8.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gtk4-sys-0.8): New variable;
(rust-gtk4-sys-0.7): intherit from rust-gtk4-sys-0.8.

Change-Id: Id31435c704b9163d77e8a4d8f017bc630ac1788a
---
 gnu/packages/crates-gtk.scm | 38 +++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 86feff444e..3ff52856e1 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -3315,8 +3315,43 @@ (define-public rust-gtk4-macros-0.7
     (description "Macros helpers for GTK 4 bindings.")
     (license license:expat)))
 
+(define-public rust-gtk4-sys-0.8
+  (package
+    (name "rust-gtk4-sys")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gtk4-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1dapgvbkhf0kcm2jfmj8r98wzyhwmr5iv358dvb73sl5gxmsi2lc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ; Can't find gtk/gtk-a11y.h from gtk+
+       #:cargo-inputs (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.19)
+                       ("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.19)
+                       ("rust-gdk4-sys" ,rust-gdk4-sys-0.8)
+                       ("rust-gio-sys" ,rust-gio-sys-0.19)
+                       ("rust-glib-sys" ,rust-glib-sys-0.19)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+                       ("rust-graphene-sys" ,rust-graphene-sys-0.19)
+                       ("rust-gsk4-sys" ,rust-gsk4-sys-0.8)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango-sys" ,rust-pango-sys-0.19)
+                       ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))
+    (native-inputs (list pkg-config))
+    (inputs (list cairo gdk-pixbuf graphene gtk pango))
+    (home-page "https://gtk-rs.org/")
+    (synopsis "FFI bindings of GTK 4")
+    (description "This package provides FFI bindings of GTK 4.")
+    (license license:expat)))
+
 (define-public rust-gtk4-sys-0.7
   (package
+    (inherit rust-gtk4-sys-0.8)
     (name "rust-gtk4-sys")
     (version "0.7.3")
     (source
@@ -3326,7 +3361,6 @@ (define-public rust-gtk4-sys-0.7
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1f2ylskyqkjdik9fij2m46pra4jagnif5xyalbxfk3334fmc9n2l"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f ; Can't find gtk/gtk-a11y.h from gtk+
        #:cargo-inputs (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.18)
@@ -3341,7 +3375,7 @@ (define-public rust-gtk4-sys-0.7
                        ("rust-pango-sys" ,rust-pango-sys-0.18)
                        ("rust-system-deps" ,rust-system-deps-6))
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
-                                   ("rust-tempfile" ,rust-tempfile-3))))
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
     (native-inputs (list pkg-config))
     (inputs (list cairo gdk-pixbuf graphene gtk pango))
     (home-page "https://gtk-rs.org/")
-- 
2.46.0

[bug#73956] [PATCH rust-team 26/27] gnu: Add rust-gtk4-0.8 and rust-gtk4-macros-0.8.

[Giacomo Leidi via Guix-patches via]

rust-gtk4 and rust-gtk4-macros are mutually dependent, this is why this
commit addresses both of them instead of having two separate commits, as
is usually done in Guix.

* gnu/packages/crates-gtk.scm (rust-gtk4-0.8): New variable;
(rust-gtk4-macros-0.8): new variable;
(rust-gtk4-0.7): inherit from rust-gtk4-0.8;
(rust-gtk4-macros-0.7): inherit from rust-gtk4-macros-0.8.

Change-Id: I9e327d6ae32cb6142dac87f8cb6a2249ab9407ac
---
 gnu/packages/crates-gtk.scm | 83 +++++++++++++++++++++++++++++++------
 1 file changed, 70 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 3ff52856e1..d73dbda005 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -3246,8 +3246,45 @@ (define-public rust-gtk3-macros-0.14
 library.")
     (license license:expat)))
 
+(define-public rust-gtk4-0.8
+  (package
+    (name "rust-gtk4")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gtk4" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1avinslgnsz3wywf4dfaza8w9c29krd10hxmi8si3bq8kcqi2kmh"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f  ; Failed to initialize GTK
+       #:cargo-inputs (("rust-cairo-rs" ,rust-cairo-rs-0.19)
+                       ("rust-field-offset" ,rust-field-offset-0.3)
+                       ("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.19)
+                       ("rust-gdk4" ,rust-gdk4-0.8)
+                       ("rust-gio" ,rust-gio-0.19)
+                       ("rust-glib" ,rust-glib-0.19)
+                       ("rust-graphene-rs" ,rust-graphene-rs-0.19)
+                       ("rust-gsk4" ,rust-gsk4-0.8)
+                       ("rust-gtk4-macros" ,rust-gtk4-macros-0.8)
+                       ("rust-gtk4-sys" ,rust-gtk4-sys-0.8)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango" ,rust-pango-0.19))
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
+    (native-inputs (list pkg-config))
+    (inputs (list cairo glib gtk))
+    (home-page "https://gtk-rs.org/")
+    (synopsis "Rust bindings of the GTK 4 library")
+    (description "Rust bindings of the GTK 4 library.")
+    (license license:expat)))
+
 (define-public rust-gtk4-0.7
   (package
+    (inherit rust-gtk4-0.8)
     (name "rust-gtk4")
     (version "0.7.3")
     (source
@@ -3257,7 +3294,6 @@ (define-public rust-gtk4-0.7
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0hh8nzglmz94v1m1h6vy8z12m6fr7ia467ry0md5fa4p7sm53sss"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f ; `Errors` doesn't implement `std::fmt::Display`
        #:cargo-inputs (("rust-cairo-rs" ,rust-cairo-rs-0.18)
@@ -3274,16 +3310,44 @@ (define-public rust-gtk4-0.7
                        ("rust-libc" ,rust-libc-0.2)
                        ("rust-pango" ,rust-pango-0.18))
        #:cargo-development-inputs
-       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
+
+(define-public rust-gtk4-macros-0.8
+  (package
+    (name "rust-gtk4-macros")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gtk4-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0214a8y68kknxcnihsfxwsqvll7ss2rbiplr51cyk34dz1z5lrgc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f  ; Failed to initialize GTK
+       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-proc-macro-crate" ,rust-proc-macro-crate-3)
+                       ("rust-proc-macro-error" ,rust-proc-macro-error-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quick-xml" ,rust-quick-xml-0.31)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-gtk4" ,rust-gtk4-0.8)
+                       ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs (("rust-futures-channel" ,rust-futures-channel-0.3)
+                                   ("rust-futures-util" ,rust-futures-util-0.3)
+                                   ("rust-gtk4" ,rust-gtk4-0.7)
+                                   ("rust-trybuild2" ,rust-trybuild2-1))))
     (native-inputs (list pkg-config))
-    (inputs (list cairo glib gtk))
+    (inputs (list gdk-pixbuf gtk))
     (home-page "https://gtk-rs.org/")
-    (synopsis "Rust bindings of the GTK 4 library")
-    (description "Rust bindings of the GTK 4 library.")
+    (synopsis "Macros helpers for GTK 4 bindings")
+    (description "Macros helpers for GTK 4 bindings.")
     (license license:expat)))
 
 (define-public rust-gtk4-macros-0.7
   (package
+    (inherit rust-gtk4-macros-0.8)
     (name "rust-gtk4-macros")
     (version "0.7.2")
     (source
@@ -3293,7 +3357,6 @@ (define-public rust-gtk4-macros-0.7
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0bw3cchiycf7dw1bw4p8946gv38azxy05a5w0ndgcmxnz6fc8znm"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f  ; Failed to initialize GTK
        #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
@@ -3307,13 +3370,7 @@ (define-public rust-gtk4-macros-0.7
        #:cargo-development-inputs (("rust-futures-channel" ,rust-futures-channel-0.3)
                                    ("rust-futures-util" ,rust-futures-util-0.3)
                                    ("rust-gtk4" ,rust-gtk4-0.7)
-                                   ("rust-trybuild2" ,rust-trybuild2-1))))
-    (native-inputs (list pkg-config))
-    (inputs (list gdk-pixbuf gtk))
-    (home-page "https://gtk-rs.org/")
-    (synopsis "Macros helpers for GTK 4 bindings")
-    (description "Macros helpers for GTK 4 bindings.")
-    (license license:expat)))
+                                   ("rust-trybuild2" ,rust-trybuild2-1))))))
 
 (define-public rust-gtk4-sys-0.8
   (package
-- 
2.46.0

[bug#73956] [PATCH rust-team 27/27] gnu: Add rust-libadwaita-0.6.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-libadwaita-0.6): New variable;
(rust-libadwaita-0.5): inherit from rust-libadwaita-0.6.

Change-Id: I3244ee4e3114cdc1a61a1f0e4e1e1f165c131707
---
 gnu/packages/crates-gtk.scm | 40 ++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index d73dbda005..0cc0a3b998 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -3433,15 +3433,38 @@ (define-public rust-gtk4-sys-0.7
                        ("rust-system-deps" ,rust-system-deps-6))
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))))))
+
+(define-public rust-libadwaita-0.6
+  (package
+    (name "rust-libadwaita")
+    (version "0.6.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libadwaita" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0955c0zryz7xjkkrvbn6z4lmlqgf1vykjbnjndapbcni38zz1zyv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.20)
+                       ("rust-gdk4" ,rust-gdk4-0.7)
+                       ("rust-gio" ,rust-gio-0.20)
+                       ("rust-glib" ,rust-glib-0.20)
+                       ("rust-gtk4" ,rust-gtk4-0.7)
+                       ("rust-libadwaita-sys" ,rust-libadwaita-sys-0.6)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango" ,rust-pango-0.20))))
     (native-inputs (list pkg-config))
-    (inputs (list cairo gdk-pixbuf graphene gtk pango))
-    (home-page "https://gtk-rs.org/")
-    (synopsis "FFI bindings of GTK 4")
-    (description "This package provides FFI bindings of GTK 4.")
+    (inputs (list libadwaita))
+    (home-page "https://world.pages.gitlab.gnome.org/Rust/libadwaita-rs")
+    (synopsis "Rust bindings for libadwaita")
+    (description "Rust bindings for libadwaita.")
     (license license:expat)))
 
 (define-public rust-libadwaita-0.5
   (package
+    (inherit rust-libadwaita-0.6)
     (name "rust-libadwaita")
     (version "0.5.3")
     (source
@@ -3451,7 +3474,6 @@ (define-public rust-libadwaita-0.5
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "174pzn9dwsk8ikvrhx13vkh0zrpvb3rhg9yd2q5d2zjh0q6fgrrg"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.18)
                        ("rust-gdk4" ,rust-gdk4-0.7)
@@ -3460,13 +3482,7 @@ (define-public rust-libadwaita-0.5
                        ("rust-gtk4" ,rust-gtk4-0.7)
                        ("rust-libadwaita-sys" ,rust-libadwaita-sys-0.5)
                        ("rust-libc" ,rust-libc-0.2)
-                       ("rust-pango" ,rust-pango-0.18))))
-    (native-inputs (list pkg-config))
-    (inputs (list libadwaita))
-    (home-page "https://world.pages.gitlab.gnome.org/Rust/libadwaita-rs")
-    (synopsis "Rust bindings for libadwaita")
-    (description "Rust bindings for libadwaita.")
-    (license license:expat)))
+                       ("rust-pango" ,rust-pango-0.18))))))
 
 (define-public rust-libadwaita-sys-0.6
   (package
-- 
2.46.0

[bug#73956] [PATCH rust-team] Add rust-libadwaita-0.6

[paul via Guix-patches via]

Hi Guix,

this is the first patchest required to build GNOME Authenticator in 
Guix. It adds rust-libadwaita-0.6 and dependencies. This is a v2 rebased 
on current rust-team branch.

Thank you for your work and please let me know if I can help get the 
review burden easier somehow!

Cheers

giacomo

[bug#73956] [PATCHv2 rust-team 01/27] gnu: Add rust-cfg-expr-0.17.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-cfg-expr-0.17): New variable.
(rust-cfg-expr-0.15): inherit from rust-cfg-expr-0.17.

Change-Id: I540636bc6f1ab66f7ca238bf4e90fb2917308241
---
 gnu/packages/crates-io.scm | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7dbfeba216..a17a951b21 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12266,17 +12266,17 @@ (define-public rust-cfg-aliases-0.1
        (sha256
         (base32 "17p821nc6jm830vzl2lmwz60g3a30hcm33nk6l257i1rjdqw85px"))))))
 
-(define-public rust-cfg-expr-0.15
+(define-public rust-cfg-expr-0.17
   (package
     (name "rust-cfg-expr")
-    (version "0.15.8")
+    (version "0.17.0")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "cfg-expr" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "00lgf717pmf5qd2qsxxzs815v6baqg38d6m5i6wlh235p14asryh"))))
+                "174y5f7035cx99d83hn1m97xd5xr83nd5fpkcxr3w8nkqihh12fh"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -12291,6 +12291,25 @@ (define-public rust-cfg-expr-0.15
 expressions.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-cfg-expr-0.15
+  (package
+    (inherit rust-cfg-expr-0.17)
+    (name "rust-cfg-expr")
+    (version "0.15.8")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "cfg-expr" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "00lgf717pmf5qd2qsxxzs815v6baqg38d6m5i6wlh235p14asryh"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-smallvec" ,rust-smallvec-1)
+        ("rust-target-lexicon" ,rust-target-lexicon-0.12))
+       #:cargo-development-inputs
+       (("rust-similar-asserts" ,rust-similar-asserts-1))))))
+
 (define-public rust-cfg-expr-0.10
   (package
     (inherit rust-cfg-expr-0.15)

base-commit: e195626f6cc2ebff68d78d23a033ec4ebbf04973
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 02/27] gnu: Add rust-system-deps-7.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-system-deps-7): New variable;
(rust-system-deps-6): inherit from rust-system-deps-6.

Change-Id: I28dd3c7406fbd1656e8df77bae0b38a71c91f07b
---
 gnu/packages/crates-io.scm | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a17a951b21..d459c936d0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -80028,31 +80028,31 @@ (define-public rust-syslog-3
         ("rust-log" ,rust-log-0.3)
         ("rust-unix-socket" ,rust-unix-socket-0.5))))))
 
-(define-public rust-system-deps-6
+(define-public rust-system-deps-7
   (package
     (name "rust-system-deps")
-    (version "6.2.2")
+    (version "7.0.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "system-deps" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0j93ryw031n3h8b0nfpj5xwh3ify636xmv8kxianvlyyipmkbrd3"))
+        (base32 "01d0fllzpkfybzadyaq1vlx70imzj56dxs4rk9w2f4ikkypkmlk6"))
        (snippet
         #~(begin (delete-file "src/tests/lib/libteststatic.a")))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f                      ;source is missing some test files
        #:cargo-inputs
-       (("rust-cfg-expr" ,rust-cfg-expr-0.15)
+       (("rust-cfg-expr" ,rust-cfg-expr-0.17)
         ("rust-heck" ,rust-heck-0.5)
         ("rust-pkg-config" ,rust-pkg-config-0.3)
         ("rust-toml" ,rust-toml-0.8)
         ("rust-version-compare" ,rust-version-compare-0.2))
        #:cargo-development-inputs
        (("rust-assert-matches" ,rust-assert-matches-1)
-        ("rust-itertools" ,rust-itertools-0.12)
+        ("rust-itertools" ,rust-itertools-0.13)
         ("rust-lazy-static" ,rust-lazy-static-1))))
     (home-page "https://github.com/gdesmott/system-deps")
     (synopsis "Define system dependencies in @file{Cargo.toml}")
@@ -80062,6 +80062,33 @@ (define-public rust-system-deps-6
 well.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-system-deps-6
+  (package
+    (inherit rust-system-deps-7)
+    (name "rust-system-deps")
+    (version "6.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "system-deps" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0j93ryw031n3h8b0nfpj5xwh3ify636xmv8kxianvlyyipmkbrd3"))
+       (snippet
+        #~(begin (delete-file "src/tests/lib/libteststatic.a")))))
+    (arguments
+     `(#:tests? #f                      ;source is missing some test files
+       #:cargo-inputs
+       (("rust-cfg-expr" ,rust-cfg-expr-0.15)
+        ("rust-heck" ,rust-heck-0.5)
+        ("rust-pkg-config" ,rust-pkg-config-0.3)
+        ("rust-toml" ,rust-toml-0.8)
+        ("rust-version-compare" ,rust-version-compare-0.2))
+       #:cargo-development-inputs
+       (("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-itertools" ,rust-itertools-0.12)
+        ("rust-lazy-static" ,rust-lazy-static-1))))))
+
 (define-public rust-system-deps-3
   (package
     (inherit rust-system-deps-6)
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 03/27] gnu: Add rust-glib-sys-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-glib-sys-0.20): New variable;
(rust-glib-sys-0.19): inherit from rust-glib-sys-0.20.

Change-Id: I8191a5a11ac63d20b6e69366469c58bbefef66e2
---
 gnu/packages/crates-gtk.scm | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index b46b0945b0..0a13970983 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1948,24 +1948,24 @@ (define-public rust-glib-macros-0.10
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))))
 
-(define-public rust-glib-sys-0.19
+(define-public rust-glib-sys-0.20
   (package
     (name "rust-glib-sys")
-    (version "0.19.8")
+    (version "0.20.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "glib-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "19f4q8x77vd7c1d9ikw492yskq5kpd7k04qb8xnh1c427a6w2baw"))))
+        (base32 "0avm6dr3q2xvlad7fcbq7an7qasaqf3k480dn19s99ngi1fwm7jz"))))
     (build-system cargo-build-system)
     (arguments
      `(;; XXX: Tests are sensitive to the version of glib, even though
        ;; the library supports a wide range.  Skip for now.
        #:tests? #f
        #:cargo-inputs (("rust-libc" ,rust-libc-0.2)
-                       ("rust-system-deps" ,rust-system-deps-6))
+                       ("rust-system-deps" ,rust-system-deps-7))
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))))
     (native-inputs (list pkg-config))
@@ -1975,6 +1975,27 @@ (define-public rust-glib-sys-0.19
     (description "This package provides FFI bindings to libglib-2.0.")
     (license license:expat)))
 
+(define-public rust-glib-sys-0.19
+  (package
+    (inherit rust-glib-sys-0.20)
+    (name "rust-glib-sys")
+    (version "0.19.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "glib-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "19f4q8x77vd7c1d9ikw492yskq5kpd7k04qb8xnh1c427a6w2baw"))))
+    (arguments
+     `(;; XXX: Tests are sensitive to the version of glib, even though
+       ;; the library supports a wide range.  Skip for now.
+       #:tests? #f
+       #:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+                       ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-glib-sys-0.18
   (package
     (inherit rust-glib-sys-0.19)
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 04/27] gnu: Add rust-bitflags-2.6.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-bitflags-2.6): New variable;
(rust-bitflags-2): inherit from rust-bitflags-2.6.

Change-Id: Ic8935500734edb26da6c1dcb529715308729f266
---
 gnu/packages/crates-io.scm | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d459c936d0..dd78521655 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8264,17 +8264,17 @@ (define-public rust-bitfield-0.14
      "This Rust crate provides macros to generate bitfield-like struct.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-bitflags-2
+(define-public rust-bitflags-2.6
   (package
     (name "rust-bitflags")
-    (version "2.5.0")
+    (version "2.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "bitflags" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1h91vdx1il069vdiiissj8ymzj130rbiic0dbs77yxjgjim9sjyg"))))
+        (base32 "1pkidwzn3hnxlsl8zizh0bncgbjnw7c41cx7bby26ncbzmiznj5h"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; Not all files included.
@@ -8300,6 +8300,36 @@ (define-public rust-bitflags-2
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-bitflags-2
+  (package
+    (inherit rust-bitflags-2.6)
+    (name "rust-bitflags")
+    (version "2.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "bitflags" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1h91vdx1il069vdiiissj8ymzj130rbiic0dbs77yxjgjim9sjyg"))))
+    (arguments
+     `(#:tests? #f      ; Not all files included.
+       #:cargo-inputs
+       (("rust-arbitrary" ,rust-arbitrary-1)
+        ("rust-bytemuck" ,rust-bytemuck-1)
+        ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
+        ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-arbitrary" ,rust-arbitrary-1)
+        ("rust-bytemuck" ,rust-bytemuck-1)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-serde-test" ,rust-serde-test-1)
+        ("rust-trybuild" ,rust-trybuild-1)
+        ("rust-zerocopy" ,rust-zerocopy-0.6))))))
+
 (define-public rust-bitflags-1
   (package
     (inherit rust-bitflags-2)
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 05/27] gnu: Add rust-gobject-sys-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gobject-sys-0.20): New variable;
(rust-gobject-sys-0.19): inherit from rust-gobject-sys-0.20.

Change-Id: I05a5b63039af42946de6f371d743b34e8fe9bce9
---
 gnu/packages/crates-gtk.scm | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 0a13970983..f08b2f5105 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2122,22 +2122,22 @@ (define-public rust-glib-sys-0.9
        (("rust-shell-words" ,rust-shell-words-0.1)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
-(define-public rust-gobject-sys-0.19
+(define-public rust-gobject-sys-0.20
   (package
     (name "rust-gobject-sys")
-    (version "0.19.8")
+    (version "0.20.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "gobject-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "17lb7dfbpcg8zchwlfbc08kckwf0a7d9n5ly3pyic13f5ljpws9f"))))
+        (base32 "0qk4d5ifybf5cnsv8bss85afz7vpxlqffawxq87cyy44zz979im4"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19)
+     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.20)
                        ("rust-libc" ,rust-libc-0.2)
-                       ("rust-system-deps" ,rust-system-deps-6))
+                       ("rust-system-deps" ,rust-system-deps-7))
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))))
     (native-inputs (list pkg-config))
@@ -2147,6 +2147,25 @@ (define-public rust-gobject-sys-0.19
     (description "This package provides FFI bindings to libgobject-2.0.")
     (license license:expat)))
 
+(define-public rust-gobject-sys-0.19
+  (package
+    (inherit rust-gobject-sys-0.20)
+    (name "rust-gobject-sys")
+    (version "0.19.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gobject-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "17lb7dfbpcg8zchwlfbc08kckwf0a7d9n5ly3pyic13f5ljpws9f"))))
+    (arguments
+     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-gobject-sys-0.18
   (package
     (inherit rust-gobject-sys-0.19)
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 06/27] gnu: Add rust-gio-sys-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gio-sys-0.20): New variable;
(rust-gio-sys-0.19): inherit from rust-gio-sys-0.20.

Change-Id: Iededb3836d87b3098be7e9893d19f892aad611c0
---
 gnu/packages/crates-gtk.scm | 45 ++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index f08b2f5105..9ef2ba62a7 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1325,26 +1325,26 @@ (define-public rust-gio-0.8
         ("rust-serial-test" ,rust-serial-test-0.1)
         ("rust-serial-test-derive" ,rust-serial-test-derive-0.1))))))
 
-(define-public rust-gio-sys-0.19
+(define-public rust-gio-sys-0.20
   (package
     (name "rust-gio-sys")
-    (version "0.19.8")
+    (version "0.20.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "gio-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1vylsskpipfwl7mvffp1s0227d0k5amyhd32dfnp3mhl8yx47mrc"))))
+        (base32 "0ya7i4m3jirrhryy6h8x5kgp3fxn6m4111009ws5aiz0ilvgqzjg"))))
     (build-system cargo-build-system)
     (arguments
      `(;; XXX: Tests are sensitive to the version of glib, even though
        ;; the library supports a wide range.  Skip for now.
        #:tests? #f
-       #:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19)
-                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+       #:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.20)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.20)
                        ("rust-libc" ,rust-libc-0.2)
-                       ("rust-system-deps" ,rust-system-deps-6)
+                       ("rust-system-deps" ,rust-system-deps-7)
                        ("rust-windows-sys" ,rust-windows-sys-0.52))
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))
@@ -1364,6 +1364,39 @@ (define-public rust-gio-sys-0.19
     (description "This package provides FFI bindings to libgio-2.0.")
     (license license:expat)))
 
+(define-public rust-gio-sys-0.19
+  (package
+    (inherit rust-gio-sys-0.20)
+    (name "rust-gio-sys")
+    (version "0.19.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gio-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1vylsskpipfwl7mvffp1s0227d0k5amyhd32dfnp3mhl8yx47mrc"))))
+    (arguments
+     `(;; XXX: Tests are sensitive to the version of glib, even though
+       ;; the library supports a wide range.  Skip for now.
+       #:tests? #f
+       #:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-system-deps" ,rust-system-deps-6)
+                       ("rust-windows-sys" ,rust-windows-sys-0.52))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))
+       #:phases (modify-phases %standard-phases
+                  (add-before 'check 'extend-include-path
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      (let ((gio-headers (search-input-directory
+                                          inputs "include/gio-unix-2.0")))
+                        ;; Tests rely on these headers.
+                        (setenv "C_INCLUDE_PATH"
+                                (string-append gio-headers ":"
+                                               (getenv "C_INCLUDE_PATH")))))))))))
+
 (define-public rust-gio-sys-0.18
   (package
     (inherit rust-gio-sys-0.19)
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 07/27] gnu: Add rust-glib-macros-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-glib-macros-0.20): New variable;
(rust-glib-macros-0.19): inherit from rust-glib-macros-0.20.

Change-Id: I07a067580461208e78f059dbcfcde5c99e90554c
---
 gnu/packages/crates-gtk.scm | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 9ef2ba62a7..1cb41e3527 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1829,17 +1829,22 @@ (define-public rust-glib-0.9
        #:cargo-development-inputs
        (("rust-tempfile" ,rust-tempfile-3))))))
 
-(define-public rust-glib-macros-0.19
+(define-public rust-glib-macros-0.20
   (package
     (name "rust-glib-macros")
-    (version "0.19.9")
+    (version "0.20.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "glib-macros" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1mzsh8jkg8vldvgvr9gsaidvn2myn5cbdn8a6m8rgbhlg8kv0aa4"))))
+        (base32 "1mqwhk5qnd9vbvsb335n1j6m5pbqnfycm7b3jxhhlwnm1kvqigx6"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (substitute* "Cargo.toml"
+             (("version = \"2.0.68\"") "version = \">= 2.0\""))))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-heck" ,rust-heck-0.5)
@@ -1847,7 +1852,7 @@ (define-public rust-glib-macros-0.19
                        ("rust-proc-macro2" ,rust-proc-macro2-1)
                        ("rust-quote" ,rust-quote-1)
                        ("rust-syn" ,rust-syn-2))
-       #:cargo-development-inputs (("rust-glib" ,rust-glib-0.19)
+       #:cargo-development-inputs (("rust-glib" ,rust-glib-0.20)
                                    ("rust-trybuild2" ,rust-trybuild2-1))))
     (native-inputs (list pkg-config))
     (inputs (list glib))
@@ -1857,6 +1862,27 @@ (define-public rust-glib-macros-0.19
      "This package provides Rust bindings for the GLib library, proc macros crate.")
     (license license:expat)))
 
+(define-public rust-glib-macros-0.19
+  (package
+    (inherit rust-glib-macros-0.20)
+    (name "rust-glib-macros")
+    (version "0.19.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "glib-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1mzsh8jkg8vldvgvr9gsaidvn2myn5cbdn8a6m8rgbhlg8kv0aa4"))))
+    (arguments
+     `(#:cargo-inputs (("rust-heck" ,rust-heck-0.5)
+                       ("rust-proc-macro-crate" ,rust-proc-macro-crate-3)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))
+       #:cargo-development-inputs (("rust-glib" ,rust-glib-0.19)
+                                   ("rust-trybuild2" ,rust-trybuild2-1))))))
+
 (define-public rust-glib-macros-0.18
   (package
     (inherit rust-glib-macros-0.19)
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 08/27] gnu: Add rust-glib-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-glib-0.20): New variable.
(rust-glib-0.19): inherit from rust-glib-0.20.

Change-Id: I3b25b24922d7fed60376c82f21f3c3ff16a1cc55
---
 gnu/packages/crates-gtk.scm | 53 +++++++++++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 1cb41e3527..5dcb9ec6d2 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1586,32 +1586,32 @@ (define-public rust-gir-format-check-0.1
     (description "File format checker in Rust.")
     (license license:expat)))
 
-(define-public rust-glib-0.19
+(define-public rust-glib-0.20
   (package
     (name "rust-glib")
-    (version "0.19.9")
+    (version "0.20.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "glib" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0i2ak1scmzfmfxbm2dr146jl4y9mafxf1ald05jr8iimy5wh4r9r"))))
+        (base32 "1zw5xd2772vakf95pslvzmmnzg6f9wnj9vkcpkyzj2v5sg31xkxd"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags
        '("--release" "--"
          "--skip=structured_log")
-       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2.6)
                        ("rust-futures-channel" ,rust-futures-channel-0.3)
                        ("rust-futures-core" ,rust-futures-core-0.3)
                        ("rust-futures-executor" ,rust-futures-executor-0.3)
                        ("rust-futures-task" ,rust-futures-task-0.3)
                        ("rust-futures-util" ,rust-futures-util-0.3)
-                       ("rust-gio-sys" ,rust-gio-sys-0.19)
-                       ("rust-glib-macros" ,rust-glib-macros-0.19)
-                       ("rust-glib-sys" ,rust-glib-sys-0.19)
-                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+                       ("rust-gio-sys" ,rust-gio-sys-0.20)
+                       ("rust-glib-macros" ,rust-glib-macros-0.20)
+                       ("rust-glib-sys" ,rust-glib-sys-0.20)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.20)
                        ("rust-libc" ,rust-libc-0.2)
                        ("rust-log" ,rust-log-0.4)
                        ("rust-memchr" ,rust-memchr-2)
@@ -1629,6 +1629,43 @@ (define-public rust-glib-0.19
     (description "This package provides Rust bindings for the GLib library.")
     (license license:expat)))
 
+(define-public rust-glib-0.19
+  (package
+    (inherit rust-glib-0.20)
+    (name "rust-glib")
+    (version "0.19.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "glib" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0i2ak1scmzfmfxbm2dr146jl4y9mafxf1ald05jr8iimy5wh4r9r"))))
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--"
+         "--skip=structured_log")
+       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-futures-executor" ,rust-futures-executor-0.3)
+                       ("rust-futures-task" ,rust-futures-task-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-gio-sys" ,rust-gio-sys-0.19)
+                       ("rust-glib-macros" ,rust-glib-macros-0.19)
+                       ("rust-glib-sys" ,rust-glib-sys-0.19)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.5)
+        ("rust-gir-format-check" ,rust-gir-format-check-0.1)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-trybuild2" ,rust-trybuild2-1))))))
+
 (define-public rust-glib-0.18
   (package
     (inherit rust-glib-0.19)
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 09/27] gnu: Add rust-cairo-sys-rs-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-cairo-sys-rs-0.20): New variable;
(rust-cairo-sys-rs-0.19): inherit from rust-cairo-sys-rs-0.20.

Change-Id: I5044a639615ae9f41b778ad690ba645f463043bd
---
 gnu/packages/crates-gtk.scm | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 5dcb9ec6d2..e18b6701d2 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -350,22 +350,22 @@ (define-public rust-cairo-rs-0.8
        (("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
-(define-public rust-cairo-sys-rs-0.19
+(define-public rust-cairo-sys-rs-0.20
   (package
     (name "rust-cairo-sys-rs")
-    (version "0.19.2")
+    (version "0.20.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "cairo-sys-rs" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0r0yp0lph77lm4blrn6fvdmz2i3r8ibkkjg6nmwbvvv4jq8v6fzx"))))
+        (base32 "13x85l52nl2izmdb48zzpkhhh1a4dsgqlp8gys4n1f5r2kwr10j2"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19)
+     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.20)
                        ("rust-libc" ,rust-libc-0.2)
-                       ("rust-system-deps" ,rust-system-deps-6)
+                       ("rust-system-deps" ,rust-system-deps-7)
                        ("rust-windows-sys" ,rust-windows-sys-0.52)
                        ("rust-x11" ,rust-x11-2))))
     (native-inputs (list pkg-config))
@@ -375,6 +375,25 @@ (define-public rust-cairo-sys-rs-0.19
     (description "This package provides FFI bindings to libcairo.")
     (license license:expat)))
 
+(define-public rust-cairo-sys-rs-0.19
+  (package
+    (inherit rust-cairo-sys-rs-0.20)
+    (name "rust-cairo-sys-rs")
+    (version "0.19.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cairo-sys-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0r0yp0lph77lm4blrn6fvdmz2i3r8ibkkjg6nmwbvvv4jq8v6fzx"))))
+    (arguments
+     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-system-deps" ,rust-system-deps-6)
+                       ("rust-windows-sys" ,rust-windows-sys-0.52)
+                       ("rust-x11" ,rust-x11-2))))))
+
 (define-public rust-cairo-sys-rs-0.18
   (package
     (inherit rust-cairo-sys-rs-0.19)
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 10/27] gnu: Add rust-freetype-sys-0.21.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-freetype-sys-0.21): New variable;
(rust-freetype-sys-0.20): inherit from rust-freetype-sys-0.21.

Change-Id: I6833de0940a7f03f1d91dbb7e4c6f4e9f992581e
---
 gnu/packages/crates-io.scm | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index dd78521655..b5423efc2e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -28337,17 +28337,17 @@ (define-public rust-freetype-rs-0.26
         ("rust-freetype-sys" ,rust-freetype-sys-0.13)
         ("rust-libc" ,rust-libc-0.2))))))
 
-(define-public rust-freetype-sys-0.20
+(define-public rust-freetype-sys-0.21
   (package
     (name "rust-freetype-sys")
-    (version "0.20.1")
+    (version "0.21.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "freetype-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0d5iiv95ap3lwy7b0hxbc8caa9ng1fg3wlwrvb7rld39jrdxqzhf"))
+        (base32 "1bsmjhjb26hzpzhj82c9196m0ls5m43zkgmqp67ambwjk6ylmf6x"))
        (snippet
         #~(begin
             (use-modules (guix build utils))
@@ -28372,6 +28372,34 @@ (define-public rust-freetype-sys-0.20
      "This package provides low level binding for FreeType font library.")
     (license license:expat)))
 
+(define-public rust-freetype-sys-0.20
+  (package
+    (inherit rust-freetype-sys-0.21)
+    (name "rust-freetype-sys")
+    (version "0.20.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "freetype-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0d5iiv95ap3lwy7b0hxbc8caa9ng1fg3wlwrvb7rld39jrdxqzhf"))
+       (snippet
+        #~(begin
+            (use-modules (guix build utils))
+            (delete-file-recursively "freetype2")
+            ;; Inspired by Debian's patch for bzip2-sys.
+            (delete-file "build.rs")
+            (with-output-to-file "build.rs"
+              (lambda _
+                (format #t "fn main() {~@
+                        println!(\"cargo:rustc-link-lib=freetype\");~@
+                        }~%")))))))
+    (arguments
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3))))))
+
 (define-public rust-freetype-sys-0.17
   (package
     (inherit rust-freetype-sys-0.20)
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 11/27] gnu: Add rust-freetype-rs-0.37.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-freetype-rs-0.37): New variable;
(rust-freetype-rs-0.35): inherit from rust-freetype-rs-0.37.

Change-Id: I4836c67456a1acf3108dae3343b7db3055d8616b
---
 gnu/packages/crates-io.scm | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b5423efc2e..73f45936b2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -28273,21 +28273,21 @@ (define-public rust-freetype-0.7
     (description "This package provides bindings for Freetype used by Servo.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-freetype-rs-0.35
+(define-public rust-freetype-rs-0.37
   (package
     (name "rust-freetype-rs")
-    (version "0.35.0")
+    (version "0.37.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "freetype-rs" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1gzfb9fax3d3s691ys99nfihpzwl7hacvxnwvlxg4sph1fzd5ymi"))))
+        (base32 "05albg00302i1w4fxijb5wil7bdnn4gcknw20q2df2azj8dzilfi"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
-                       ("rust-freetype-sys" ,rust-freetype-sys-0.20)
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2.6)
+                       ("rust-freetype-sys" ,rust-freetype-sys-0.21)
                        ("rust-libc" ,rust-libc-0.2))
        #:cargo-development-inputs
        (("rust-unicode-normalization" ,rust-unicode-normalization-0.1))))
@@ -28298,6 +28298,25 @@ (define-public rust-freetype-rs-0.35
     (description "This package provides bindings for FreeType font library.")
     (license license:expat)))
 
+(define-public rust-freetype-rs-0.35
+  (package
+    (inherit rust-freetype-rs-0.37)
+    (name "rust-freetype-rs")
+    (version "0.35.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "freetype-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1gzfb9fax3d3s691ys99nfihpzwl7hacvxnwvlxg4sph1fzd5ymi"))))
+    (arguments
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-freetype-sys" ,rust-freetype-sys-0.20)
+                       ("rust-libc" ,rust-libc-0.2))
+       #:cargo-development-inputs
+       (("rust-unicode-normalization" ,rust-unicode-normalization-0.1))))))
+
 (define-public rust-freetype-rs-0.32
   (package
     (inherit rust-freetype-rs-0.35)
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 12/27] gnu: Add rust-cairo-rs-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-cairo-rs-0.20): New variable;
(rust-cairo-rs-0.19): inherit from rust-cairo-rs-0.20.

Change-Id: Ib808c67be8bb32b36d76baf763d8d0d7feb39736
---
 gnu/packages/crates-gtk.scm | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index e18b6701d2..2b5fd25cdd 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -172,23 +172,23 @@ (define-public rust-atk-0.8
        #:cargo-development-inputs
        (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
 
-(define-public rust-cairo-rs-0.19
+(define-public rust-cairo-rs-0.20
   (package
     (name "rust-cairo-rs")
-    (version "0.19.4")
+    (version "0.20.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "cairo-rs" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0qp5rixgipdj9d8yd5458hzfxam1rgpzcxi90vq6q0v91r6jmb5j"))))
+        (base32 "0s9yafifi3pwf7jck0bhgwr4rlg483sqhlr32fb8q44lghafm878"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
-                       ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.19)
-                       ("rust-freetype-rs" ,rust-freetype-rs-0.35)
-                       ("rust-glib" ,rust-glib-0.19)
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2.6)
+                       ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.20)
+                       ("rust-freetype-rs" ,rust-freetype-rs-0.37)
+                       ("rust-glib" ,rust-glib-0.20)
                        ("rust-libc" ,rust-libc-0.2)
                        ("rust-thiserror" ,rust-thiserror-1))
        #:cargo-development-inputs (("rust-float-eq" ,rust-float-eq-1)
@@ -200,6 +200,28 @@ (define-public rust-cairo-rs-0.19
     (description "This package provides Rust bindings for the Cairo library.")
     (license license:expat)))
 
+(define-public rust-cairo-rs-0.19
+  (package
+    (inherit rust-cairo-rs-0.20)
+    (name "rust-cairo-rs")
+    (version "0.19.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cairo-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0qp5rixgipdj9d8yd5458hzfxam1rgpzcxi90vq6q0v91r6jmb5j"))))
+    (arguments
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.19)
+                       ("rust-freetype-rs" ,rust-freetype-rs-0.35)
+                       ("rust-glib" ,rust-glib-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs (("rust-float-eq" ,rust-float-eq-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-cairo-rs-0.18
   (package
     (inherit rust-cairo-rs-0.19)
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 13/27] gnu: Add rust-pango-sys-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-pango-sys-0.20): New variable;
(rust-pango-sys-0.19): inherit from rust-pango-sys-0.20.

Change-Id: I32aa452b27484541884e4eaaea2cb7d5995768f1
---
 gnu/packages/crates-gtk.scm | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 2b5fd25cdd..0fef956a7c 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org>
 ;;; Copyright © 2023 Steve George <steve@futurile.net>
 ;;; Copyright © 2023 Sergio Pastor Pérez <sergio.pastorperez@outlook.es>
+;;; Copyright © 2024 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3366,23 +3367,23 @@ (define-public rust-pango-0.8
        #:cargo-development-inputs
        (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
 
-(define-public rust-pango-sys-0.19
+(define-public rust-pango-sys-0.20
   (package
     (name "rust-pango-sys")
-    (version "0.19.8")
+    (version "0.20.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pango-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "182bcd6255v5yvnskbhxnb6kwak240z7sn54si2b5h46l17xl0zz"))))
+        (base32 "0f5qyap96f01h7xa122s798hmz7rmc0c5fz299a0cbzigf8nbzc4"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19)
-                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.20)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.20)
                        ("rust-libc" ,rust-libc-0.2)
-                       ("rust-system-deps" ,rust-system-deps-6))
+                       ("rust-system-deps" ,rust-system-deps-7))
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))))
     (native-inputs (list pkg-config))
@@ -3392,6 +3393,26 @@ (define-public rust-pango-sys-0.19
     (description "This package provides FFI bindings to @code{libpango-1.0}.")
     (license license:expat)))
 
+(define-public rust-pango-sys-0.19
+  (package
+    (inherit rust-pango-sys-0.20)
+    (name "rust-pango-sys")
+    (version "0.19.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pango-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "182bcd6255v5yvnskbhxnb6kwak240z7sn54si2b5h46l17xl0zz"))))
+    (arguments
+     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-pango-sys-0.18
   (package
     (inherit rust-pango-sys-0.19)
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 14/27] gnu: Add rust-libadwaita-sys-0.6.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-libadwaita-sys-0.6): New variable;
(rust-libadwaita-sys-0.5): inherit from rust-libadwaita-sys-0.6.

Change-Id: Iab000ff1bd6113193a40600bd030943bcbf66615
---
 gnu/packages/crates-gtk.scm | 41 +++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 0fef956a7c..3f4065ba7a 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -3162,28 +3162,28 @@ (define-public rust-libadwaita-0.5
     (description "Rust bindings for libadwaita.")
     (license license:expat)))
 
-(define-public rust-libadwaita-sys-0.5
+(define-public rust-libadwaita-sys-0.6
   (package
     (name "rust-libadwaita-sys")
-    (version "0.5.3")
+    (version "0.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "libadwaita-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "16n6xsy6jhbj0jbpz8yvql6c9b89a99v9vhdz5s37mg1inisl42y"))))
+        (base32 "1a513qlanw6n8dksm1br20a7iz2x1ff5cgg9v5f2dq9bx7j4i9r3"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f  ; ‘AdwBannerClass’ undeclared
        #:cargo-inputs (("rust-gdk4-sys" ,rust-gdk4-sys-0.7)
-                       ("rust-gio-sys" ,rust-gio-sys-0.18)
-                       ("rust-glib-sys" ,rust-glib-sys-0.18)
-                       ("rust-gobject-sys" ,rust-gobject-sys-0.18)
+                       ("rust-gio-sys" ,rust-gio-sys-0.20)
+                       ("rust-glib-sys" ,rust-glib-sys-0.20)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.20)
                        ("rust-gtk4-sys" ,rust-gtk4-sys-0.7)
                        ("rust-libc" ,rust-libc-0.2)
-                       ("rust-pango-sys" ,rust-pango-sys-0.18)
-                       ("rust-system-deps" ,rust-system-deps-6))
+                       ("rust-pango-sys" ,rust-pango-sys-0.20)
+                       ("rust-system-deps" ,rust-system-deps-7))
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))))
     (native-inputs (list pkg-config))
@@ -3193,6 +3193,31 @@ (define-public rust-libadwaita-sys-0.5
     (description "FFI bindings for libadwaita.")
     (license license:expat)))
 
+(define-public rust-libadwaita-sys-0.5
+  (package
+    (inherit rust-libadwaita-sys-0.6)
+    (name "rust-libadwaita-sys")
+    (version "0.5.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libadwaita-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "16n6xsy6jhbj0jbpz8yvql6c9b89a99v9vhdz5s37mg1inisl42y"))))
+    (arguments
+     `(#:tests? #f  ; ‘AdwBannerClass’ undeclared
+       #:cargo-inputs (("rust-gdk4-sys" ,rust-gdk4-sys-0.7)
+                       ("rust-gio-sys" ,rust-gio-sys-0.18)
+                       ("rust-glib-sys" ,rust-glib-sys-0.18)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.18)
+                       ("rust-gtk4-sys" ,rust-gtk4-sys-0.7)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango-sys" ,rust-pango-sys-0.18)
+                       ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-pango-0.19
   (package
     (name "rust-pango")
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 15/27] gnu: Add rust-gdk-pixbuf-sys-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gdk-pixbuf-sys-0.20): New variable;
(rust-gdk-pixbuf-sys-0.19): inherit from rust-gdk-pixbuf-sys-0.20.

Change-Id: Id994832ab591b70e7ba3392cf3c86c725ebb2212
---
 gnu/packages/crates-gtk.scm | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 3f4065ba7a..27fd2a2bcf 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -807,24 +807,24 @@ (define-public rust-gdk-pixbuf-0.8
        #:cargo-development-inputs
        (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
 
-(define-public rust-gdk-pixbuf-sys-0.19
+(define-public rust-gdk-pixbuf-sys-0.20
   (package
     (name "rust-gdk-pixbuf-sys")
-    (version "0.19.8")
+    (version "0.20.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "gdk-pixbuf-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0y93g24mdgskvyhva46xv3qyb1cvj5xpi0yqnh7cb31wz2j0byjf"))))
+        (base32 "0gdz43p4zsck7w6isin0zi3ydacg0c3l6yyqzgrza7drb6q46wv8"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-gio-sys" ,rust-gio-sys-0.19)
-                       ("rust-glib-sys" ,rust-glib-sys-0.19)
-                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+     `(#:cargo-inputs (("rust-gio-sys" ,rust-gio-sys-0.20)
+                       ("rust-glib-sys" ,rust-glib-sys-0.20)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.20)
                        ("rust-libc" ,rust-libc-0.2)
-                       ("rust-system-deps" ,rust-system-deps-6))
+                       ("rust-system-deps" ,rust-system-deps-7))
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))))
     (native-inputs (list pkg-config))
@@ -835,6 +835,27 @@ (define-public rust-gdk-pixbuf-sys-0.19
      "This package provides FFI bindings to @code{libgdk_pixbuf-2.0}.")
     (license license:expat)))
 
+(define-public rust-gdk-pixbuf-sys-0.19
+  (package
+    (inherit rust-gdk-pixbuf-sys-0.20)
+    (name "rust-gdk-pixbuf-sys")
+    (version "0.19.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gdk-pixbuf-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0y93g24mdgskvyhva46xv3qyb1cvj5xpi0yqnh7cb31wz2j0byjf"))))
+    (arguments
+     `(#:cargo-inputs (("rust-gio-sys" ,rust-gio-sys-0.19)
+                       ("rust-glib-sys" ,rust-glib-sys-0.19)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-gdk-pixbuf-sys-0.18
   (package
     (inherit rust-gdk-pixbuf-sys-0.19)
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 16/27] gnu: Add rust-gio-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gio-0.20): New variable;
(rust-gio-0.19): inherit from rust-gio-0.20.

Change-Id: I152073e6b8d9892bd58e1f5ffc0b56b7ff562058
---
 gnu/packages/crates-gtk.scm | 43 ++++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 27fd2a2bcf..e93db8e7f6 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1155,17 +1155,17 @@ (define-public rust-gdk4-sys-0.7
     (description "This package provides FFI bindings of GDK 4.")
     (license license:expat)))
 
-(define-public rust-gio-0.19
+(define-public rust-gio-0.20
   (package
     (name "rust-gio")
-    (version "0.19.8")
+    (version "0.20.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "gio" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1znz5ngfvv3gbndf6lzz3hs27hlb8ysls4axlfccrzvkscbz2jac"))))
+        (base32 "0g6l7a1n63a8myjpcv10mn214w0ypijf6rq812b3wn09zgl9kndq"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags
@@ -1176,8 +1176,8 @@ (define-public rust-gio-0.19
                        ("rust-futures-core" ,rust-futures-core-0.3)
                        ("rust-futures-io" ,rust-futures-io-0.3)
                        ("rust-futures-util" ,rust-futures-util-0.3)
-                       ("rust-gio-sys" ,rust-gio-sys-0.19)
-                       ("rust-glib" ,rust-glib-0.19)
+                       ("rust-gio-sys" ,rust-gio-sys-0.20)
+                       ("rust-glib" ,rust-glib-0.20)
                        ("rust-libc" ,rust-libc-0.2)
                        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
                        ("rust-smallvec" ,rust-smallvec-1)
@@ -1194,6 +1194,39 @@ (define-public rust-gio-0.19
     (description "This package provides Rust bindings for the Gio library.")
     (license license:expat)))
 
+(define-public rust-gio-0.19
+  (package
+    (inherit rust-gio-0.20)
+    (name "rust-gio")
+    (version "0.19.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gio" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1znz5ngfvv3gbndf6lzz3hs27hlb8ysls4axlfccrzvkscbz2jac"))))
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--"
+         "--skip=settings::test::bool_set_get"
+         "--skip=settings::test::string_get")
+       #:cargo-inputs (("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-core" ,rust-futures-core-0.3)
+                       ("rust-futures-io" ,rust-futures-io-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-gio-sys" ,rust-gio-sys-0.19)
+                       ("rust-glib" ,rust-glib-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs
+       (("rust-futures" ,rust-futures-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-gir-format-check" ,rust-gir-format-check-0.1)
+        ("rust-serial-test" ,rust-serial-test-3))))))
+
 (define-public rust-gio-0.18
   (package
     (inherit rust-gio-0.19)
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 17/27] gnu: Add rust-gdk-pixbuf-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gdk-pixbuf-0.20): New variable;
(rust-gdk-pixbuf-0.19): inherit from rust-gdk-pixbuf-0.20.

Change-Id: Icad085f2fdcb1221eb22d3afe620e0a3247bad59
---
 gnu/packages/crates-gtk.scm | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index e93db8e7f6..897d96de3b 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -634,22 +634,22 @@ (define-public rust-gdk-0.12
        #:cargo-development-inputs
        (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
 
-(define-public rust-gdk-pixbuf-0.19
+(define-public rust-gdk-pixbuf-0.20
   (package
     (name "rust-gdk-pixbuf")
-    (version "0.19.8")
+    (version "0.20.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "gdk-pixbuf" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "16c6kznkh3vi82843ays8awdm37fwjd1fblv6g3h64824shsnkk2"))))
+        (base32 "068vj60x1hbw0anhjvg2id3sr96d202wp18a4zc3f8z9m5qr1hn4"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.19)
-                       ("rust-gio" ,rust-gio-0.19)
-                       ("rust-glib" ,rust-glib-0.19)
+     `(#:cargo-inputs (("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.20)
+                       ("rust-gio" ,rust-gio-0.20)
+                       ("rust-glib" ,rust-glib-0.20)
                        ("rust-libc" ,rust-libc-0.2))
        #:cargo-development-inputs
        (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
@@ -661,6 +661,26 @@ (define-public rust-gdk-pixbuf-0.19
      "This package provides Rust bindings for the @code{GdkPixbuf} library.")
     (license license:expat)))
 
+(define-public rust-gdk-pixbuf-0.19
+  (package
+    (inherit rust-gdk-pixbuf-0.20)
+    (name "rust-gdk-pixbuf")
+    (version "0.19.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gdk-pixbuf" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "16c6kznkh3vi82843ays8awdm37fwjd1fblv6g3h64824shsnkk2"))))
+    (arguments
+     `(#:cargo-inputs (("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.19)
+                       ("rust-gio" ,rust-gio-0.19)
+                       ("rust-glib" ,rust-glib-0.19)
+                       ("rust-libc" ,rust-libc-0.2))
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
+
 (define-public rust-gdk-pixbuf-0.18
   (package
     (inherit rust-gdk-pixbuf-0.19)
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 18/27] gnu: Add rust-pango-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-pango-0.20): New variable;
(rust-pango-0.19): inherit from rust-pango-0.20.

Change-Id: I9d06bcc3ddc380215212d807bfe7e8b6ffd3f090
---
 gnu/packages/crates-gtk.scm | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 897d96de3b..762d342730 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -3292,23 +3292,23 @@ (define-public rust-libadwaita-sys-0.5
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))))))
 
-(define-public rust-pango-0.19
+(define-public rust-pango-0.20
   (package
     (name "rust-pango")
-    (version "0.19.8")
+    (version "0.20.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pango" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1kffxkk7730csly86fkgja50k1184zj9lz49sv7qb0059233439z"))))
+        (base32 "0mpkjnxcgng8mjf7y55q5d1md4qxswf90m5784hxg50hn5aal9ma"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-gio" ,rust-gio-0.19)
-                       ("rust-glib" ,rust-glib-0.19)
+     `(#:cargo-inputs (("rust-gio" ,rust-gio-0.20)
+                       ("rust-glib" ,rust-glib-0.20)
                        ("rust-libc" ,rust-libc-0.2)
-                       ("rust-pango-sys" ,rust-pango-sys-0.19))
+                       ("rust-pango-sys" ,rust-pango-sys-0.20))
        #:cargo-development-inputs
        (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
     (native-inputs (list pkg-config))
@@ -3318,6 +3318,26 @@ (define-public rust-pango-0.19
     (description "This package provides Rust bindings for the Pango library.")
     (license license:expat)))
 
+(define-public rust-pango-0.19
+  (package
+    (inherit rust-pango-0.20)
+    (name "rust-pango")
+    (version "0.19.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pango" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1kffxkk7730csly86fkgja50k1184zj9lz49sv7qb0059233439z"))))
+    (arguments
+     `(#:cargo-inputs (("rust-gio" ,rust-gio-0.19)
+                       ("rust-glib" ,rust-glib-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango-sys" ,rust-pango-sys-0.19))
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
+
 (define-public rust-pango-0.18
   (package
     (inherit rust-pango-0.19)
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 19/27] gnu: Add rust-gdk4-sys-0.8.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gdk4-sys-0.8): New variable;
(rust-gdk4-sys-0.7): inherit from rust-gdk4-sys-0.8.

Change-Id: If4c314effafb342df87b1260a5c61c15d1f10b29
---
 gnu/packages/crates-gtk.scm | 41 +++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 762d342730..d0db2f16a3 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1143,8 +1143,40 @@ (define-public rust-gdk4-0.7
     (description "This package provides rust bindings of the GDK 4 library.")
     (license license:expat)))
 
+(define-public rust-gdk4-sys-0.8
+  (package
+    (name "rust-gdk4-sys")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gdk4-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1pb6vklx9ik7jx9cmrw2vywlx9ssqhll8q77ky8p8w56x2s8yhf9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.19)
+                       ("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.19)
+                       ("rust-gio-sys" ,rust-gio-sys-0.19)
+                       ("rust-glib-sys" ,rust-glib-sys-0.19)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango-sys" ,rust-pango-sys-0.19)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3)
+                       ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))
+    (native-inputs (list pkg-config))
+    (inputs (list cairo gdk-pixbuf glib gtk pango))
+    (home-page "https://gtk-rs.org/")
+    (synopsis "FFI bindings of GDK 4")
+    (description "This package provides FFI bindings of GDK 4.")
+    (license license:expat)))
+
 (define-public rust-gdk4-sys-0.7
   (package
+    (inherit rust-gdk4-sys-0.8)
     (name "rust-gdk4-sys")
     (version "0.7.2")
     (source
@@ -1154,7 +1186,6 @@ (define-public rust-gdk4-sys-0.7
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1w7yvir565sjrrw828lss07749hfpfsr19jdjzwivkx36brl7ayv"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f ; ‘GDK_MEMORY_A16’ undeclared
        #:cargo-inputs (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.18)
@@ -1167,13 +1198,7 @@ (define-public rust-gdk4-sys-0.7
                        ("rust-pkg-config" ,rust-pkg-config-0.3)
                        ("rust-system-deps" ,rust-system-deps-6))
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
-                                   ("rust-tempfile" ,rust-tempfile-3))))
-    (native-inputs (list pkg-config))
-    (inputs (list cairo gdk-pixbuf glib gtk pango))
-    (home-page "https://gtk-rs.org/")
-    (synopsis "FFI bindings of GDK 4")
-    (description "This package provides FFI bindings of GDK 4.")
-    (license license:expat)))
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-gio-0.20
   (package
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 20/27] gnu: Add rust-gdk4-0.8.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gdk4-0.8): New variable;
(rust-gd4-0.7): inherit from rust-gdk4-0.8.

Change-Id: I66df513b683b44414e4994f0225dda6f391e3dad
---
 gnu/packages/crates-gtk.scm | 40 +++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index d0db2f16a3..99068e8c02 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1112,8 +1112,39 @@ (define-public rust-gdk-sys-0.9
        (("rust-shell-words" ,rust-shell-words-0.1)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-gdk4-0.8
+  (package
+    (name "rust-gdk4")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gdk4" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "01qak43mrlszsy9cfsmqk1ql4228m2rylbg514g3fsidsjfmq9nv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cairo-rs" ,rust-cairo-rs-0.19)
+                       ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.19)
+                       ("rust-gdk4-sys" ,rust-gdk4-sys-0.8)
+                       ("rust-gio" ,rust-gio-0.19)
+                       ("rust-gl" ,rust-gl-0.14)
+                       ("rust-glib" ,rust-glib-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango" ,rust-pango-0.19))
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
+    (native-inputs (list pkg-config))
+    (inputs (list cairo gdk-pixbuf gtk))
+    (home-page "https://gtk-rs.org/")
+    (synopsis "Rust bindings of the GDK 4 library")
+    (description "This package provides rust bindings of the GDK 4 library.")
+    (license license:expat)))
+
 (define-public rust-gdk4-0.7
   (package
+    (inherit rust-gdk4-0.8)
     (name "rust-gdk4")
     (version "0.7.3")
     (source
@@ -1123,7 +1154,6 @@ (define-public rust-gdk4-0.7
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1xiacc63p73apr033gjrb9dsk0y4yxnsljwfxbwfry41snd03nvy"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f ; `Errors` doesn't implement `std::fmt::Display`
        #:cargo-inputs (("rust-cairo-rs" ,rust-cairo-rs-0.18)
@@ -1135,13 +1165,7 @@ (define-public rust-gdk4-0.7
                        ("rust-libc" ,rust-libc-0.2)
                        ("rust-pango" ,rust-pango-0.18))
        #:cargo-development-inputs
-       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
-    (native-inputs (list pkg-config))
-    (inputs (list cairo gdk-pixbuf gtk))
-    (home-page "https://gtk-rs.org/")
-    (synopsis "Rust bindings of the GDK 4 library")
-    (description "This package provides rust bindings of the GDK 4 library.")
-    (license license:expat)))
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
 
 (define-public rust-gdk4-sys-0.8
   (package
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 21/27] gnu: Add rust-graphene-sys-0.19.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-graphene-sys-0.19): New variable;
(rust-graphene-sys-0.18): inherit from rust-graphene-sys-0.19.

Change-Id: I873e8f73c25d19626a3086bf3e7a2dce1e47c152
---
 gnu/packages/crates-gtk.scm | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 99068e8c02..3be021a9ae 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2591,20 +2591,26 @@ (define-public rust-graphene-rs-0.18
     (description "Rust bindings for the Graphene library.")
     (license license:expat)))
 
-(define-public rust-graphene-sys-0.18
+(define-public rust-graphene-sys-0.19
   (package
     (name "rust-graphene-sys")
-    (version "0.18.1")
+    (version "0.19.8")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "graphene-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0n8zlg7z26lwpnvlqp1hjlgrs671skqwagdpm7r8i1zwx3748hfc"))))
+        (base32 "01dg4wgqxaqkdv0vl7hr14b6kbbm96gwdsb5a2ss9jxw8h4hwlrg"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (substitute* "Cargo.toml"
+             ;; Patch rust-pkg-config version.
+             (("version = \"0.3.29\"") "version = \">= 0.3.27\""))))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.18)
+     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19)
                        ("rust-libc" ,rust-libc-0.2)
                        ("rust-pkg-config" ,rust-pkg-config-0.3)
                        ("rust-system-deps" ,rust-system-deps-6))
@@ -2617,6 +2623,26 @@ (define-public rust-graphene-sys-0.18
     (description "FFI bindings to libgraphene-1.0.")
     (license license:expat)))
 
+(define-public rust-graphene-sys-0.18
+  (package
+    (inherit rust-graphene-sys-0.19)
+    (name "rust-graphene-sys")
+    (version "0.18.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "graphene-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0n8zlg7z26lwpnvlqp1hjlgrs671skqwagdpm7r8i1zwx3748hfc"))))
+    (arguments
+     `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.18)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3)
+                       ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-gsk4-0.7
   (package
     (name "rust-gsk4")
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 22/27] gnu: Add rust-gsk4-sys-0.8.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gsk4-sys-0.8): New variable;
(rust-gsk4-sys-0.7): inherit from rust-gsk4-sys-0.8.

Change-Id: I2a54b556fecca7f942b4843885b12307f6cf35af
---
 gnu/packages/crates-gtk.scm | 40 +++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 3be021a9ae..a04f182287 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2673,8 +2673,39 @@ (define-public rust-gsk4-0.7
     (description "Rust bindings of the GSK 4 library.")
     (license license:expat)))
 
+(define-public rust-gsk4-sys-0.8
+  (package
+    (name "rust-gsk4-sys")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gsk4-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1p5kf912s8qs38lhzzwnm26v498wkp68mx92z38vnf3ccgr4n0i3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.19)
+                       ("rust-gdk4-sys" ,rust-gdk4-sys-0.8)
+                       ("rust-glib-sys" ,rust-glib-sys-0.19)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+                       ("rust-graphene-sys" ,rust-graphene-sys-0.19)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango-sys" ,rust-pango-sys-0.19)
+                       ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))
+    (native-inputs (list pkg-config))
+    (inputs (list cairo gdk-pixbuf graphene gtk pango))
+    (home-page "https://gtk-rs.org/")
+    (synopsis "FFI bindings of GSK 4")
+    (description "This package provides FFI bindings of GSK 4.")
+    (license license:expat)))
+
 (define-public rust-gsk4-sys-0.7
   (package
+    (inherit rust-gsk4-sys-0.8)
     (name "rust-gsk4-sys")
     (version "0.7.3")
     (source
@@ -2684,7 +2715,6 @@ (define-public rust-gsk4-sys-0.7
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0mbdlm9qi1hql48rr29vsj9vlqwc7gxg67wg1q19z67azwz9xg8j"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f  ; `GskFillRule` undeclared
        #:cargo-inputs (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.18)
@@ -2696,13 +2726,7 @@ (define-public rust-gsk4-sys-0.7
                        ("rust-pango-sys" ,rust-pango-sys-0.18)
                        ("rust-system-deps" ,rust-system-deps-6))
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
-                                   ("rust-tempfile" ,rust-tempfile-3))))
-    (native-inputs (list pkg-config))
-    (inputs (list cairo gdk-pixbuf graphene gtk pango))
-    (home-page "https://gtk-rs.org/")
-    (synopsis "FFI bindings of GSK 4")
-    (description "This package provides FFI bindings of GSK 4.")
-    (license license:expat)))
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-gstreamer-0.18
   (package
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 23/27] gnu: Add rust-graphene-rs-0.19.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-graphene-rs-0.19): New variable;
(rust-graphene-rs-0.18): inherit from rust-graphene-rs-0.19.

Change-Id: Icb7bda2bc9268dee0b13d9e264b4390ddecdfbd5
---
 gnu/packages/crates-gtk.scm | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index a04f182287..ad51b6186a 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2565,22 +2565,21 @@ (define-public rust-gobject-sys-0.9
        (("rust-shell-words" ,rust-shell-words-0.1)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
-(define-public rust-graphene-rs-0.18
+(define-public rust-graphene-rs-0.19
   (package
     (name "rust-graphene-rs")
-    (version "0.18.1")
+    (version "0.19.8")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "graphene-rs" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "00f4q1ra4haap5i7lazwhkdgnb49fs8adk2nm6ki6mjhl76jh8iv"))))
+        (base32 "1krblj6kbnixgkmz2b3494jmlm2xlv3qz5qm585frn943l1qdyzm"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f ; `Errors` doesn't implement `std::fmt::Display`
-       #:cargo-inputs (("rust-glib" ,rust-glib-0.18)
-                       ("rust-graphene-sys" ,rust-graphene-sys-0.18)
+     `(#:cargo-inputs (("rust-glib" ,rust-glib-0.19)
+                       ("rust-graphene-sys" ,rust-graphene-sys-0.19)
                        ("rust-libc" ,rust-libc-0.2))
        #:cargo-development-inputs
        (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
@@ -2591,6 +2590,26 @@ (define-public rust-graphene-rs-0.18
     (description "Rust bindings for the Graphene library.")
     (license license:expat)))
 
+(define-public rust-graphene-rs-0.18
+  (package
+    (inherit rust-graphene-rs-0.19)
+    (name "rust-graphene-rs")
+    (version "0.18.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "graphene-rs" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "00f4q1ra4haap5i7lazwhkdgnb49fs8adk2nm6ki6mjhl76jh8iv"))))
+    (arguments
+     `(#:tests? #f ; `Errors` doesn't implement `std::fmt::Display`
+       #:cargo-inputs (("rust-glib" ,rust-glib-0.18)
+                       ("rust-graphene-sys" ,rust-graphene-sys-0.18)
+                       ("rust-libc" ,rust-libc-0.2))
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
+
 (define-public rust-graphene-sys-0.19
   (package
     (name "rust-graphene-sys")
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 24/27] gnu: Add rust-gsk4-0.8.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gsk4-0.8): New variable;
(rust-gsk4-0.7): inherit from rust-gsk4-0.8.

Change-Id: Ief5de9ea607e6dd2be132cf98b177ecb315fd5c1
---
 gnu/packages/crates-gtk.scm | 39 +++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index ad51b6186a..034c543d72 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2662,8 +2662,38 @@ (define-public rust-graphene-sys-0.18
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-gsk4-0.8
+  (package
+    (name "rust-gsk4")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gsk4" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1gi1f9s2nd5m2zfwb91vijpzr6nxbfa58inrwml497wkyr5qhqvm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cairo-rs" ,rust-cairo-rs-0.19)
+                       ("rust-gdk4" ,rust-gdk4-0.8)
+                       ("rust-glib" ,rust-glib-0.19)
+                       ("rust-graphene-rs" ,rust-graphene-rs-0.19)
+                       ("rust-gsk4-sys" ,rust-gsk4-sys-0.8)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango" ,rust-pango-0.19))
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
+    (native-inputs (list pkg-config))
+    (inputs (list gtk))
+    (home-page "https://gtk-rs.org/")
+    (synopsis "Rust bindings of the GSK 4 library")
+    (description "Rust bindings of the GSK 4 library.")
+    (license license:expat)))
+
 (define-public rust-gsk4-0.7
   (package
+    (inherit rust-gsk4-0.8)
     (name "rust-gsk4")
     (version "0.7.3")
     (source
@@ -2673,7 +2703,6 @@ (define-public rust-gsk4-0.7
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0zhzs2dkgiinhgc11akpn2harq3x5n1iq21dnc4h689g3lsqx58d"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f  ; `Errors` doesn't implement `std::fmt::Display`
        #:cargo-inputs (("rust-cairo-rs" ,rust-cairo-rs-0.18)
@@ -2684,13 +2713,7 @@ (define-public rust-gsk4-0.7
                        ("rust-libc" ,rust-libc-0.2)
                        ("rust-pango" ,rust-pango-0.18))
        #:cargo-development-inputs
-       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
-    (native-inputs (list pkg-config))
-    (inputs (list gtk))
-    (home-page "https://gtk-rs.org/")
-    (synopsis "Rust bindings of the GSK 4 library")
-    (description "Rust bindings of the GSK 4 library.")
-    (license license:expat)))
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
 
 (define-public rust-gsk4-sys-0.8
   (package
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 25/27] gnu: Add rust-gtk4-sys-0.8.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-gtk4-sys-0.8): New variable;
(rust-gtk4-sys-0.7): intherit from rust-gtk4-sys-0.8.

Change-Id: Id31435c704b9163d77e8a4d8f017bc630ac1788a
---
 gnu/packages/crates-gtk.scm | 38 +++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 034c543d72..e2e72298b5 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -3315,8 +3315,43 @@ (define-public rust-gtk4-macros-0.7
     (description "Macros helpers for GTK 4 bindings.")
     (license license:expat)))
 
+(define-public rust-gtk4-sys-0.8
+  (package
+    (name "rust-gtk4-sys")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gtk4-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1dapgvbkhf0kcm2jfmj8r98wzyhwmr5iv358dvb73sl5gxmsi2lc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ; Can't find gtk/gtk-a11y.h from gtk+
+       #:cargo-inputs (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.19)
+                       ("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.19)
+                       ("rust-gdk4-sys" ,rust-gdk4-sys-0.8)
+                       ("rust-gio-sys" ,rust-gio-sys-0.19)
+                       ("rust-glib-sys" ,rust-glib-sys-0.19)
+                       ("rust-gobject-sys" ,rust-gobject-sys-0.19)
+                       ("rust-graphene-sys" ,rust-graphene-sys-0.19)
+                       ("rust-gsk4-sys" ,rust-gsk4-sys-0.8)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango-sys" ,rust-pango-sys-0.19)
+                       ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))
+    (native-inputs (list pkg-config))
+    (inputs (list cairo gdk-pixbuf graphene gtk pango))
+    (home-page "https://gtk-rs.org/")
+    (synopsis "FFI bindings of GTK 4")
+    (description "This package provides FFI bindings of GTK 4.")
+    (license license:expat)))
+
 (define-public rust-gtk4-sys-0.7
   (package
+    (inherit rust-gtk4-sys-0.8)
     (name "rust-gtk4-sys")
     (version "0.7.3")
     (source
@@ -3326,7 +3361,6 @@ (define-public rust-gtk4-sys-0.7
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1f2ylskyqkjdik9fij2m46pra4jagnif5xyalbxfk3334fmc9n2l"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f ; Can't find gtk/gtk-a11y.h from gtk+
        #:cargo-inputs (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.18)
@@ -3341,7 +3375,7 @@ (define-public rust-gtk4-sys-0.7
                        ("rust-pango-sys" ,rust-pango-sys-0.18)
                        ("rust-system-deps" ,rust-system-deps-6))
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
-                                   ("rust-tempfile" ,rust-tempfile-3))))
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
     (native-inputs (list pkg-config))
     (inputs (list cairo gdk-pixbuf graphene gtk pango))
     (home-page "https://gtk-rs.org/")
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 26/27] gnu: Add rust-gtk4-0.8 and rust-gtk4-macros-0.8.

[Giacomo Leidi via Guix-patches via]

rust-gtk4 and rust-gtk4-macros are mutually dependent, this is why this
commit addresses both of them instead of having two separate commits, as
is usually done in Guix.

* gnu/packages/crates-gtk.scm (rust-gtk4-0.8): New variable;
(rust-gtk4-macros-0.8): new variable;
(rust-gtk4-0.7): inherit from rust-gtk4-0.8;
(rust-gtk4-macros-0.7): inherit from rust-gtk4-macros-0.8.

Change-Id: I9e327d6ae32cb6142dac87f8cb6a2249ab9407ac
---
 gnu/packages/crates-gtk.scm | 83 +++++++++++++++++++++++++++++++------
 1 file changed, 70 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index e2e72298b5..82143ebbed 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -3246,8 +3246,45 @@ (define-public rust-gtk3-macros-0.14
 library.")
     (license license:expat)))
 
+(define-public rust-gtk4-0.8
+  (package
+    (name "rust-gtk4")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gtk4" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1avinslgnsz3wywf4dfaza8w9c29krd10hxmi8si3bq8kcqi2kmh"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f  ; Failed to initialize GTK
+       #:cargo-inputs (("rust-cairo-rs" ,rust-cairo-rs-0.19)
+                       ("rust-field-offset" ,rust-field-offset-0.3)
+                       ("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.19)
+                       ("rust-gdk4" ,rust-gdk4-0.8)
+                       ("rust-gio" ,rust-gio-0.19)
+                       ("rust-glib" ,rust-glib-0.19)
+                       ("rust-graphene-rs" ,rust-graphene-rs-0.19)
+                       ("rust-gsk4" ,rust-gsk4-0.8)
+                       ("rust-gtk4-macros" ,rust-gtk4-macros-0.8)
+                       ("rust-gtk4-sys" ,rust-gtk4-sys-0.8)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango" ,rust-pango-0.19))
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
+    (native-inputs (list pkg-config))
+    (inputs (list cairo glib gtk))
+    (home-page "https://gtk-rs.org/")
+    (synopsis "Rust bindings of the GTK 4 library")
+    (description "Rust bindings of the GTK 4 library.")
+    (license license:expat)))
+
 (define-public rust-gtk4-0.7
   (package
+    (inherit rust-gtk4-0.8)
     (name "rust-gtk4")
     (version "0.7.3")
     (source
@@ -3257,7 +3294,6 @@ (define-public rust-gtk4-0.7
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0hh8nzglmz94v1m1h6vy8z12m6fr7ia467ry0md5fa4p7sm53sss"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f ; `Errors` doesn't implement `std::fmt::Display`
        #:cargo-inputs (("rust-cairo-rs" ,rust-cairo-rs-0.18)
@@ -3274,16 +3310,44 @@ (define-public rust-gtk4-0.7
                        ("rust-libc" ,rust-libc-0.2)
                        ("rust-pango" ,rust-pango-0.18))
        #:cargo-development-inputs
-       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
+
+(define-public rust-gtk4-macros-0.8
+  (package
+    (name "rust-gtk4-macros")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gtk4-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0214a8y68kknxcnihsfxwsqvll7ss2rbiplr51cyk34dz1z5lrgc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f  ; Failed to initialize GTK
+       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-proc-macro-crate" ,rust-proc-macro-crate-3)
+                       ("rust-proc-macro-error" ,rust-proc-macro-error-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quick-xml" ,rust-quick-xml-0.31)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-gtk4" ,rust-gtk4-0.8)
+                       ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs (("rust-futures-channel" ,rust-futures-channel-0.3)
+                                   ("rust-futures-util" ,rust-futures-util-0.3)
+                                   ("rust-gtk4" ,rust-gtk4-0.7)
+                                   ("rust-trybuild2" ,rust-trybuild2-1))))
     (native-inputs (list pkg-config))
-    (inputs (list cairo glib gtk))
+    (inputs (list gdk-pixbuf gtk))
     (home-page "https://gtk-rs.org/")
-    (synopsis "Rust bindings of the GTK 4 library")
-    (description "Rust bindings of the GTK 4 library.")
+    (synopsis "Macros helpers for GTK 4 bindings")
+    (description "Macros helpers for GTK 4 bindings.")
     (license license:expat)))
 
 (define-public rust-gtk4-macros-0.7
   (package
+    (inherit rust-gtk4-macros-0.8)
     (name "rust-gtk4-macros")
     (version "0.7.2")
     (source
@@ -3293,7 +3357,6 @@ (define-public rust-gtk4-macros-0.7
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0bw3cchiycf7dw1bw4p8946gv38azxy05a5w0ndgcmxnz6fc8znm"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f  ; Failed to initialize GTK
        #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
@@ -3307,13 +3370,7 @@ (define-public rust-gtk4-macros-0.7
        #:cargo-development-inputs (("rust-futures-channel" ,rust-futures-channel-0.3)
                                    ("rust-futures-util" ,rust-futures-util-0.3)
                                    ("rust-gtk4" ,rust-gtk4-0.7)
-                                   ("rust-trybuild2" ,rust-trybuild2-1))))
-    (native-inputs (list pkg-config))
-    (inputs (list gdk-pixbuf gtk))
-    (home-page "https://gtk-rs.org/")
-    (synopsis "Macros helpers for GTK 4 bindings")
-    (description "Macros helpers for GTK 4 bindings.")
-    (license license:expat)))
+                                   ("rust-trybuild2" ,rust-trybuild2-1))))))
 
 (define-public rust-gtk4-sys-0.8
   (package
-- 
2.46.0

[bug#73956] [PATCHv2 rust-team 27/27] gnu: Add rust-libadwaita-0.6.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-libadwaita-0.6): New variable;
(rust-libadwaita-0.5): inherit from rust-libadwaita-0.6.

Change-Id: I3244ee4e3114cdc1a61a1f0e4e1e1f165c131707
---
 gnu/packages/crates-gtk.scm | 40 ++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 82143ebbed..17afb65321 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -3433,15 +3433,38 @@ (define-public rust-gtk4-sys-0.7
                        ("rust-system-deps" ,rust-system-deps-6))
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))))))
+
+(define-public rust-libadwaita-0.6
+  (package
+    (name "rust-libadwaita")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libadwaita" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1nf5hxmk1bzjj8hxavwgz04kiv3hxb52qjh9f9gfrqdr9019kd4i"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.20)
+                       ("rust-gdk4" ,rust-gdk4-0.8)
+                       ("rust-gio" ,rust-gio-0.20)
+                       ("rust-glib" ,rust-glib-0.20)
+                       ("rust-gtk4" ,rust-gtk4-0.8)
+                       ("rust-libadwaita-sys" ,rust-libadwaita-sys-0.6)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango" ,rust-pango-0.20))))
     (native-inputs (list pkg-config))
-    (inputs (list cairo gdk-pixbuf graphene gtk pango))
-    (home-page "https://gtk-rs.org/")
-    (synopsis "FFI bindings of GTK 4")
-    (description "This package provides FFI bindings of GTK 4.")
+    (inputs (list libadwaita))
+    (home-page "https://world.pages.gitlab.gnome.org/Rust/libadwaita-rs")
+    (synopsis "Rust bindings for libadwaita")
+    (description "Rust bindings for libadwaita.")
     (license license:expat)))
 
 (define-public rust-libadwaita-0.5
   (package
+    (inherit rust-libadwaita-0.6)
     (name "rust-libadwaita")
     (version "0.5.3")
     (source
@@ -3451,7 +3474,6 @@ (define-public rust-libadwaita-0.5
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "174pzn9dwsk8ikvrhx13vkh0zrpvb3rhg9yd2q5d2zjh0q6fgrrg"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.18)
                        ("rust-gdk4" ,rust-gdk4-0.7)
@@ -3460,13 +3482,7 @@ (define-public rust-libadwaita-0.5
                        ("rust-gtk4" ,rust-gtk4-0.7)
                        ("rust-libadwaita-sys" ,rust-libadwaita-sys-0.5)
                        ("rust-libc" ,rust-libc-0.2)
-                       ("rust-pango" ,rust-pango-0.18))))
-    (native-inputs (list pkg-config))
-    (inputs (list libadwaita))
-    (home-page "https://world.pages.gitlab.gnome.org/Rust/libadwaita-rs")
-    (synopsis "Rust bindings for libadwaita")
-    (description "Rust bindings for libadwaita.")
-    (license license:expat)))
+                       ("rust-pango" ,rust-pango-0.18))))))
 
 (define-public rust-libadwaita-sys-0.6
   (package
-- 
2.46.0

bug#73956: [PATCHv2 rust-team 27/27] gnu: Add rust-libadwaita-0.6.

[Efraim Flashner]

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

Thanks! Patches pushed to the rust-team branch

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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