x11-terms/wezterm: use system cairo

Thanks to ago for reporting, Eli Schwartz for helping.

Bug: https://bugs.gentoo.org/928252
Signed-off-by: Mark Wright <gienah@gentoo.org>

3 files changed, 31 insertions, 0 deletions

diff --git a/x11-terms/wezterm/Manifest b/x11-terms/wezterm/Manifest
index bffb0642668e..368b8b92d842 100644
--- a/x11-terms/wezterm/Manifest
+++ b/x11-terms/wezterm/Manifest
@@ -59,10 +59,12 @@ DIST bytemuck_derive-1.5.0.crate 17323 BLAKE2B 847cbbe7a4449d17295d9b6082a8f38be
 DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
 DIST bytes-1.5.0.crate 58909 BLAKE2B 2931f19e813eff73be407677622fa29e45f9b49434d5b3a04104b56563fc0e941fd8c5f996258a1aa660000ef014668d70b683b751af8e48d28d0aea76890c92 SHA512 6654cf41d8f0d7e19b05fd95044b9a3bfccd81f469c797c6aa763a4dd29e1b34064bed2e094548d147045cca7bc4706059de5bcf9f6579189e6068fbbf1c29a3
 DIST cairo-rs-0.18.5.crate 54235 BLAKE2B 38a41a6acdcb5591447f1f873990872999c4735edb1b7aa9c434991221290517c80ab07bbfbaf5afea6b86634426113b9d34e92cdf0c36d891dced3437372be1 SHA512 fd6951ddce1a12e1f3de4d65c69bb53f7be9f04c017e17d17c4300fcd3227de705ab3e036944181aa6d5f417082cbbe2b2190a94c8c9ba52a27851c881f714ee
+DIST cairo-sys-rs-0.18.0.crate 11803 BLAKE2B b7358bfb19b846e619dc57544f342e5f8a5a5a5d2d0b19368e6d03375141176961c6a8780906c2a218970513525a7f7eab71348b5f09578d3c509f5f5f1038fc SHA512 e5d86d1c2d9825f3c69b194bd8068b8db61a125a9c8646d7b56859417176692188a1f9f40228ff7ac2836b16e49bac5ce5ea762928c872cd4c3aa14ec8029568
 DIST camino-1.1.6.crate 30519 BLAKE2B 3696bee362c9a6c7331079f86823aede0df06c1c36fdc2d11c0628267ca7635fd78430cc927cf3b2af34591537d3968b3c5f1cf9d500f3e889c202c944fc6138 SHA512 e777cc6e2a01c95931a81521eb278156d1c50ffd0126f914b21e35dbb7644b835f3c26bbe7a487bbca508d26b4c933bbbb9e051fa42825b154c2fa03c04375b0
 DIST cassowary-0.3.0.crate 22876 BLAKE2B 7e74a08e02050548ade7dd1ebba7ce4e4360d258ea6acf126453889dbf16df433bed7b68789736881c957f4c09eead1f763a0c02f2474157b1650a1e77e6eca9 SHA512 0838c0b79ed31f0c514fe4ac82633976e34b0d6cb08616313cda0e00623514fc6498c6c308cfef54ea029f1fdbaafe2991ca8ac3c38437a113ac62e37f9397f8
 DIST cast-0.3.0.crate 11452 BLAKE2B fe6edddd0589fa436cda32342d7beaabe4003afdbdf1d7c5db7e8748adf23b1b2cdcdd286235837c735d2143f29e692c152a5d56fb0458a54961e4dea303b2cb SHA512 4a3e19bc1e9e5ecc03aaef9bcdce01624ac0e6858c065fa1c41693db0ac172b9735ce872064561347cd9e79f00a274129011f6e4ccf9e61d960c8bb684b6d396
 DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7
