diff --git a/Cargo.lock b/Cargo.lock index a856442..a85ad5b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "adler" version = "1.0.2" @@ -312,8 +314,9 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" [[package]] name = "cairo-rs" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9164355c892b026d6257e696dde5f3cb39beb3718297f0f161b562fe2ee3ab86" dependencies = [ "bitflags", "cairo-sys-rs", @@ -324,12 +327,13 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7c9c3928781e8a017ece15eace05230f04b647457d170d2d9641c94a444ff80" dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 3.1.1", ] [[package]] @@ -347,6 +351,15 @@ dependencies = [ "smallvec", ] +[[package]] +name = "cfg-expr" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edae0b9625d1fce32f7d64b71784d9b1bf8469ec1a9c417e44aaf16a9cbd7571" +dependencies = [ + "smallvec", +] + [[package]] name = "cfg-if" version = "1.0.0" @@ -823,8 +836,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534192cb8f01daeb8fab2c8d4baa8f9aae5b7a39130525779f5c2608e235b10f" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -834,20 +848,22 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f097c0704201fbc8f69c1762dc58c6947c8bb188b8ed0bc7e65259f1894fe590" dependencies = [ "gio-sys", "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 3.1.1", ] [[package]] name = "gdk4" -version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs#6e9f5f5b453bb6461d2d10f703a5a97dab04889e" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce41092cc569129a0afa34926e6dd1cf8411e25652d87febdea36859f7ff7ba" dependencies = [ "bitflags", "cairo-rs", @@ -861,8 +877,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs#6e9f5f5b453bb6461d2d10f703a5a97dab04889e" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce39c71861b5bcde319fd4711a74e1bd6f4f474911170d51096597fef0b56011" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -872,7 +889,7 @@ dependencies = [ "graphene-sys", "libc", "pango-sys", - "system-deps", + "system-deps 3.1.1", ] [[package]] @@ -958,8 +975,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a29d8062af72045518271a2cd98b4e1617ce43f5b4223ad0fb9a0eff8f718c" dependencies = [ "bitflags", "futures-channel", @@ -974,20 +992,22 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 3.1.1", "winapi", ] [[package]] name = "glib" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a930b7208e6e0ab839eea5f65ac2b82109f729621430d47fe905e2e09d33f4" dependencies = [ "bitflags", "futures-channel", @@ -1004,8 +1024,9 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518" dependencies = [ "anyhow", "heck", @@ -1018,11 +1039,12 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae" dependencies = [ "libc", - "system-deps", + "system-deps 3.1.1", ] [[package]] @@ -1040,18 +1062,20 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5" dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 3.1.1", ] [[package]] name = "graphene-rs" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1460a39f06e491e6112f27e71e51435c833ba370723224dd1743dfd1f201f19" dependencies = [ "glib", "graphene-sys", @@ -1060,19 +1084,21 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7d23fb7a9547e5f072a7e0cd49cd648fedeb786d122b106217511980cbb8962" dependencies = [ "glib-sys", "libc", "pkg-config", - "system-deps", + "system-deps 3.1.1", ] [[package]] name = "gsk4" -version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs#6e9f5f5b453bb6461d2d10f703a5a97dab04889e" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64932b730eaad3340378a03d633616eeed6d6705b59b81c9f579c88be8932475" dependencies = [ "bitflags", "cairo-rs", @@ -1086,8 +1112,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs#6e9f5f5b453bb6461d2d10f703a5a97dab04889e" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685ffc776bedd91d68f47b41239525778b669432889721d7050d045270549b9a" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1096,7 +1123,7 @@ dependencies = [ "graphene-sys", "libc", "pango-sys", - "system-deps", + "system-deps 3.1.1", ] [[package]] @@ -1107,8 +1134,9 @@ checksum = "da5bf7748fd4cd0b2490df8debcc911809dbcbee4ece9531b96c29a9c729de5a" [[package]] name = "gtk4" -version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs#6e9f5f5b453bb6461d2d10f703a5a97dab04889e" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c49e0311dac847a8ebc05e31f5c44c596314ee3b16c5f638ccfe24086d24bf1b" dependencies = [ "bitflags", "cairo-rs", @@ -1129,8 +1157,9 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs#6e9f5f5b453bb6461d2d10f703a5a97dab04889e" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbe4b77996bcf1ef20208c00043edda854ca2091b4be5e6a7c367f0f3846fa67" dependencies = [ "anyhow", "heck", @@ -1144,8 +1173,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs#6e9f5f5b453bb6461d2d10f703a5a97dab04889e" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3737e91619cf4257d8a07834f7a2c035d4daeaf9ad8e3958e56b2c411dbdca18" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1157,7 +1187,7 @@ dependencies = [ "gsk4-sys", "libc", "pango-sys", - "system-deps", + "system-deps 3.1.1", ] [[package]] @@ -1387,8 +1417,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libadwaita" -version = "0.1.0" -source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs#da8b0fe0c606e00432bd150d6f2162a85e7b1c74" +version = "0.1.0-alpha-4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "745655a14473ddacdb0b6510d78ff251cc57881bc45837758b2da3edce0db0c3" dependencies = [ "gdk-pixbuf", "gdk4", @@ -1397,13 +1428,15 @@ dependencies = [ "gtk4", "libadwaita-sys", "libc", + "once_cell", "pango", ] [[package]] name = "libadwaita-sys" -version = "0.1.0" -source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs#da8b0fe0c606e00432bd150d6f2162a85e7b1c74" +version = "0.1.0-alpha-4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f50d9962d00ee4120b0a582054f17bb48e42d99ebb7b40edabc6c28724ee457" dependencies = [ "gdk-pixbuf-sys", "gdk4-sys", @@ -1413,7 +1446,7 @@ dependencies = [ "gtk4-sys", "libc", "pango-sys", - "system-deps", + "system-deps 4.0.0", ] [[package]] @@ -1686,8 +1719,9 @@ dependencies = [ [[package]] name = "pango" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc88307d9797976ea62722ff2ec5de3fae279c6e20100ed3f49ca1a4bf3f96" dependencies = [ "bitflags", "glib", @@ -1698,13 +1732,14 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2367099ca5e761546ba1d501955079f097caa186bb53ce0f718dca99ac1942fe" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 3.1.1", ] [[package]] @@ -2517,7 +2552,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c248107ad7bc1ac07066a4d003cae9e9a7bc2e27d3418f7a9cdcdc8699dbea70" dependencies = [ "anyhow", - "cfg-expr", + "cfg-expr 0.7.4", "heck", "itertools", "pkg-config", @@ -2528,6 +2563,19 @@ dependencies = [ "version-compare", ] +[[package]] +name = "system-deps" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c1889ab44c2a423ba9ba4d64cd04989b25c0280ca7ade813f05368418722a04" +dependencies = [ + "cfg-expr 0.9.0", + "heck", + "pkg-config", + "toml", + "version-compare", +] + [[package]] name = "tempfile" version = "3.2.0" diff --git a/Cargo.toml b/Cargo.toml index c7aff21..37d660d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,20 +5,15 @@ authors = ["Rafael Mardojai CM "] edition = "2018" [dependencies] +adw = { version = "0.1.0-alpha-3", package = "libadwaita" } image = "0.23" log = "0.4" pretty_env_logger = "0.4" gettext-rs = { version = "0.6", features = ["gettext-system"] } +gtk = { version = "0.2", package = "gtk4" } gtk-macros = "0.3" once_cell = "1.5" url = "2.2" uuid = { version = "0.8", features = ["serde", "v4"] } scraper = "0.12" surf = "2.2" - -[dependencies.gtk] -package = "gtk4" -git = "https://github.com/gtk-rs/gtk4-rs" - -[dependencies.libadwaita] -git = "https://gitlab.gnome.org/World/Rust/libadwaita-rs" diff --git a/build-aux/com.rafaelmardojai.SharePreview.Devel.json b/build-aux/com.rafaelmardojai.SharePreview.Devel.json index 870d84b..38e1800 100644 --- a/build-aux/com.rafaelmardojai.SharePreview.Devel.json +++ b/build-aux/com.rafaelmardojai.SharePreview.Devel.json @@ -1,7 +1,7 @@ { "app-id": "com.rafaelmardojai.SharePreview.Devel", "runtime": "org.gnome.Platform", - "runtime-version": "40", + "runtime-version": "master", "sdk": "org.gnome.Sdk", "sdk-extensions": ["org.freedesktop.Sdk.Extension.rust-stable"], "command": "share-preview", @@ -47,8 +47,7 @@ { "type" : "git", "url" : "https://gitlab.gnome.org/GNOME/libadwaita.git", - "tag" : "1.0.0-alpha.2", - "commit" : "f5932ab4250c8e709958c6e75a1a4941a5f0f386" + "commit": "198e5593a08d5ae846802d21e9cca02df5559e1b" } ] },