summaryrefslogtreecommitdiff
path: root/system/alacritty/patch_crate_deps.diff
diff options
context:
space:
mode:
Diffstat (limited to 'system/alacritty/patch_crate_deps.diff')
-rw-r--r--system/alacritty/patch_crate_deps.diff78
1 files changed, 19 insertions, 59 deletions
diff --git a/system/alacritty/patch_crate_deps.diff b/system/alacritty/patch_crate_deps.diff
index a432f9dcde..a4c3db41a3 100644
--- a/system/alacritty/patch_crate_deps.diff
+++ b/system/alacritty/patch_crate_deps.diff
@@ -1,23 +1,23 @@
-diff -Naur alacritty-5ac42bb13bc68c5cbc44869dc9fc9ac19402a6e6.orig/Cargo.lock alacritty-5ac42bb13bc68c5cbc44869dc9fc9ac19402a6e6/Cargo.lock
---- alacritty-5ac42bb13bc68c5cbc44869dc9fc9ac19402a6e6.orig/Cargo.lock 2017-10-18 06:15:24.000000000 +1300
-+++ alacritty-5ac42bb13bc68c5cbc44869dc9fc9ac19402a6e6/Cargo.lock 2017-10-22 17:59:44.188494343 +1300
-@@ -373,7 +373,7 @@
+diff -Naur alacritty-7b4ba80bb195b862f50c16263405a9507f99bb82.orig/Cargo.lock alacritty-7b4ba80bb195b862f50c16263405a9507f99bb82/Cargo.lock
+--- alacritty-7b4ba80bb195b862f50c16263405a9507f99bb82.orig/Cargo.lock 2018-01-04 08:15:57.000000000 +1300
++++ alacritty-7b4ba80bb195b862f50c16263405a9507f99bb82/Cargo.lock 2018-01-05 16:19:01.706399673 +1300
+@@ -367,7 +367,7 @@
"freetype-rs 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "servo-fontconfig 0.4.0 (git+https://github.com/jwilm/rust-fontconfig?branch=updated-2017-10-8)",
+ "servo-fontconfig 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-@@ -1009,16 +1009,16 @@
+@@ -1005,16 +1005,16 @@
[[package]]
name = "servo-fontconfig"
version = "0.4.0"
-source = "git+https://github.com/jwilm/rust-fontconfig?branch=updated-2017-10-8#be2b94de833ec69cf767186262a5fb8360fa5b45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
- "servo-fontconfig-sys 4.0.3 (git+https://github.com/jwilm/libfontconfig?branch=updated-2017-10-8)",
+ "servo-fontconfig-sys 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -30,66 +30,26 @@ diff -Naur alacritty-5ac42bb13bc68c5cbc44869dc9fc9ac19402a6e6.orig/Cargo.lock al
dependencies = [
"expat-sys 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"freetype-sys 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -1500,8 +1500,8 @@
- "checksum serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1"
- "checksum serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "48b04779552e92037212c3615370f6bd57a40ebba7f20e554ff9f55e41a69a7b"
- "checksum serde_yaml 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "49d983aa39d2884a4b422bb11bb38f4f48fa05186e17469bc31e47d01e381111"
+@@ -1504,8 +1504,8 @@
+ "checksum serde_derive_internals 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "730fe9f29fe8db69a601837f416e46cba07792031ed6b27557a43e49d62d89ae"
+ "checksum serde_json 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7cf5b0b5b4bd22eeecb7e01ac2e1225c7ef5e4272b79ee28a8392a8c8489c839"
+ "checksum serde_yaml 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e0f868d400d9d13d00988da49f7f02aeac6ef00f11901a8c535bd59d777b9e19"
-"checksum servo-fontconfig 0.4.0 (git+https://github.com/jwilm/rust-fontconfig?branch=updated-2017-10-8)" = "<none>"
-"checksum servo-fontconfig-sys 4.0.3 (git+https://github.com/jwilm/libfontconfig?branch=updated-2017-10-8)" = "<none>"
+"checksum servo-fontconfig 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8fdda5bd03e66fab61e02767591f2e55cbc39e1620cb20f2b440339dad112a8f"
+"checksum servo-fontconfig-sys 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8f3221f35108edad6e90016c80c5d8452bf53a5860f160e992eb7c78392c3346"
- "checksum shared_library 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "7822f9d0814224552cfd7e4ac72cd511740ccec0b811d1c0f9fa2a84c6509cee"
- "checksum shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72f20b8f3c060374edb8046591ba28f62448c369ccbdc7b02075103fb3a9e38d"
- "checksum siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537"
-diff -Naur alacritty-5ac42bb13bc68c5cbc44869dc9fc9ac19402a6e6.orig/font/Cargo.lock alacritty-5ac42bb13bc68c5cbc44869dc9fc9ac19402a6e6/font/Cargo.lock
---- alacritty-5ac42bb13bc68c5cbc44869dc9fc9ac19402a6e6.orig/font/Cargo.lock 2017-10-18 06:15:24.000000000 +1300
-+++ alacritty-5ac42bb13bc68c5cbc44869dc9fc9ac19402a6e6/font/Cargo.lock 2017-10-22 18:01:51.975935332 +1300
-@@ -11,7 +11,7 @@
- "freetype-rs 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-- "servo-fontconfig 0.4.0 (git+https://github.com/jwilm/rust-fontconfig?branch=updated-2017-10-8)",
-+ "servo-fontconfig 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
-
- [[package]]
-@@ -172,16 +172,14 @@
- [[package]]
- name = "servo-fontconfig"
- version = "0.4.0"
--source = "git+https://github.com/jwilm/rust-fontconfig?branch=updated-2017-10-8#be2b94de833ec69cf767186262a5fb8360fa5b45"
- dependencies = [
- "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-- "servo-fontconfig-sys 4.0.3 (git+https://github.com/jwilm/libfontconfig?branch=updated-2017-10-8)",
-+ "servo-fontconfig-sys 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
-
- [[package]]
- name = "servo-fontconfig-sys"
- version = "4.0.3"
--source = "git+https://github.com/jwilm/libfontconfig?branch=updated-2017-10-8#5c1845e1bffa11cf4d3e6fb27f456bf5c814ce1b"
- dependencies = [
- "expat-sys 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "freetype-sys 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -220,7 +218,7 @@
- "checksum pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8cee804ecc7eaf201a4a207241472cc870e825206f6c031e3ee2a72fa425f2fa"
- "checksum rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)" = "6159e4e6e559c81bd706afe9c8fd68f547d3e851ce12e76b1de7914bab61691b"
- "checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af"
--"checksum servo-fontconfig 0.4.0 (git+https://github.com/jwilm/rust-fontconfig?branch=updated-2017-10-8)" = "<none>"
--"checksum servo-fontconfig-sys 4.0.3 (git+https://github.com/jwilm/libfontconfig?branch=updated-2017-10-8)" = "<none>"
-+"checksum servo-fontconfig 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a47c92236d778a0b98cf6baedd523378f063ff6c8e833b0f9e4bf99af098e99"
-+"checksum servo-fontconfig-sys 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a224a159dce16b23dc6824fff767df82de3eeb3e74497e080f455037a21d0052"
- "checksum winapi 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3969e500d618a5e974917ddefd0ba152e4bcaae5eb5d9b8c1fbc008e9e28c24e"
- "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-diff -Naur alacritty-5ac42bb13bc68c5cbc44869dc9fc9ac19402a6e6.orig/font/Cargo.toml alacritty-5ac42bb13bc68c5cbc44869dc9fc9ac19402a6e6/font/Cargo.toml
---- alacritty-5ac42bb13bc68c5cbc44869dc9fc9ac19402a6e6.orig/font/Cargo.toml 2017-10-18 06:15:24.000000000 +1300
-+++ alacritty-5ac42bb13bc68c5cbc44869dc9fc9ac19402a6e6/font/Cargo.toml 2017-10-22 18:00:43.647560319 +1300
+ "checksum shared_library 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8254bf098ce4d8d7cc7cc6de438c5488adc5297e5b7ffef88816c0a91bd289c1"
+ "checksum shell32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c"
+ "checksum slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d807fd58c4181bbabed77cb3b891ba9748241a552bcc5be698faaebefc54f46e"
+diff -Naur alacritty-7b4ba80bb195b862f50c16263405a9507f99bb82.orig/font/Cargo.toml alacritty-7b4ba80bb195b862f50c16263405a9507f99bb82/font/Cargo.toml
+--- alacritty-7b4ba80bb195b862f50c16263405a9507f99bb82.orig/font/Cargo.toml 2018-01-04 08:15:57.000000000 +1300
++++ alacritty-7b4ba80bb195b862f50c16263405a9507f99bb82/font/Cargo.toml 2018-01-05 16:19:54.599301083 +1300
@@ -12,7 +12,7 @@
log = "0.3"
[target.'cfg(not(target_os = "macos"))'.dependencies]
-servo-fontconfig = { git = "https://github.com/jwilm/rust-fontconfig", branch = "updated-2017-10-8" }
+servo-fontconfig = "0.4.0"
- freetype-rs = "0.13.0"
+ freetype-rs = "0.13"
[target.'cfg(target_os = "macos")'.dependencies]
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-19 03:51:42 +0000