diff --git a/Cargo.lock b/Cargo.lock index 21a1ee8..4c47fe9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -16,9 +16,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "byteorder" @@ -28,8 +28,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cairo-rs" -version = "0.15.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#9aca3680abb33adad8eff51c96b9f767c690f7e8" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62be3562254e90c1c6050a72aa638f6315593e98c5cdaba9017cedbabf0a5dee" dependencies = [ "bitflags", "cairo-sys-rs", @@ -40,8 +41,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.15.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#9aca3680abb33adad8eff51c96b9f767c690f7e8" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ "glib-sys", "libc", @@ -50,19 +52,13 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.7.4" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30aa9e2ffbb838c6b451db14f3cd8e63ed622bf859f9956bc93845a10fafc26a" +checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db" dependencies = [ "smallvec", ] -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - [[package]] name = "field-offset" version = "0.3.4" @@ -168,10 +164,28 @@ dependencies = [ ] [[package]] -name = "gdk-pixbuf" -version = "0.15.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#9aca3680abb33adad8eff51c96b9f767c690f7e8" +name = "gdk" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" dependencies = [ + "bitflags", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +dependencies = [ + "bitflags", "gdk-pixbuf-sys", "gio", "glib", @@ -180,8 +194,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.15.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#9aca3680abb33adad8eff51c96b9f767c690f7e8" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" dependencies = [ "gio-sys", "glib-sys", @@ -191,71 +206,60 @@ dependencies = [ ] [[package]] -name = "gdk4" -version = "0.2.0" -source = "git+https://github.com/gtk-rs/gtk4.git#1e5bf8bbddf4696757f34e7fab0ce58d0f133a68" -dependencies = [ - "bitflags", - "cairo-rs", - "gdk-pixbuf", - "gdk4-sys 0.2.0 (git+https://github.com/gtk-rs/gtk4.git)", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk4" -version = "0.2.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#0dcd4de340363608a768933738bac691b5141c26" -dependencies = [ - "bitflags", - "cairo-rs", - "gdk-pixbuf", - "gdk4-sys 0.2.0 (git+https://github.com/gtk-rs/gtk4-rs.git)", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk4-sys" -version = "0.2.0" -source = "git+https://github.com/gtk-rs/gtk4.git#1e5bf8bbddf4696757f34e7fab0ce58d0f133a68" +name = "gdk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gio-sys", "glib-sys", "gobject-sys", - "graphene-sys", "libc", "pango-sys", + "pkg-config", "system-deps", ] +[[package]] +name = "gdk4" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a2fc0bd03d59383fc10b71a8cb731a1fac2998732a36a0c03e9b1de1513218" +dependencies = [ + "bitflags", + "cairo-rs", + "gdk-pixbuf", + "gdk4-sys", + "gio", + "glib", + "libc", + "pango", +] + [[package]] name = "gdk4-sys" -version = "0.2.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#0dcd4de340363608a768933738bac691b5141c26" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48a39e34abe35ee2cf54a1e29dd983accecd113ad30bdead5050418fa92f2a1b" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gio-sys", "glib-sys", "gobject-sys", - "graphene-sys", "libc", "pango-sys", + "pkg-config", "system-deps", ] [[package]] name = "gio" -version = "0.15.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#9aca3680abb33adad8eff51c96b9f767c690f7e8" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f132be35e05d9662b9fa0fee3f349c6621f7782e0105917f4cc73c1bf47eceb" dependencies = [ "bitflags", "futures-channel", @@ -270,8 +274,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.15.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#9aca3680abb33adad8eff51c96b9f767c690f7e8" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" dependencies = [ "glib-sys", "gobject-sys", @@ -282,8 +287,9 @@ dependencies = [ [[package]] name = "glib" -version = "0.15.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#9aca3680abb33adad8eff51c96b9f767c690f7e8" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd124026a2fa8c33a3d17a3fe59c103f2d9fa5bd92c19e029e037736729abeab" dependencies = [ "bitflags", "futures-channel", @@ -296,12 +302,14 @@ dependencies = [ "libc", "once_cell", "smallvec", + "thiserror", ] [[package]] name = "glib-macros" -version = "0.15.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#9aca3680abb33adad8eff51c96b9f767c690f7e8" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64" dependencies = [ "anyhow", "heck", @@ -314,8 +322,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.15.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#9aca3680abb33adad8eff51c96b9f767c690f7e8" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", "system-deps", @@ -323,8 +332,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.15.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#9aca3680abb33adad8eff51c96b9f767c690f7e8" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ "glib-sys", "libc", @@ -333,8 +343,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.15.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#9aca3680abb33adad8eff51c96b9f767c690f7e8" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c54f9fbbeefdb62c99f892dfca35f83991e2cb5b46a8dc2a715e58612f85570" dependencies = [ "glib", "graphene-sys", @@ -343,8 +354,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.15.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#9aca3680abb33adad8eff51c96b9f767c690f7e8" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa691fc7337ba1df599afb55c3bcb85c04f1b3f17362570e9bb0ff0d1bc3028a" dependencies = [ "glib-sys", "libc", @@ -354,12 +366,13 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.2.0" -source = "git+https://github.com/gtk-rs/gtk4.git#1e5bf8bbddf4696757f34e7fab0ce58d0f133a68" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14d5a47a78c682bb67496b562495ed84972c0512ba0654888c4dc92b80a85bd3" dependencies = [ "bitflags", "cairo-rs", - "gdk4 0.2.0 (git+https://github.com/gtk-rs/gtk4.git)", + "gdk4", "glib", "graphene-rs", "gsk4-sys", @@ -369,11 +382,12 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.2.0" -source = "git+https://github.com/gtk-rs/gtk4.git#1e5bf8bbddf4696757f34e7fab0ce58d0f133a68" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e31d21d7ce02ba261bb24c50c4ab238a10b41a2c97c32afffae29471b7cca69b" dependencies = [ "cairo-sys-rs", - "gdk4-sys 0.2.0 (git+https://github.com/gtk-rs/gtk4.git)", + "gdk4-sys", "glib-sys", "gobject-sys", "graphene-sys", @@ -384,15 +398,16 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.2.0" -source = "git+https://github.com/gtk-rs/gtk4.git#1e5bf8bbddf4696757f34e7fab0ce58d0f133a68" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5d40303dabe4608fc260de2bd7563da6f85bc90af956323f0cd8ae0abcfe03" dependencies = [ "bitflags", "cairo-rs", "field-offset", "futures-channel", "gdk-pixbuf", - "gdk4 0.2.0 (git+https://github.com/gtk-rs/gtk4.git)", + "gdk4", "gio", "glib", "graphene-rs", @@ -406,27 +421,28 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.2.0" -source = "git+https://github.com/gtk-rs/gtk4.git#1e5bf8bbddf4696757f34e7fab0ce58d0f133a68" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f3c4aa605fb3d78205c7aef0eeaa6db61d8cc4dd05a465dc6ffdfdaee84f825" dependencies = [ "anyhow", - "heck", - "itertools", "proc-macro-crate", "proc-macro-error", "proc-macro2", + "quick-xml", "quote", "syn", ] [[package]] name = "gtk4-sys" -version = "0.2.0" -source = "git+https://github.com/gtk-rs/gtk4.git#1e5bf8bbddf4696757f34e7fab0ce58d0f133a68" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c47c075e8f795c38f6e9a47b51a73eab77b325f83c0154979ed4d4245c36490d" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", - "gdk4-sys 0.2.0 (git+https://github.com/gtk-rs/gtk4.git)", + "gdk4-sys", "gio-sys", "glib-sys", "gobject-sys", @@ -439,21 +455,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "itertools" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" -dependencies = [ - "either", -] +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" [[package]] name = "libc" @@ -484,8 +488,9 @@ checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "pango" -version = "0.15.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#9aca3680abb33adad8eff51c96b9f767c690f7e8" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" dependencies = [ "bitflags", "glib", @@ -496,8 +501,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.15.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#9aca3680abb33adad8eff51c96b9f767c690f7e8" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" dependencies = [ "glib-sys", "gobject-sys", @@ -528,9 +534,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.19" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "proc-macro-crate" @@ -587,6 +593,15 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "quick-xml" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b" +dependencies = [ + "memchr", +] + [[package]] name = "quote" version = "1.0.9" @@ -637,9 +652,9 @@ checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" [[package]] name = "smallvec" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "snespatcher" @@ -647,30 +662,12 @@ version = "0.1.0" dependencies = [ "byteorder", "futures", - "gdk4 0.2.0 (git+https://github.com/gtk-rs/gtk4-rs.git)", + "gdk", "gio", "glib", "gtk4", ] -[[package]] -name = "strum" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c" - -[[package]] -name = "strum_macros" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "syn" version = "1.0.73" @@ -684,18 +681,13 @@ dependencies = [ [[package]] name = "system-deps" -version = "3.1.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c248107ad7bc1ac07066a4d003cae9e9a7bc2e27d3418f7a9cdcdc8699dbea70" +checksum = "a1a45a1c4c9015217e12347f2a411b57ce2c4fc543913b14b6fe40483328e709" dependencies = [ - "anyhow", "cfg-expr", "heck", - "itertools", "pkg-config", - "strum", - "strum_macros", - "thiserror", "toml", "version-compare", ] @@ -735,12 +727,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" -[[package]] -name = "unicode-segmentation" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" - [[package]] name = "unicode-xid" version = "0.2.2" @@ -749,9 +735,9 @@ checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "version-compare" -version = "0.0.11" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" +checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73" [[package]] name = "version_check" diff --git a/Cargo.toml b/Cargo.toml index 688a0d0..16d1daf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,9 +7,9 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -gtk4 = { git = "https://github.com/gtk-rs/gtk4.git" } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core.git", package = "glib" } -gio = { git = "https://github.com/gtk-rs/gtk-rs-core.git", package = "gio" } -gdk = { git = "https://github.com/gtk-rs/gtk4-rs.git", package = "gdk4" } +gtk4 = "0.4.7" +glib = "*" +gio = "*" +gdk = "*" futures = "0.3" byteorder = "*" \ No newline at end of file