+DIST cfg-expr-0.15.8.crate 42108 BLAKE2B 846a67059fc30e8c1f70d8b5495443ca0ed373a333d394b92d79981b415888a2f5c745a028e702464bcf68765667c35513e51931b84d9d081873146a0a4edbd0 SHA512 1077d113dfe080e0e78e25c40f32c9f14988d2dbb76bb783ed3e8ce13c58e5dc0dd549362d2f197b69cfbffcfa3ebed385a0247f5928dcff8be7d0b055be1041
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST cgl-0.3.2.crate 7557 BLAKE2B 6c61b46f4157a3a400f75e81be8ec456759a0c3efaec2fd134a81d8070d47c478f7392a2e63e13b7b09fc0b620b27ec6831b9829927ae6685dcfcaedfc8bbb19 SHA512 230301b0f0ee7828bf0152b01ff97464609da32dc78edf2fc8518f2341cc48ef39bba946965e93069fa9e4fcda0d165195dbc6c1d594afcf1155707933b3dc73
 DIST chrono-0.4.33.crate 221279 BLAKE2B cc7b71b996a1c15b6b013d06f57ffd8af78b72fab87c0e9123f87918d404787ade2217e8e58fb0153552e49c6e11ca6e820eb0c0f1add8c43619849fa096a214 SHA512 172996d2ccc8733957d45fcc24fefb3531c7b33a798ab9f494be23f08d6d2bc350401574c626fd8eec0191ba28c0f7b73af7bc4235ec72a4b1d437fb7e89c875
@@ -492,8 +494,10 @@ DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e
 DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325
 DIST system-configuration-0.5.1.crate 12618 BLAKE2B fa75a24f8db6eafe578bcbf162fcd110ca059c58af24916acd64959b48d8541e0aa95ce2c929a8a50c62e7e8a967de9101640d1da7805fce2f76b7c5c86c4544 SHA512 af77ed5be890e826b9b8f975bd2e63f3905adb24a597069a887ff2a861820f1ed40582b918f35c3d4eb063800e179b93e5acd7d5b48b147e9b16e3cf4c12840f
 DIST system-configuration-sys-0.5.0.crate 6730 BLAKE2B e40c4b5e7897cfe30b2fb6daa9b44fe2b83eb2a12d798a1ad8908b51abc735566becb0e001f52f5f8a0d3596f62a9eec631341c3a9cbd132a4f650f988c74b93 SHA512 764168ee5efe1ba82e847ed74a14d1f5f1892735e98657c3ecaafcb4b405d4f779592dfaade252f6a577ca2cfd5cd5e467c0b6326bbdcfa573c3ab01cdc8fc34
+DIST system-deps-6.2.1.crate 25504 BLAKE2B 4f4c2a222ae3603ed727fe0a5ff7b020926ce4eae4106d9a86d1356db23e202bc5609b87ea3051e22e350d9d5b86cecbe204cbe8c64356c753c54d7208207f28 SHA512 f11244f2f422cedd16e195e58486f74f16bc41e3316a76d449906ef48fbd8f8353543d5393c11745ab88fd5f275c536567222c89132a2246c3dc77ca8ee428f2
 DIST takeable-option-0.5.0.crate 1075 BLAKE2B 5e551ef13bd67f8cf043dae29e78473398fe090435905718f3073cd1baaca8459ddaadccd4d537af2583334bffeaa46c253b540f4417d0c2931f07f61c48bac5 SHA512 8a644d762835f533ae25c88411eed07f41206d8264d90d6b23fb3b752c47ff1168cf9aea41ac028ae180d0817e76d6a015529d830a6fd556e083030c47779724
 DIST tar-0.4.40.crate 51844 BLAKE2B b51c771611c2c1bc6a36d25493dd775bcb5891a2e4a8ae918781abe66c0335a3da30c5e44281fa5282dace34c09754fd2df840c0d74e5b0b4624a519fd455a8b SHA512 90bde0dfca91b6c304d5bcd4c93c653c066b76592927f5ed3025752d6d0244c0d5786c44af99df94dd6cc7a417663205d86f406a3b60f7307ca3c1757239bc12
