Commit 483001a9 authored by Florian Blasius's avatar Florian Blasius 🤘

fix dependencies

parent 93150158
......@@ -56,15 +56,9 @@ checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
[[package]]
name = "base64"
version = "0.12.3"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
[[package]]
name = "bitflags"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
[[package]]
name = "bitflags"
......@@ -86,9 +80,9 @@ checksum = "41aa2ec95ca3b5c54cf73c91acf06d24f4495d5f1b1c12506ae3483d646177ac"
[[package]]
name = "byteorder"
version = "1.3.4"
version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
[[package]]
name = "case"
......@@ -156,6 +150,16 @@ dependencies = [
"fxhash",
]
[[package]]
name = "deflate"
version = "0.7.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
dependencies = [
"adler32",
"byteorder",
]
[[package]]
name = "deflate"
version = "0.8.6"
......@@ -261,12 +265,6 @@ dependencies = [
"miniz_oxide 0.4.3",
]
[[package]]
name = "fuchsia-cprng"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
[[package]]
name = "fxhash"
version = "0.2.1"
......@@ -278,11 +276,11 @@ dependencies = [
[[package]]
name = "getrandom"
version = "0.1.15"
version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
dependencies = [
"cfg-if 0.1.10",
"cfg-if 1.0.0",
"libc",
"wasi",
]
......@@ -308,20 +306,23 @@ dependencies = [
"num-iter",
"num-rational",
"num-traits",
"png",
"png 0.16.8",
]
[[package]]
name = "itoa"
version = "0.4.6"
name = "inflate"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff"
dependencies = [
"adler32",
]
[[package]]
name = "lazy_static"
version = "0.2.11"
name = "itoa"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
[[package]]
name = "lazy_static"
......@@ -336,7 +337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616"
dependencies = [
"arrayvec",
"bitflags 1.2.1",
"bitflags",
"cfg-if 0.1.10",
"ryu",
"static_assertions",
......@@ -344,9 +345,9 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.81"
version = "0.2.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"
[[package]]
name = "log"
......@@ -387,7 +388,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2eb411a297b8f714800f085846cbda55fbd2ae17ecd381f1b4652af0e5bebe63"
dependencies = [
"cc",
"orbclient 0.3.23",
"orbclient 0.3.30 (registry+https://github.com/rust-lang/crates.io-index)",
"raw-window-handle",
"tempfile",
"wayland-client",
......@@ -424,7 +425,7 @@ version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
dependencies = [
"bitflags 1.2.1",
"bitflags",
"cc",
"cfg-if 0.1.10",
"libc",
......@@ -441,17 +442,6 @@ dependencies = [
"version_check",
]
[[package]]
name = "num"
version = "0.1.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e"
dependencies = [
"num-integer",
"num-iter",
"num-traits",
]
[[package]]
name = "num-integer"
version = "0.1.44"
......@@ -511,24 +501,27 @@ checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
[[package]]
name = "orbclient"
version = "0.3.23"
version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "135507db238b8326a429e2c9f79cda29167a63223734f3c52956cc54e16f7d46"
checksum = "ee68c3c79e81d82127e0870f94479675774d34c7ad5b55eecb9c320ef9701187"
dependencies = [
"redox_syscall 0.1.57",
"sdl2 0.31.0",
"libc",
"raw-window-handle",
"redox_syscall 0.2.1",
"sdl2",
"sdl2-sys",
]
[[package]]
name = "orbclient"
version = "0.3.28"
source = "git+https://gitlab.redox-os.org/redox-os/orbclient.git?branch=master#fdff45e77693995d636a1e07a3a05052bb287a88"
version = "0.3.30"
source = "git+https://gitlab.redox-os.org/redox-os/orbclient.git?branch=master#904157c3167a79112d78d276515ec459d74afe32"
dependencies = [
"libc",
"raw-window-handle",
"redox_syscall 0.2.1",
"sdl2 0.34.3",
"sdl2-sys 0.34.3",
"sdl2",
"sdl2-sys",
]
[[package]]
......@@ -617,13 +610,13 @@ dependencies = [
"console_error_panic_hook",
"derive_more",
"image",
"lazy_static 1.4.0",
"lazy_static",
"minifb",
"orbclient 0.3.28",
"orbclient 0.3.30 (git+https://gitlab.redox-os.org/redox-os/orbclient.git)",
"orbtk_render",
"orbtk_utils",
"raw-window-handle",
"sdl2 0.34.3",
"sdl2",
"spin_sleep",
"stdweb",
]
......@@ -632,7 +625,7 @@ dependencies = [
name = "orbtk_theme_default"
version = "0.3.1-alpha4"
dependencies = [
"lazy_static 1.4.0",
"lazy_static",
"orbtk_theming",
]
......@@ -640,7 +633,7 @@ dependencies = [
name = "orbtk_theme_fluent"
version = "0.3.1-alpha4"
dependencies = [
"lazy_static 1.4.0",
"lazy_static",
"orbtk_theme_default",
"orbtk_theming",
]
......@@ -649,7 +642,7 @@ dependencies = [
name = "orbtk_theme_redox"
version = "0.3.1-alpha4"
dependencies = [
"lazy_static 1.4.0",
"lazy_static",
"orbtk_theme_default",
"orbtk_theming",
]
......@@ -687,7 +680,7 @@ name = "orbtk_widgets"
version = "0.3.1-alpha4"
dependencies = [
"dces",
"lazy_static 1.4.0",
"lazy_static",
"orbtk_api",
"orbtk_proc_macros",
"orbtk_render",
......@@ -732,7 +725,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
dependencies = [
"phf_shared",
"rand 0.7.3",
"rand",
]
[[package]]
......@@ -750,15 +743,27 @@ version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
[[package]]
name = "png"
version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef859a23054bbfee7811284275ae522f0434a3c8e7f4b74bd4a35ae7e1c4a283"
dependencies = [
"bitflags",
"crc32fast",
"deflate 0.7.20",
"inflate",
]
[[package]]
name = "png"
version = "0.16.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6"
dependencies = [
"bitflags 1.2.1",
"bitflags",
"crc32fast",
"deflate",
"deflate 0.8.6",
"miniz_oxide 0.3.7",
]
......@@ -779,36 +784,13 @@ dependencies = [
[[package]]
name = "quote"
version = "1.0.7"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
dependencies = [
"proc-macro2",
]
[[package]]
name = "rand"
version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c"
dependencies = [
"libc",
"rand 0.4.6",
]
[[package]]
name = "rand"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
dependencies = [
"fuchsia-cprng",
"libc",
"rand_core 0.3.1",
"rdrand",
"winapi",
]
[[package]]
name = "rand"
version = "0.7.3"
......@@ -818,7 +800,7 @@ dependencies = [
"getrandom",
"libc",
"rand_chacha",
"rand_core 0.5.1",
"rand_core",
"rand_hc",
"rand_pcg",
]
......@@ -830,24 +812,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
dependencies = [
"ppv-lite86",
"rand_core 0.5.1",
"rand_core",
]
[[package]]
name = "rand_core"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
dependencies = [
"rand_core 0.4.2",
]
[[package]]
name = "rand_core"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
[[package]]
name = "rand_core"
version = "0.5.1"
......@@ -863,7 +830,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
dependencies = [
"rand_core 0.5.1",
"rand_core",
]
[[package]]
......@@ -872,16 +839,18 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
dependencies = [
"rand_core 0.5.1",
"rand_core",
]
[[package]]
name = "raqote"
version = "0.8.1-alpha.0"
source = "git+https://github.com/jrmuizel/raqote.git#a4769629a04a691094c57c0c7bf119d89e745f54"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "501c19caa439857ed7bea975fa4c3c10ee9a24e33c2640030c3ac14b58f39f77"
dependencies = [
"euclid",
"lyon_geom",
"png 0.15.3",
"sw-composite",
"typed-arena",
]
......@@ -895,15 +864,6 @@ dependencies = [
"libc",
]
[[package]]
name = "rdrand"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
dependencies = [
"rand_core 0.3.1",
]
[[package]]
name = "redox_syscall"
version = "0.1.57"
......@@ -916,7 +876,7 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48b82c2a1e8eb6e1bfde608de2bcbebd4072aa32d056ea48a986990cd5ca0f5a"
dependencies = [
"bitflags 1.2.1",
"bitflags",
]
[[package]]
......@@ -931,9 +891,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.4.2"
version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
dependencies = [
"aho-corasick",
"memchr",
......@@ -943,9 +903,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
version = "0.6.21"
version = "0.6.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
[[package]]
name = "remove_dir_all"
......@@ -958,20 +918,20 @@ dependencies = [
[[package]]
name = "ron"
version = "0.6.2"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8a58080b7bb83b2ea28c3b7a9a994fd5e310330b7c8ca5258d99b98128ecfe4"
checksum = "064ea8613fb712a19faf920022ec8ddf134984f100090764a4e1d768f3827f1f"
dependencies = [
"base64",
"bitflags 1.2.1",
"bitflags",
"serde",
]
[[package]]
name = "rust_decimal"
version = "1.8.1"
version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9e81662973c7a8d9663e64a0de4cd642b89a21d64966e3d99606efdc5fb0cc6"
checksum = "a5c739ba050709eae138f053356d27ff818d71fe54ce5a8d9f4c7a660bfb6684"
dependencies = [
"num-traits",
"serde",
......@@ -1002,40 +962,17 @@ version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
[[package]]
name = "sdl2"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a74c2a98a354b20713b90cce70aef9e927e46110d1bc4ef728fd74e0d53eba60"
dependencies = [
"bitflags 0.7.0",
"lazy_static 0.2.11",
"libc",
"num",
"rand 0.3.23",
"sdl2-sys 0.31.0",
]
[[package]]
name = "sdl2"
version = "0.34.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcbb85f4211627a7291c83434d6bbfa723e28dcaa53c7606087e3c61929e4b9c"
dependencies = [
"bitflags 1.2.1",
"lazy_static 1.4.0",
"bitflags",
"lazy_static",
"libc",
"raw-window-handle",
"sdl2-sys 0.34.3",
]
[[package]]
name = "sdl2-sys"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c543ce8a6e33a30cb909612eeeb22e693848211a84558d5a00bb11e791b7ab7"
dependencies = [
"cfg-if 0.1.10",
"sdl2-sys",
]
[[package]]
......@@ -1090,9 +1027,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.60"
version = "1.0.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779"
checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a"
dependencies = [
"itoa",
"ryu",
......@@ -1113,9 +1050,9 @@ checksum = "fa8f3741c7372e75519bd9346068370c9cdaabcc1f9599cbcf2a2719352286b7"
[[package]]
name = "smallvec"
version = "1.5.1"
version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75"
checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
[[package]]
name = "spin_sleep"
......@@ -1192,9 +1129,9 @@ checksum = "e39674047b1748e8bf4865142772a6637bd32d8b4b27e3c2248dd122f637808b"
[[package]]
name = "syn"
version = "1.0.54"
version = "1.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44"
checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5"
dependencies = [
"proc-macro2",
"quote",
......@@ -1221,7 +1158,7 @@ checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
dependencies = [
"cfg-if 0.1.10",
"libc",
"rand 0.7.3",
"rand",
"redox_syscall 0.1.57",
"remove_dir_all",
"winapi",
......@@ -1229,11 +1166,11 @@ dependencies = [
[[package]]
name = "thread_local"
version = "1.0.1"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
checksum = "bb9bc092d0d51e76b2b19d9d85534ffc9ec2db959a2523cdae0697e2972cd447"
dependencies = [
"lazy_static 1.4.0",
"lazy_static",
]
[[package]]
......@@ -1270,7 +1207,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8a62719acf1933bfdbeb73a657ecd9ecece70b405125267dd549e2e2edc232c"
dependencies = [
"encoding_rs",
"lazy_static 1.4.0",
"lazy_static",
"regex",
]
......@@ -1329,7 +1266,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62"
dependencies = [
"bumpalo",
"lazy_static 1.4.0",
"lazy_static",
"log",
"proc-macro2",
"quote",
......@@ -1372,7 +1309,7 @@ version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab702fefbcd6d6f67fb5816e3a89a3b5a42a94290abbc015311c9a30d1068ae4"
dependencies = [
"bitflags 1.2.1",
"bitflags",
"downcast-rs",
"libc",
"nix",
......@@ -1410,7 +1347,7 @@ version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3d6fc54b17b98b5083bc21ae3a30e6d75cb4b01647360e4c3a04648bcf8781d"
dependencies = [
"bitflags 1.2.1",
"bitflags",
"wayland-client",
"wayland-commons",
"wayland-scanner",
......@@ -1464,7 +1401,7 @@ version = "2.18.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bf981e3a5b3301209754218f962052d4d9ee97e478f4d26d4a6eced34c1fef8"
dependencies = [
"lazy_static 1.4.0",
"lazy_static",
"libc",
"maybe-uninit",
"pkg-config",
......@@ -1494,7 +1431,7 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aec02bc5de902aa579f3d2f2c522edaf40fa42963cbaffe645b058ddcc68fdb2"
dependencies = [
"bitflags 1.2.1",
"bitflags",
"libc",
"xkbcommon-sys",
]
......
......@@ -17,7 +17,7 @@ smallvec = { version = "1", default-features = false }
image = { version = "0.23", default-features = false, features = ["ico"] }
# raqote depenencies
raqote = { git = "https://github.com/jrmuizel/raqote.git", default-features = false, optional = true }
raqote = { version = "0.8", default-features = false, optional = true }
rusttype = { version = "0.9", optional = true }
smallvec = "1"
......
......@@ -319,6 +319,7 @@ where
}
orbclient::EventOption::Unknown(_) => {}
orbclient::EventOption::None => {}
orbclient::EventOption::Hover(_) => {}
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment