lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cargo: Update to gtk4-rs 0.9 and core 0.20

Browse source
This commit is contained in:
Sophie Herold 2024-06-14 17:46:33 +02:00
parent dfd74b060f
commit 4650e6766a
10 changed files with 398 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

490
Cargo.lock generated
View file

@ -92,9 +92,8 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
[[package]] [[package]]
name = "ashpd" name = "ashpd"
version = "0.8.1" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/sophie-h/ashpd.git?branch=wip/sophie-h/gtk-rs-0.20#8c147159f4de1d2e7c8fee8f040810509f218ed3"
checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093"
dependencies = [ dependencies = [
"async-fs", "async-fs",
"async-net", "async-net",
@ -103,13 +102,13 @@ dependencies = [
"futures-util", "futures-util",
"gdk4-wayland", "gdk4-wayland",
"gdk4-x11", "gdk4-x11",
"glib", "glib 0.20.0",
"gtk4", "gtk4",
"rand", "rand",
"serde", "serde",
"serde_repr", "serde_repr",
"url", "url",
"zbus", "zbus 4.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -364,24 +363,22 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]] [[package]]
name = "cairo-rs" name = "cairo-rs"
version = "0.19.4" version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core.git?branch=master#0a0d3166157123035acc396c00ce8816011b1697"
checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562"
dependencies = [ dependencies = [
"bitflags 2.5.0", "bitflags 2.5.0",
"cairo-sys-rs", "cairo-sys-rs",
"glib", "glib 0.20.0",
"libc", "libc",
"thiserror", "thiserror",
] ]
[[package]] [[package]]
name = "cairo-sys-rs" name = "cairo-sys-rs"
version = "0.19.2" version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core.git?branch=master#0a0d3166157123035acc396c00ce8816011b1697"
checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64"
dependencies = [ dependencies = [
"glib-sys", "glib-sys 0.20.0",
"libc", "libc",
"system-deps", "system-deps",
] ]
@ -741,55 +738,51 @@ dependencies = [
[[package]] [[package]]
name = "gdk-pixbuf" name = "gdk-pixbuf"
version = "0.19.2" version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core.git?branch=master#0a0d3166157123035acc396c00ce8816011b1697"
checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92"
dependencies = [ dependencies = [
"gdk-pixbuf-sys", "gdk-pixbuf-sys",
"gio", "gio 0.20.0",
"glib", "glib 0.20.0",
"libc", "libc",
] ]
[[package]] [[package]]
name = "gdk-pixbuf-sys" name = "gdk-pixbuf-sys"
version = "0.19.5" version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core.git?branch=master#0a0d3166157123035acc396c00ce8816011b1697"
checksum = "1fdbf021f8b9d19e30fb9ea6d6e5f2b6a712fe4645417c69f86f6ff1e1444a8f"
dependencies = [ dependencies = [
"gio-sys", "gio-sys 0.20.0",
"glib-sys", "glib-sys 0.20.0",
"gobject-sys", "gobject-sys 0.20.0",
"libc", "libc",
"system-deps", "system-deps",
] ]
[[package]] [[package]]
name = "gdk4" name = "gdk4"
version = "0.8.2" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk4-rs.git?branch=master#d1c8a6fedad4d21dfbdb09abe607bf1875cada7e"
checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07"
dependencies = [ dependencies = [
"cairo-rs", "cairo-rs",
"gdk-pixbuf", "gdk-pixbuf",
"gdk4-sys", "gdk4-sys",
"gio", "gio 0.20.0",
"glib", "glib 0.20.0",
"libc", "libc",
"pango", "pango",
] ]
[[package]] [[package]]
name = "gdk4-sys" name = "gdk4-sys"
version = "0.8.2" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk4-rs.git?branch=master#d1c8a6fedad4d21dfbdb09abe607bf1875cada7e"
checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd"
dependencies = [ dependencies = [
"cairo-sys-rs", "cairo-sys-rs",
"gdk-pixbuf-sys", "gdk-pixbuf-sys",
"gio-sys", "gio-sys 0.20.0",
"glib-sys", "glib-sys 0.20.0",
"gobject-sys", "gobject-sys 0.20.0",
"libc", "libc",
"pango-sys", "pango-sys",
"pkg-config", "pkg-config",
@ -798,49 +791,45 @@ dependencies = [
[[package]] [[package]]
name = "gdk4-wayland" name = "gdk4-wayland"
version = "0.8.2" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk4-rs.git?branch=master#d1c8a6fedad4d21dfbdb09abe607bf1875cada7e"
checksum = "f620a0ecbe4c574e3fec6bef6bebcefe19cb1b9a81569245ca4503c95f9b1371"
dependencies = [ dependencies = [
"gdk4", "gdk4",
"gdk4-wayland-sys", "gdk4-wayland-sys",
"gio", "gio 0.20.0",
"glib", "glib 0.20.0",
"libc", "libc",
] ]
[[package]] [[package]]
name = "gdk4-wayland-sys" name = "gdk4-wayland-sys"
version = "0.8.2" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk4-rs.git?branch=master#d1c8a6fedad4d21dfbdb09abe607bf1875cada7e"
checksum = "7a5fd3927c917184b0e8712624eebabdc7f0909b645d468c825f8ec627e61803"
dependencies = [ dependencies = [
"glib-sys", "glib-sys 0.20.0",
"libc", "libc",
"system-deps", "system-deps",
] ]
[[package]] [[package]]
name = "gdk4-x11" name = "gdk4-x11"
version = "0.8.2" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk4-rs.git?branch=master#d1c8a6fedad4d21dfbdb09abe607bf1875cada7e"
checksum = "ec6da3e3527007c14b27ddafe19496c49696a2a74dccb6ab75ba58dfa478b7ab"
dependencies = [ dependencies = [
"gdk4", "gdk4",
"gdk4-x11-sys", "gdk4-x11-sys",
"gio", "gio 0.20.0",
"glib", "glib 0.20.0",
"libc", "libc",
] ]
[[package]] [[package]]
name = "gdk4-x11-sys" name = "gdk4-x11-sys"
version = "0.8.2" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk4-rs.git?branch=master#d1c8a6fedad4d21dfbdb09abe607bf1875cada7e"
checksum = "0bb4e987ec77b7b2fb72c0943ccbec5c3834d9d7165fe762af8ff2414f0ae23d"
dependencies = [ dependencies = [
"gdk4-sys", "gdk4-sys",
"glib-sys", "glib-sys 0.20.0",
"libc", "libc",
"system-deps", "system-deps",
] ]
@ -902,8 +891,25 @@ dependencies = [
"futures-core", "futures-core",
"futures-io", "futures-io",
"futures-util", "futures-util",
"gio-sys", "gio-sys 0.19.5",
"glib", "glib 0.19.6",
"libc",
"pin-project-lite",
"smallvec",
"thiserror",
]
[[package]]
name = "gio"
version = "0.20.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core.git?branch=master#0a0d3166157123035acc396c00ce8816011b1697"
dependencies = [
"futures-channel",
"futures-core",
"futures-io",
"futures-util",
"gio-sys 0.20.0",
"glib 0.20.0",
"libc", "libc",
"pin-project-lite", "pin-project-lite",
"smallvec", "smallvec",
@ -916,8 +922,20 @@ version = "0.19.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40" checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40"
dependencies = [ dependencies = [
"glib-sys", "glib-sys 0.19.5",
"gobject-sys", "gobject-sys 0.19.5",
"libc",
"system-deps",
"windows-sys",
]
[[package]]
name = "gio-sys"
version = "0.20.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core.git?branch=master#0a0d3166157123035acc396c00ce8816011b1697"
dependencies = [
"glib-sys 0.20.0",
"gobject-sys 0.20.0",
"libc", "libc",
"system-deps", "system-deps",
"windows-sys", "windows-sys",
@ -935,10 +953,31 @@ dependencies = [
"futures-executor", "futures-executor",
"futures-task", "futures-task",
"futures-util", "futures-util",
"gio-sys", "gio-sys 0.19.5",
"glib-macros", "glib-macros 0.19.5",
"glib-sys", "glib-sys 0.19.5",
"gobject-sys", "gobject-sys 0.19.5",
"libc",
"memchr",
"smallvec",
"thiserror",
]
[[package]]
name = "glib"
version = "0.20.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core.git?branch=master#0a0d3166157123035acc396c00ce8816011b1697"
dependencies = [
"bitflags 2.5.0",
"futures-channel",
"futures-core",
"futures-executor",
"futures-task",
"futures-util",
"gio-sys 0.20.0",
"glib-macros 0.20.0",
"glib-sys 0.20.0",
"gobject-sys 0.20.0",
"libc", "libc",
"memchr", "memchr",
"smallvec", "smallvec",
@ -958,6 +997,18 @@ dependencies = [
"syn", "syn",
] ]
[[package]]
name = "glib-macros"
version = "0.20.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core.git?branch=master#0a0d3166157123035acc396c00ce8816011b1697"
dependencies = [
"heck 0.5.0",
"proc-macro-crate",
"proc-macro2",
"quote",
"syn",
]
[[package]] [[package]]
name = "glib-sys" name = "glib-sys"
version = "0.19.5" version = "0.19.5"
@ -968,10 +1019,19 @@ dependencies = [
"system-deps", "system-deps",
] ]
[[package]]
name = "glib-sys"
version = "0.20.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core.git?branch=master#0a0d3166157123035acc396c00ce8816011b1697"
dependencies = [
"libc",
"system-deps",
]
[[package]] [[package]]
name = "glycin" name = "glycin"
version = "1.0.2" version = "2.0.0-alpha"
source = "git+https://gitlab.gnome.org/sophie-h/glycin#ccf13e82c4746cc5ea401c1f3ff5b108ad321a6f" source = "git+https://gitlab.gnome.org/sophie-h/glycin#170760102525b52a88771247c991228906169f01"
dependencies = [ dependencies = [
"async-fs", "async-fs",
"async-global-executor", "async-global-executor",
@ -979,8 +1039,10 @@ dependencies = [
"futures-channel", "futures-channel",
"futures-util", "futures-util",
"gdk4", "gdk4",
"gio", "gio 0.20.0",
"glycin-utils", "glycin-utils",
"gufo-common",
"gufo-exif",
"lcms2", "lcms2",
"lcms2-sys", "lcms2-sys",
"libc", "libc",
@ -989,20 +1051,24 @@ dependencies = [
"memmap2", "memmap2",
"nix 0.27.1", "nix 0.27.1",
"thiserror", "thiserror",
"zbus", "zbus 4.2.2 (git+https://github.com/dbus2/zbus.git)",
] ]
[[package]] [[package]]
name = "glycin-utils" name = "glycin-utils"
version = "1.0.2" version = "2.0.0-alpha"
source = "git+https://gitlab.gnome.org/sophie-h/glycin#ccf13e82c4746cc5ea401c1f3ff5b108ad321a6f" source = "git+https://gitlab.gnome.org/sophie-h/glycin#170760102525b52a88771247c991228906169f01"
dependencies = [ dependencies = [
"gufo-common",
"libc", "libc",
"libseccomp", "libseccomp",
"memmap2", "memmap2",
"nix 0.27.1",
"paste",
"rmp-serde",
"serde", "serde",
"thiserror", "thiserror",
"zbus", "zbus 4.2.2 (git+https://github.com/dbus2/zbus.git)",
] ]
[[package]] [[package]]
@ -1011,29 +1077,37 @@ version = "0.19.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b" checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b"
dependencies = [ dependencies = [
"glib-sys", "glib-sys 0.19.5",
"libc",
"system-deps",
]
[[package]]
name = "gobject-sys"
version = "0.20.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core.git?branch=master#0a0d3166157123035acc396c00ce8816011b1697"
dependencies = [
"glib-sys 0.20.0",
"libc", "libc",
"system-deps", "system-deps",
] ]
[[package]] [[package]]
name = "graphene-rs" name = "graphene-rs"
version = "0.19.2" version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core.git?branch=master#0a0d3166157123035acc396c00ce8816011b1697"
checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91"
dependencies = [ dependencies = [
"glib", "glib 0.20.0",
"graphene-sys", "graphene-sys",
"libc", "libc",
] ]
[[package]] [[package]]
name = "graphene-sys" name = "graphene-sys"
version = "0.19.5" version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core.git?branch=master#0a0d3166157123035acc396c00ce8816011b1697"
checksum = "2a60e7381afdd7be43bd10a89d3b6741d162aabbca3a8db73505afb6a3aea59d"
dependencies = [ dependencies = [
"glib-sys", "glib-sys 0.20.0",
"libc", "libc",
"pkg-config", "pkg-config",
"system-deps", "system-deps",
@ -1041,13 +1115,12 @@ dependencies = [
[[package]] [[package]]
name = "gsk4" name = "gsk4"
version = "0.8.2" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk4-rs.git?branch=master#d1c8a6fedad4d21dfbdb09abe607bf1875cada7e"
checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be"
dependencies = [ dependencies = [
"cairo-rs", "cairo-rs",
"gdk4", "gdk4",
"glib", "glib 0.20.0",
"graphene-rs", "graphene-rs",
"gsk4-sys", "gsk4-sys",
"libc", "libc",
@ -1056,14 +1129,13 @@ dependencies = [
[[package]] [[package]]
name = "gsk4-sys" name = "gsk4-sys"
version = "0.8.2" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk4-rs.git?branch=master#d1c8a6fedad4d21dfbdb09abe607bf1875cada7e"
checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc"
dependencies = [ dependencies = [
"cairo-sys-rs", "cairo-sys-rs",
"gdk4-sys", "gdk4-sys",
"glib-sys", "glib-sys 0.20.0",
"gobject-sys", "gobject-sys 0.20.0",
"graphene-sys", "graphene-sys",
"libc", "libc",
"pango-sys", "pango-sys",
@ -1072,17 +1144,16 @@ dependencies = [
[[package]] [[package]]
name = "gtk4" name = "gtk4"
version = "0.8.2" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk4-rs.git?branch=master#d1c8a6fedad4d21dfbdb09abe607bf1875cada7e"
checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab"
dependencies = [ dependencies = [
"cairo-rs", "cairo-rs",
"field-offset", "field-offset",
"futures-channel", "futures-channel",
"gdk-pixbuf", "gdk-pixbuf",
"gdk4", "gdk4",
"gio", "gio 0.20.0",
"glib", "glib 0.20.0",
"graphene-rs", "graphene-rs",
"gsk4", "gsk4",
"gtk4-macros", "gtk4-macros",
@ -1093,9 +1164,8 @@ dependencies = [
[[package]] [[package]]
name = "gtk4-macros" name = "gtk4-macros"
version = "0.8.2" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk4-rs.git?branch=master#d1c8a6fedad4d21dfbdb09abe607bf1875cada7e"
checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408"
dependencies = [ dependencies = [
"proc-macro-crate", "proc-macro-crate",
"proc-macro2", "proc-macro2",
@ -1106,16 +1176,15 @@ dependencies = [
[[package]] [[package]]
name = "gtk4-sys" name = "gtk4-sys"
version = "0.8.2" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk4-rs.git?branch=master#d1c8a6fedad4d21dfbdb09abe607bf1875cada7e"
checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5"
dependencies = [ dependencies = [
"cairo-sys-rs", "cairo-sys-rs",
"gdk-pixbuf-sys", "gdk-pixbuf-sys",
"gdk4-sys", "gdk4-sys",
"gio-sys", "gio-sys 0.20.0",
"glib-sys", "glib-sys 0.20.0",
"gobject-sys", "gobject-sys 0.20.0",
"graphene-sys", "graphene-sys",
"gsk4-sys", "gsk4-sys",
"libc", "libc",
@ -1123,6 +1192,26 @@ dependencies = [
"system-deps", "system-deps",
] ]
[[package]]
name = "gufo-common"
version = "0.1.0"
source = "git+https://github.com/gufo-rs/gufo.git#24eea4b5d7109c034c4cedb159d9a200d895f724"
dependencies = [
"once_cell",
"paste",
"serde",
]
[[package]]
name = "gufo-exif"
version = "0.1.0"
source = "git+https://github.com/gufo-rs/gufo.git#24eea4b5d7109c034c4cedb159d9a200d895f724"
dependencies = [
"gufo-common",
"thiserror",
"tracing",
]
[[package]] [[package]]
name = "gvdb" name = "gvdb"
version = "0.6.1" version = "0.6.1"
@ -1136,7 +1225,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"walkdir", "walkdir",
"zvariant", "zvariant 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1157,9 +1246,9 @@ version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dde1d5eedb5b83ca0a2345c29655b72ea4ea8922ea54e52a75fe60366fd8428b" checksum = "dde1d5eedb5b83ca0a2345c29655b72ea4ea8922ea54e52a75fe60366fd8428b"
dependencies = [ dependencies = [
"gio-sys", "gio-sys 0.19.5",
"glib-sys", "glib-sys 0.19.5",
"gobject-sys", "gobject-sys 0.19.5",
"libc", "libc",
"system-deps", "system-deps",
] ]
@ -1281,14 +1370,12 @@ dependencies = [
[[package]] [[package]]
name = "libadwaita" name = "libadwaita"
version = "0.6.0" version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs.git?branch=master#4faeb2e8b501c86a80718724b488b9fe65bd114f"
checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9"
dependencies = [ dependencies = [
"gdk-pixbuf",
"gdk4", "gdk4",
"gio", "gio 0.20.0",
"glib", "glib 0.20.0",
"gtk4", "gtk4",
"libadwaita-sys", "libadwaita-sys",
"libc", "libc",
@ -1297,14 +1384,13 @@ dependencies = [
[[package]] [[package]]
name = "libadwaita-sys" name = "libadwaita-sys"
version = "0.6.0" version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs.git?branch=master#4faeb2e8b501c86a80718724b488b9fe65bd114f"
checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8"
dependencies = [ dependencies = [
"gdk4-sys", "gdk4-sys",
"gio-sys", "gio-sys 0.20.0",
"glib-sys", "glib-sys 0.20.0",
"gobject-sys", "gobject-sys 0.20.0",
"gtk4-sys", "gtk4-sys",
"libc", "libc",
"pango-sys", "pango-sys",
@ -1323,8 +1409,8 @@ version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2cb8f774df868ceca45c30e19945b5895d599ed1ed33b28092eec9f38d4e3ba3" checksum = "2cb8f774df868ceca45c30e19945b5895d599ed1ed33b28092eec9f38d4e3ba3"
dependencies = [ dependencies = [
"gio", "gio 0.19.5",
"glib", "glib 0.19.6",
"gweather-sys", "gweather-sys",
"libc", "libc",
] ]
@ -1395,7 +1481,7 @@ dependencies = [
"futures-lite", "futures-lite",
"gettext-rs", "gettext-rs",
"gettext-sys", "gettext-sys",
"gio", "gio 0.20.0",
"glycin", "glycin",
"gtk4", "gtk4",
"gvdb-macros", "gvdb-macros",
@ -1490,6 +1576,15 @@ dependencies = [
"memoffset", "memoffset",
] ]
[[package]]
name = "num-traits"
version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [
"autocfg",
]
[[package]] [[package]]
name = "objc" name = "objc"
version = "0.2.7" version = "0.2.7"
@ -1546,24 +1641,22 @@ dependencies = [
[[package]] [[package]]
name = "pango" name = "pango"
version = "0.19.5" version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core.git?branch=master#0a0d3166157123035acc396c00ce8816011b1697"
checksum = "504ce6e805439ea2c6791168fe7ef8e3da0c1b2ef82c44bc450dbc330592920d"
dependencies = [ dependencies = [
"gio", "gio 0.20.0",
"glib", "glib 0.20.0",
"libc", "libc",
"pango-sys", "pango-sys",
] ]
[[package]] [[package]]
name = "pango-sys" name = "pango-sys"
version = "0.19.5" version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core.git?branch=master#0a0d3166157123035acc396c00ce8816011b1697"
checksum = "e4829555bdbb83692ddeaf5a6927fb2d025c8131e5ecaa4f7619fff6985d3505"
dependencies = [ dependencies = [
"glib-sys", "glib-sys 0.20.0",
"gobject-sys", "gobject-sys 0.20.0",
"libc", "libc",
"system-deps", "system-deps",
] ]
@ -1574,6 +1667,12 @@ version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
[[package]]
name = "paste"
version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
[[package]] [[package]]
name = "percent-encoding" name = "percent-encoding"
version = "2.3.1" version = "2.3.1"
@ -1726,6 +1825,28 @@ version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
[[package]]
name = "rmp"
version = "0.8.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
dependencies = [
"byteorder",
"num-traits",
"paste",
]
[[package]]
name = "rmp-serde"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
dependencies = [
"byteorder",
"rmp",
"serde",
]
[[package]] [[package]]
name = "rustc-demangle" name = "rustc-demangle"
version = "0.1.24" version = "0.1.24"
@ -1903,9 +2024,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.65" version = "2.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106" checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2309,9 +2430,46 @@ dependencies = [
"uds_windows", "uds_windows",
"windows-sys", "windows-sys",
"xdg-home", "xdg-home",
"zbus_macros", "zbus_macros 4.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"zbus_names", "zbus_names 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"zvariant", "zvariant 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "zbus"
version = "4.2.2"
source = "git+https://github.com/dbus2/zbus.git#1e27941ee83375adb5507110e07fe101fc472caf"
dependencies = [
"async-broadcast",
"async-executor",
"async-fs",
"async-io",
"async-lock",
"async-process",
"async-recursion",
"async-task",
"async-trait",
"blocking",
"enumflags2",
"event-listener 5.3.0",
"futures-core",
"futures-sink",
"futures-util",
"hex",
"nix 0.28.0",
"ordered-stream",
"rand",
"serde",
"serde_repr",
"sha1",
"static_assertions",
"tracing",
"uds_windows",
"windows-sys",
"xdg-home",
"zbus_macros 4.2.2 (git+https://github.com/dbus2/zbus.git)",
"zbus_names 3.0.0 (git+https://github.com/dbus2/zbus.git)",
"zvariant 4.1.1 (git+https://github.com/dbus2/zbus.git)",
] ]
[[package]] [[package]]
@ -2324,7 +2482,19 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn",
"zvariant_utils", "zvariant_utils 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "zbus_macros"
version = "4.2.2"
source = "git+https://github.com/dbus2/zbus.git#1e27941ee83375adb5507110e07fe101fc472caf"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
"syn",
"zvariant_utils 2.0.0 (git+https://github.com/dbus2/zbus.git)",
] ]
[[package]] [[package]]
@ -2335,7 +2505,17 @@ checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
dependencies = [ dependencies = [
"serde", "serde",
"static_assertions", "static_assertions",
"zvariant", "zvariant 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "zbus_names"
version = "3.0.0"
source = "git+https://github.com/dbus2/zbus.git#1e27941ee83375adb5507110e07fe101fc472caf"
dependencies = [
"serde",
"static_assertions",
"zvariant 4.1.1 (git+https://github.com/dbus2/zbus.git)",
] ]
[[package]] [[package]]
@ -2349,7 +2529,19 @@ dependencies = [
"serde", "serde",
"static_assertions", "static_assertions",
"url", "url",
"zvariant_derive", "zvariant_derive 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "zvariant"
version = "4.1.1"
source = "git+https://github.com/dbus2/zbus.git#1e27941ee83375adb5507110e07fe101fc472caf"
dependencies = [
"endi",
"enumflags2",
"serde",
"static_assertions",
"zvariant_derive 4.1.1 (git+https://github.com/dbus2/zbus.git)",
] ]
[[package]] [[package]]
@ -2362,7 +2554,19 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn",
"zvariant_utils", "zvariant_utils 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "zvariant_derive"
version = "4.1.1"
source = "git+https://github.com/dbus2/zbus.git#1e27941ee83375adb5507110e07fe101fc472caf"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
"syn",
"zvariant_utils 2.0.0 (git+https://github.com/dbus2/zbus.git)",
] ]
[[package]] [[package]]
@ -2375,3 +2579,13 @@ dependencies = [
"quote", "quote",
"syn", "syn",
] ]
[[package]]
name = "zvariant_utils"
version = "2.0.0"
source = "git+https://github.com/dbus2/zbus.git#1e27941ee83375adb5507110e07fe101fc472caf"
dependencies = [
"proc-macro2",
"quote",
"syn",
]

24
Cargo.toml
View file

@ -14,23 +14,33 @@ disable-glycin-sandbox = []
x11 = ["ashpd/gtk4_x11"] x11 = ["ashpd/gtk4_x11"]
[dependencies] [dependencies]
adw = { package = "libadwaita", version = "0.6.0", features = ["v1_5"] } adw = { package = "libadwaita", version = "0.7.0", features = [
"v1_5",
], git = "https://gitlab.gnome.org/World/Rust/libadwaita-rs.git", branch = "master" }
anyhow = { version = "1.0.66", features = ["backtrace"] } anyhow = { version = "1.0.66", features = ["backtrace"] }
arc-swap = "1.6.0" arc-swap = "1.6.0"
ashpd = { version = "0.8.0", features = ["gtk4_wayland"] } ashpd = { version = "0.9.0", features = [
"gtk4_wayland",
], git = "https://github.com/sophie-h/ashpd.git", branch = "wip/sophie-h/gtk-rs-0.20" }
async-channel = "2.1.0" async-channel = "2.1.0"
cairo-rs = { version = "*", features = ["pdf"] } cairo-rs = { version = "*", features = [
"pdf",
], git = "https://github.com/gtk-rs/gtk-rs-core.git", branch = "master" }
env_logger = "0.11.0" env_logger = "0.11.0"
futures-channel = "0.3.25" futures-channel = "0.3.25"
futures-lite = "2.1.0" futures-lite = "2.1.0"
gettext-rs = { version = "0.7.0", features = ["gettext-system"] } gettext-rs = { version = "0.7.0", features = ["gettext-system"] }
gettext-sys = { version = "0.21.3", features = ["gettext-system"] } gettext-sys = { version = "0.21.3", features = ["gettext-system"] }
gio = { version = "0.19.0", features = ["v2_74"] } gio = { version = "0.20.0", features = [
glycin = { version = "1.0.2", git = "https://gitlab.gnome.org/sophie-h/glycin" } "v2_74",
gtk = { package = "gtk4", version = "0.8.0", features = [ ], git = "https://github.com/gtk-rs/gtk-rs-core.git", branch = "master" }
glycin = { version = "2.0.0-alpha", features = [
"gdk4",
], git = "https://gitlab.gnome.org/sophie-h/glycin" }
gtk = { package = "gtk4", version = "0.9.0", features = [
"v4_14", "v4_14",
"xml_validation", "xml_validation",
] } ], git = "https://github.com/gtk-rs/gtk4-rs.git", branch = "master" }
gvdb-macros = "0.1.6" gvdb-macros = "0.1.6"
indexmap = "2.0.0" indexmap = "2.0.0"
kamadak-exif = "0.5.5" kamadak-exif = "0.5.5"

19
src/decoder/formats/glycin_proxy.rs
View file

@ -61,7 +61,7 @@ impl Glycin {
let mut metadata: Metadata = Metadata::default(); let mut metadata: Metadata = Metadata::default();
metadata.set_image_info(image.info().details.clone()); metadata.set_image_info(image.info().details.clone());
metadata.set_mime_type(image.mime_type()); metadata.set_mime_type(image.mime_type().to_string());
updater.send(DecoderUpdate::Metadata(Box::new(metadata))); updater.send(DecoderUpdate::Metadata(Box::new(metadata)));
let dimensions = (image.info().width, image.info().height); let dimensions = (image.info().width, image.info().height);
@ -70,14 +70,11 @@ impl Glycin {
let frame = image.next_frame().await?; let frame = image.next_frame().await?;
let mut metadata: Metadata = Metadata::default(); let mut metadata: Metadata = Metadata::default();
metadata.set_frame_info(frame.details); metadata.set_frame_info(frame.details().clone());
updater.send(DecoderUpdate::Metadata(Box::new(metadata))); updater.send(DecoderUpdate::Metadata(Box::new(metadata)));
tiles.set_original_dimensions(( tiles.set_original_dimensions((frame.width() as u32, frame.height() as u32));
frame.texture.width() as u32,
frame.texture.height() as u32,
));
if let Some(delay) = frame.delay { if let Some(delay) = frame.delay() {
updater.send(DecoderUpdate::Animated); updater.send(DecoderUpdate::Animated);
let position = (0, 0); let position = (0, 0);
@ -86,7 +83,7 @@ impl Glycin {
position, position,
zoom_level: tiling::zoom_to_level(1.), zoom_level: tiling::zoom_to_level(1.),
bleed: 0, bleed: 0,
texture: frame.texture, texture: frame.texture(),
}; };
tiles.push_frame(tile, dimensions, delay); tiles.push_frame(tile, dimensions, delay);
@ -103,10 +100,10 @@ impl Glycin {
position, position,
zoom_level: tiling::zoom_to_level(1.), zoom_level: tiling::zoom_to_level(1.),
bleed: 0, bleed: 0,
texture: frame.texture, texture: frame.texture(),
}; };
tiles.push_frame(tile, dimensions, frame.delay.unwrap_or(delay)); tiles.push_frame(tile, dimensions, frame.delay().unwrap_or(delay));
if tiles.n_frames() >= FRAME_BUFFER { if tiles.n_frames() >= FRAME_BUFFER {
break; break;
@ -122,7 +119,7 @@ impl Glycin {
position: (0, 0), position: (0, 0),
zoom_level: tiling::zoom_to_level(1.), zoom_level: tiling::zoom_to_level(1.),
bleed: 0, bleed: 0,
texture: frame.texture, texture: frame.texture(),
}; };
tiles.push(tile); tiles.push(tile);

6
src/decoder/formats/svg.rs
View file

@ -81,7 +81,7 @@ impl Svg {
let mut metadata: Metadata = Metadata::default(); let mut metadata: Metadata = Metadata::default();
metadata.set_image_info(image.info().details.clone()); metadata.set_image_info(image.info().details.clone());
metadata.set_mime_type(image.mime_type()); metadata.set_mime_type(image.mime_type().to_string());
updater.send(DecoderUpdate::Metadata(Box::new(metadata))); updater.send(DecoderUpdate::Metadata(Box::new(metadata)));
tiles.set_original_dimensions((image.info().width, image.info().height)); tiles.set_original_dimensions((image.info().width, image.info().height));
@ -145,7 +145,7 @@ impl Svg {
tile_instructions.area.y() as u32, tile_instructions.area.y() as u32,
); );
tiles.push_tile(tiling, position, frame.texture); tiles.push_tile(tiling, position, frame.texture());
} }
} }
} }
@ -188,6 +188,6 @@ impl Svg {
let frame_request = glycin::FrameRequest::new().scale(width as u32, height as u32); let frame_request = glycin::FrameRequest::new().scale(width as u32, height as u32);
let frame = image.specific_frame(frame_request).await?; let frame = image.specific_frame(frame_request).await?;
Ok(frame.texture) Ok(frame.texture())
} }
} }

2
src/widgets/error_details.rs
View file

@ -88,7 +88,7 @@ impl LpErrorDetails {
); );
})); }));
obj.present(root); obj.present(Some(root));
obj obj
} }
} }

2
src/widgets/image_page.rs
View file

@ -193,7 +193,7 @@ impl LpImagePage {
let image = self.image(); let image = self.image();
if image.is_unsupported() { if image.is_unsupported() {
let message = if glycin::supported_mime_types().await.is_empty() { let message = if glycin::supported_loader_mime_types().await.is_empty() {
// Translators: {} is replace with a version number // Translators: {} is replace with a version number
gettext_f( gettext_f(
"No image loaders available. Maybe the “glycin-loaders” package with compatibility version “{}+” is not installed.", "No image loaders available. Maybe the “glycin-loaders” package with compatibility version “{}+” is not installed.",

12
src/widgets/print.rs
View file

@ -446,9 +446,9 @@ impl LpPrint {
.build(); .build();
let print_settings = if let Some(print_setup) = print_setup { let print_settings = if let Some(print_setup) = print_setup {
print_dialog.set_page_setup(&print_setup.page_setup().unwrap()); print_dialog.set_page_setup(&print_setup.page_setup());
print_setup.print_settings().unwrap() print_setup.print_settings()
} else { } else {
gtk::PrintSettings::new() gtk::PrintSettings::new()
}; };
@ -465,7 +465,7 @@ impl LpPrint {
log::warn!("Failed to print: {err}"); log::warn!("Failed to print: {err}");
return; return;
} }
Ok(print_setup) => print_setup.unwrap(), Ok(print_setup) => print_setup,
}; };
Self::new(image, parent, print_dialog, print_setup); Self::new(image, parent, print_dialog, print_setup);
@ -513,7 +513,7 @@ impl LpPrint {
} }
pub fn print_settings(&self) -> gtk::PrintSettings { pub fn print_settings(&self) -> gtk::PrintSettings {
self.print_setup().print_settings().unwrap() self.print_setup().print_settings()
} }
pub fn file(&self) -> gio::File { pub fn file(&self) -> gio::File {
@ -836,7 +836,7 @@ impl LpPrint {
} }
pub fn page_setup(&self) -> gtk::PageSetup { pub fn page_setup(&self) -> gtk::PageSetup {
self.print_setup().page_setup().unwrap() self.print_setup().page_setup()
} }
/// Go back to print dialog from image layout /// Go back to print dialog from image layout
@ -862,7 +862,7 @@ impl LpPrint {
log::warn!("Print error: {err}"); log::warn!("Print error: {err}");
return; return;
} }
Ok(output_stream) => obj.draw_page(output_stream.unwrap()).await, Ok(output_stream) => obj.draw_page(output_stream).await,
}; };
if let Err(err) = draw_result { if let Err(err) = draw_result {

14
src/window.rs
View file

@ -440,8 +440,8 @@ impl LpWindow {
let filter_supported_formats = gtk::FileFilter::new(); let filter_supported_formats = gtk::FileFilter::new();
filter_supported_formats.set_name(Some(&gettext("Supported image formats"))); filter_supported_formats.set_name(Some(&gettext("Supported image formats")));
for mime_type in glycin::supported_mime_types().await { for mime_type in glycin::supported_loader_mime_types().await {
filter_supported_formats.add_mime_type(&mime_type); filter_supported_formats.add_mime_type(mime_type.as_str());
} }
let filter_all_files = gtk::FileFilter::new(); let filter_all_files = gtk::FileFilter::new();
@ -519,7 +519,7 @@ impl LpWindow {
/// Returns true if some text in metadata is currently selected /// Returns true if some text in metadata is currently selected
fn has_metadata_selected(&self) -> bool { fn has_metadata_selected(&self) -> bool {
if let Some(focus_widget) = self.focus_widget() { if let Some(focus_widget) = self.focus() {
if focus_widget.is_ancestor(&*self.imp().properties_view) { if focus_widget.is_ancestor(&*self.imp().properties_view) {
if let Ok(label) = focus_widget.downcast::<gtk::Label>() { if let Ok(label) = focus_widget.downcast::<gtk::Label>() {
return label.selection_bounds().is_some(); return label.selection_bounds().is_some();
@ -817,11 +817,11 @@ impl LpWindow {
fn on_fullscreen_changed(&self) { fn on_fullscreen_changed(&self) {
self.imp() self.imp()
.image_view .image_view
.on_fullscreen_changed(self.is_fullscreened()); .on_fullscreen_changed(self.is_fullscreen());
self.update_headerbar_style(); self.update_headerbar_style();
if !self.is_fullscreened() { if !self.is_fullscreen() {
self.set_cursor(None); self.set_cursor(None);
self.show_controls(); self.show_controls();
} }
@ -845,7 +845,7 @@ impl LpWindow {
} }
fn is_content_extended_to_top(&self) -> bool { fn is_content_extended_to_top(&self) -> bool {
self.is_fullscreened() && !self.imp().properties_button.is_active() self.is_fullscreen() && !self.imp().properties_button.is_active()
} }
fn update_headerbar_style(&self) { fn update_headerbar_style(&self) {
@ -884,6 +884,6 @@ impl LpWindow {
async fn show_about(&self) { async fn show_about(&self) {
let about = crate::about::dialog().await; let about = crate::about::dialog().await;
about.present(self); about.present(Some(self));
} }
} }

2
src/window/actions.rs
View file

@ -408,7 +408,7 @@ impl Action {
Action::ToggleFullscreen => { Action::ToggleFullscreen => {
klass.install_action(&action, None, move |win, _, _| { klass.install_action(&action, None, move |win, _, _| {
win.toggle_fullscreen(!win.is_fullscreened()); win.toggle_fullscreen(!win.is_fullscreen());
}); });
klass.add_binding_action(gdk::Key::F11, gdk::ModifierType::empty(), &action); klass.add_binding_action(gdk::Key::F11, gdk::ModifierType::empty(), &action);
} }

4
src/window/controls.rs
View file

@ -29,13 +29,13 @@ impl LpWindow {
self.image_view().controls_box_start().set_opacity(opacity); self.image_view().controls_box_start().set_opacity(opacity);
self.image_view().controls_box_end().set_opacity(opacity); self.image_view().controls_box_end().set_opacity(opacity);
if self.is_headerbar_flat() && self.is_fullscreened() { if self.is_headerbar_flat() && self.is_fullscreen() {
self.headerbar().set_opacity(opacity); self.headerbar().set_opacity(opacity);
} else { } else {
self.headerbar().set_opacity(1.); self.headerbar().set_opacity(1.);
} }
if self.is_fullscreened() && hiding && opacity < 0.9 { if self.is_fullscreen() && hiding && opacity < 0.9 {
self.set_cursor(gdk::Cursor::from_name("none", None).as_ref()); self.set_cursor(gdk::Cursor::from_name("none", None).as_ref());
} else { } else {
self.set_cursor(None); self.set_cursor(None);