+DIST target-lexicon-0.12.14.crate 25508 BLAKE2B 5ebb6b49e5c3b0057959557651287d4bf5ffe5b499340019ff64d5fc3b64e780e344982e358c94b1b25a20bf0f526a584aeecc704695b50a55cc268dd65edb97 SHA512 3410ecc0faf854f49c41c99f83972960e67065b1e0e78557a7c4996d996109bfd167d2121a019f5256f996c896cd45af032038ab7918fdcc6ee6311693ce951a
 DIST tempfile-3.9.0.crate 32182 BLAKE2B 4e802990988aff3ab5173bd96dbd906651a8df46b2619e6a500a3b9e7f4a3cd01dc7ee977791343f7875afdc4793a845000bb363d8c1a6599aeb6b1efcce5d56 SHA512 04e06c966bfa7a1567e7185ebd5c2876b96e46e36af14931bf0eba63795cd20d1c3427b6709a4cab2a68b8d289fdabd5537a50e5407a76e3a9fa0dcc7d3ce6d7
 DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
 DIST termcolor-1.4.1.crate 18773 BLAKE2B 34676efbde8e242415857d6d40a287ae3459678d8222f5144faefb8c84d635686f640e79588d98635c8f25b7628ec6663a01b16e1e462705b5cba7e8b8e61f44 SHA512 b66aad157c4fa2985f764321d157dfb1f0325fd633811870db7919b5579bf7bc19fefe99e1c706cdfa67504c37dc2ca3d283e11d1bb516edcfaf1eb7747a778a
@@ -551,6 +555,7 @@ DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e1
 DIST uuid-1.7.0.crate 42627 BLAKE2B 493f6a3a643d3493a2bd7e0e92a1ccfb7bd722e3a1fc8deb7df0ddc875a822daead1cdd35dc3ac6f26346844100a671318d71e5ad760c9587471d4f05bbb0c69 SHA512 2ea704d082b725d98717d772e1af84fe743929ee32658ebeb111c6fa2395ff5f44558b7e375087617f91c6f7bc242f2db96e80a631071722de6fe15af845e856
 DIST varbincode-0.1.0.crate 6058 BLAKE2B 64302e8070103d6b285a209f292543e27daacbffdc5c7edc597d0cd8118e2885a63b83dcbbf4ad7869be76dd75f7b293cded2814640bafd5bdc0adb65e2067f5 SHA512 d5af67c48df646fa70ed10fba6eeb89b8f78626089fca2ac5099830e4e8ba1ffe23e129c02bbf13ee55417a027822d404bf904a99665accd5a4492c29865e5a8
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
+DIST version-compare-0.1.1.crate 13224 BLAKE2B 4bb1e7db6a4a5b30f4ef950234fa939bd562e8d5693aad42a5dadddde7caee01b4dc42b28d8ef61a769cf573440e57c0dc321f8a8b4b3dfc0cc035507bfed886 SHA512 efc9441440f702518867e2056c0ab066cd2fa6949112479e463802610f25a4d50c4411eb5fd0ba6ca9b187e358fce8d99579188e0ed9ba0297191172ab7af408
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST vswhom-0.1.0.crate 9420 BLAKE2B ad748822fa9650d011c5f240f5e52ae1e27380fc1b22db2ceaaece4fbc814ac2f2792cf6772079199202efe88fb968618a13d91609e5245639f25b32640fad44 SHA512 0ac192e6a1d296904246d89a08021b55384b48959f26f1f0dca893f8fa1e71a012a0d731d1e48e41ca8e4427da84e50fa43ced621e435b010cbcda4f19c45a58
 DIST vswhom-sys-0.1.2.crate 15852 BLAKE2B b21fbc0af440d3feac8ffb769f951f504e01f630d6f806d78a8f218eeb09ff8940328d6a9289e195deae9fdc43fdd55cfd037ae9c57b366ae57906b80d2f4785 SHA512 cd7e7b9e1953c70470d2f17210e83d28cd2c5ab8fc34ef0c9e06390e928853e375ed7bc2bda343b2f15820e989b5adc5bd33d9cea078716bc31545ff019435c8
