mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-17 11:04:10 -04:00
Merge updates from master
This commit is contained in:
14
gui-wm/river/files/river-0.3.12-fix-scdoc-path.patch
Normal file
14
gui-wm/river/files/river-0.3.12-fix-scdoc-path.patch
Normal file
@@ -0,0 +1,14 @@
|
||||
--- a/build.zig
|
||||
+++ b/build.zig
|
||||
@@ -252,8 +252,9 @@
|
||||
inline for (.{ "river", "riverctl", "rivertile" }) |page| {
|
||||
// Workaround for https://github.com/ziglang/zig/issues/16369
|
||||
// Even passing a buffer to std.Build.Step.Run appears to be racy and occasionally deadlocks.
|
||||
- const scdoc = b.addSystemCommand(&.{ "/bin/sh", "-c", "scdoc < doc/" ++ page ++ ".1.scd" });
|
||||
+ // Fix: Ensure scdoc runs in the correct source directory to find .scd files
|
||||
+ const scdoc = b.addSystemCommand(&.{ "/bin/sh", "-c", b.fmt("cd {s} && scdoc < doc/{s}.1.scd", .{ b.build_root.path orelse ".", page }) });
|
||||
// This makes the caching work for the Workaround, and the extra argument is ignored by /bin/sh.
|
||||
scdoc.addFileArg(b.path("doc/" ++ page ++ ".1.scd"));
|
||||
|
||||
const stdout = scdoc.captureStdOut();
|
||||
b.getInstallStep().dependOn(&b.addInstallFile(stdout, "share/man/man1/" ++ page ++ ".1").step);
|
||||
@@ -49,6 +49,10 @@ RDEPEND="${DEPEND}"
|
||||
|
||||
DOCS=( "README.md" )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-fix-scdoc-path.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local my_zbs_args=(
|
||||
-Dstrip=false # Let Portage control this
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
DIST Throne-1.0.5-deps.tar.xz 7013380 BLAKE2B 13080200d5c565cf4169752eacc3eb3000c295c5410a1852eaee1301cbfe9cb40c95883cb3ddba4dc1d50244d667896c4be8e229a395817c4c6c1cd042e9eae0 SHA512 85eb5432f55eeefdcc495b2e1fab2b91758a62ad1bffa04af20b92769f1c40ad7314f44be19229c9dfe999f57b34fd23dcdc3e03eea8e10616b564649020ce3a
|
||||
DIST Throne-1.0.5.tar.gz 1396788 BLAKE2B 22aa061f2535833d4b6c67f9f28c3101d83b8ed299617d07a4f1e8d660d5c43822f623f04463fa10bd6fa5d2c1bcbcc8e130b2bcd96c77b77bd5b49e4a26346b SHA512 c47fbc93c40a2af41f2b6c5caa9f8e7d7982c99282d8b8644b505a4653b0da853695313f043b49d50d1b4b14055810cef87b018656de9ef107b983b54611b312
|
||||
DIST Throne-1.0.6-deps.tar.xz 7042224 BLAKE2B 3162f9a920c1d430ef178c8dc471872ca80827f36d3d3ab3c43c47c950305c225a6625601f12a5a7d562b63f6cbb998cc464650666407bafafdb03cc72514208 SHA512 7bfa5dee29a5abb4ec988ee932f89d8063f09c86860dc710acce076685b11c53c9a20092ca43ba43c3c187710dc7cbe6041831c70f3987df3ce52d483eba96ac
|
||||
DIST Throne-1.0.6.tar.gz 1399542 BLAKE2B 6a51bc99f73fffae419071f3fbc774376d5528cac3cd4c79121593e16e50bc1c2307febb2b2077325c13824950361469e25499ea4a3cbc8937d04b47bc1ece17 SHA512 6ac667f43d24cdb60b3584d97a78c6166c53268beb7c66e9cc8926dbb74de04efd9dd9a57ec8460dbe919dd8469faab09023561e1752f1378f78477e54d60a35
|
||||
|
||||
Reference in New Issue
Block a user