diff --git a/x11-terms/wezterm/files/wezterm-20240203-110809-cairo.patch b/x11-terms/wezterm/files/wezterm-20240203-110809-cairo.patch
new file mode 100644
index 000000000000..a92cd33e7369
--- /dev/null
+++ b/x11-terms/wezterm/files/wezterm-20240203-110809-cairo.patch
@@ -0,0 +1,19 @@
+--- wezterm-20240203-110809-5046fc22-orig/Cargo.toml	2024-02-04 05:08:09.000000000 +1100
++++ wezterm-20240203-110809-5046fc22/Cargo.toml	2024-05-12 19:13:53.372080150 +1000
+@@ -4,7 +4,6 @@
+   "bidi/generate",
+   "strip-ansi-escapes",
+   "sync-color-schemes",
+-  "deps/cairo",
+   "wezterm",
+   "wezterm-blob-leases",
+   "wezterm-dynamic",
+@@ -26,8 +25,3 @@
+ # https://jakedeichert.com/blog/reducing-rust-incremental-compilation-times-on-macos-by-70-percent/
+ # Disabled because it breaks builds on Windows
+ #split-debuginfo = "unpacked"
+-
+-[patch.crates-io]
+-# We use our own vendored cairo, which has minimal deps and should just
+-# build via cargo.
+-cairo-sys-rs = {path="deps/cairo", version="0.18.0"}
diff --git a/x11-terms/wezterm/wezterm-20240203.110809.ebuild b/x11-terms/wezterm/wezterm-20240203.110809-r1.ebuild
index f1a183790c57..fd4219ce6f51 100644
--- a/x11-terms/wezterm/wezterm-20240203.110809.ebuild
+++ b/x11-terms/wezterm/wezterm-20240203.110809-r1.ebuild
@@ -67,11 +67,13 @@ CRATES="
 	byteorder@1.5.0
 	bytes@1.5.0
 	cairo-rs@0.18.5
+	cairo-sys-rs@0.18.0
 	camino@1.1.6
 	cassowary@0.3.0
 	cast@0.3.0
 	cc@1.0.83
 	cfg-if@1.0.0
+	cfg-expr@0.15.8
 	cgl@0.3.2
 	chrono@0.4.33
 	ciborium@0.2.2
@@ -495,8 +497,10 @@ CRATES="
 	syn@2.0.48
 	system-configuration@0.5.1
 	system-configuration-sys@0.5.0
+	system-deps@6.2.1
 	takeable-option@0.5.0
 	tar@0.4.40
+	target-lexicon@0.12.14
 	tempfile@3.9.0
 	term_size@0.3.2
 	termcolor@1.4.1
@@ -554,6 +558,7 @@ CRATES="
 	uuid@1.7.0
 	varbincode@0.1.0
 	vcpkg@0.2.15
+	version-compare@0.1.1
 	version_check@0.9.4
 	vswhom@0.1.0
 	vswhom-sys@0.1.2
@@ -686,6 +691,7 @@ RESTRICT=test # tests require network
 PATCHES=(
 	"${FILESDIR}/${PN}-20230320-124340-vendored-sources.patch"
 	"${FILESDIR}/${PN}-20240203-110809-xcb-imdkit.patch"
+	"${FILESDIR}/${PN}-20240203-110809-cairo.patch"
 )
 
 DEPEND="
@@ -698,6 +704,7 @@ DEPEND="
 	media-libs/fontconfig
 	media-libs/mesa
 	sys-apps/dbus
+	x11-libs/cairo[X]
 	x11-libs/libX11
 	x11-libs/libxkbcommon[X,wayland?]
 	x11-libs/xcb-util