commit: b0681990ac6e6375130777a20377d66bbb2f3e96
Author: Niklaus 'vimja' Hofer <gentoo-bugzilla <AT> vimja <DOT> email>
AuthorDate: Sun Sep 14 21:52:02 2025 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sun Sep 14 22:23:53 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b0681990
gui-wm/river: Bump version to 0.3.12
Signed-off-by: Niklaus 'vimja' Hofer <gentoo-bugzilla <AT> vimja.email>
gui-wm/river/Manifest | 10 +--
.../river/files/river-0.3.6-fix-no-lazypath.patch | 31 ---------
.../{river-0.3.9.ebuild => river-0.3.12.ebuild} | 12 ++--
gui-wm/river/river-0.3.7.ebuild | 75 ----------------------
4 files changed, 10 insertions(+), 118 deletions(-)
diff --git a/gui-wm/river/Manifest b/gui-wm/river/Manifest
index cafbe2a44f..394ddb7d5a 100644
--- a/gui-wm/river/Manifest
+++ b/gui-wm/river/Manifest
@@ -1,12 +1,8 @@
DIST pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX.tar.gz 7966
BLAKE2B
8d6607e878b0bacc0fc16bcc2264ddd89e349b61a1b269e59b2e19b311064453a473f2401103b0e40906f7190d154d403b712e05fe937abe2f6253f7d8337820
SHA512
2eb43d460aff9ff2da015afc9230ca73588ada59df59465a3efa8f074d9d641fec4bf52ab3de475ec1a5ba2f04afc59221f231af5e2cf5aba7252bbde6be35a5
DIST river-0.3.11.tar.gz 174745 BLAKE2B
6ab4906475d21d6eb1572d2eed53003deb33da5c953fdfa446444677ff7b25d10610d10ce565f891fc5bb20cd375dcdb895e92d084d86dfb1e2c75709852a834
SHA512
b0e2439247c4424b06136c9466447172d5ea4df9b3f8133051d19f8049c5da7d17e3eb03dfe6eac81d03c6762a8c40b2f6d6c918ea5348a23a330f1a782f3bd1
-DIST river-0.3.7.tar.gz 172036 BLAKE2B
d428ec0abf562c0b0ef153499862e0c0c32b37721c870c7f0d54599634fccd5339595eb51e34d401e877378b10c945ad7e0fbf73a90c27c3a1c9eb0883ca88df
SHA512
4297b2bd566a3f87fd0c158affd8573661d722ebb7e795356040b15185f09e67dcfac938fa26757d683a274dc08781559b059584dc4934c1d6f51666bf8cb9ec
-DIST river-0.3.9.tar.gz 174866 BLAKE2B
fcadce04c095629c5b44a8f3aa38cd00038aa11e5e6a7f863e9ff6516191ee83b3cd805d88e4457c0acf471853701f1e0a71d1bae30921e37e1bd7ee7aee924f
SHA512
1c69d07bdb0e16e2ae31afd1af39739b23f0ab070a70afcef86757bb3de5d44058711b860bf2936dca7d7589d8a5074e50edf19e8ea33abbf36418b838f71ffa
+DIST river-0.3.12.tar.gz 174928 BLAKE2B
0f5b4658da4584a5b24fabe441425389a7cf17d0215efa4a08304c5c5249fc6a3b883aa6a596d8765622c571533e0d6b9b8776488c64bb344d4b93d41c373d5b
SHA512
d72abaa42b5ef812aa3928a3d900027022fb5b8f7341aac1414e780941ae18508071149d0bb506eaa360adbdfe0a2b568e08d647d07813f4f0f81141012f1471
DIST wayland-0.3.0-lQa1kjPIAQDmhGYpY-zxiRzQJFHQ2VqhJkQLbKKdt5wl.tar.gz 74934
BLAKE2B
8dda2bae62c65068825068dbe91e701ad4a71685d2209bb703d0e8b71b75f1546690b83fc66e9b81de59e26c9e5a9d8d5cfa3f2098cd16a3f13ada7f38fb94ce
SHA512
436c7104c41bb3c26bedc3491d887293fa0a40c11a14bc0973a1fa873c5161a05c9681a857f6cf89c9b34106e2b9e92b4f67eebabaf16836cb99a459ad11d20e
-DIST wlroots-0.18.2-jmOlchnIAwBq45_cxU1V3OWErxxJjQZlc9PyJfR-l3uk.tar.gz 58688
BLAKE2B
744c6305c9593fc21d6c00973adfa84f28e153e2fcac8652590d4ecadc0051f3a496997f2d1ab6256136530b4fc50cfbca876020ec5f9ec0c93c9447b2a53639
SHA512
e41e14f90f6b8e760450eae74d5ed1396646a4af2b373347b0bb3d22ba27d6e22b9d4786e76025fc1127a270cafc12f5505770f8ae13202aba9ff1b01b4047f2
+DIST wayland-0.4.0-lQa1khbMAQAsLS2eBR7M5lofyEGPIbu2iFDmoz8lPC27.tar.gz 111219
BLAKE2B
1c33b878c3efdf20eef58ddd6f8a6cab99a24e7481f9a3b8f31b19b58d13372d8dea84dfb26b4097123ca25b1d38939e9b987d70eb3a23fe0fecf9f21fe6f8a2
SHA512
8536456d2f2886c7aa844e227272e8e4595ba3197575cba46b5f757b045976cf1c65a131532a191f2a8a82ca3d58642900d57fe7358518a237f29e84cb85e0f2
DIST wlroots-0.19.2-jmOlcsnnAwDFAeOamkUaxyHNhKngH4Ai5rrLSVbqA8LW.tar.gz 59231
BLAKE2B
58eb9e3ee58c843f996dd3781cf7e477f7dbd7627024ba52ab36f5d214be7039b0308a25de843a304bf02c600b1b444eeeac254ab26d2ca21fff6eb686da6ad6
SHA512
d8266b76874a6704d3f453ef7e657a75e6279706476e78565afc46c08d7cdc29acd88f1b27f70225a3c2398b03d9230ed1a322fc688a6ca6ae45875219287e50
+DIST wlroots-0.19.3-jmOlcuL_AwBHhLCwpFsXbTizE3q9BugFmGX-XIxqcPMc.tar.gz 60063
BLAKE2B
bb54018c92c27fb810b94030141e9d63f08ab3d03cf0a3110e8ec696a66dc3f784062f95a8a86ae4f770989ea07a080d531a8a942eac59f9d946bda6c44c3586
SHA512
3c8bc970076173cb33ea3fc5acbca4c45b2e37c7e18c58bc58bcf021066d6ac28266d5bb3fa2a741c0d01cb8b0c5499ddc0dcc3ea297ea700678f4c01d80e0b9
DIST xkbcommon-0.3.0-VDqIe3K9AQB2fG5ZeRcMC9i7kfrp5m2rWgLrmdNn9azr.tar.gz 22730
BLAKE2B
6870fc2465e2b1ef4faa6330183a1dade4a4bcf36130113444e5221ff9c764db488304f2f25a603f2511c2562d55bf1011a5f8fe41a068e7e5b707e1d06c0792
SHA512
fe0dc46a8556f19c2ce1badbeee7576065cb56495b94b6d468ee6ed8667f9fef5377e26864b0c8e81c3a2718cfcaf8a4f5e13aab23a615f3a58ec639372fb758
-DIST
zig-pixman-12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56.tar.gz
7874 BLAKE2B
25e0e0a65ab45c08e13ed48393e0d009a63e0ec4c2d8452f08ec4b013f9b696adb1d7356a49b1c3b25710982fb34629002df8d433382d433fcdefd1de5fd4358
SHA512
61ce38e9788e9a3701cf32b2d8721424088e1a8bd11841fecc999a31f9b46148e63a35cf770a39edcc7887913019654f7df945b7d7e3b57437d007f7d45609b9
-DIST
zig-wayland-1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242.tar.gz
56543 BLAKE2B
aaf82efe78d25c59a87de050147857fcf9a19764141cb40d92b0dd48b96ea0ec52d00a1ab0df1afe4c45cda6d64dda97f296f0aa29d8b9ea3da49e1d5cd69e50
SHA512
dfb140c06d9e3c566034f9102426e7bd47dcde87a2ae16d43ce3ea72cf44bea872bab1d9a23a24ae9d57d2d4ae6c56060a6b10f869de3990046426b0462db85e
-DIST
zig-wlroots-122083317b028705b5d27be12976feebf17066a4e51802b3b5e9f970bec580e433e1.tar.gz
56926 BLAKE2B
50a143f816b47516b3fc3b051a7445162efbcbb802a3515fe554e005e2f1191f75eaeea4bab68972ecb5b9f0b72f7cec12838c7ec98a1d05ed54803b3a79ca66
SHA512
523f29b06ece2aefbd90e8f9ce15bfcf59edf47e583fe963a8f58af0209d7e9a8dda857424469a40e3c7defb31d01df9f977f8dc58dc3ba7468e20f7b3a4e417
-DIST
zig-xkbcommon-1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f.tar.gz
22700 BLAKE2B
85045d002b4ec1ac8dadda67d3ce6f588e53938ac0a67c06d6cebc85a944d7a23fd1cc295410ce1a91cce9ffb587834f7eca2400e1468fec0193583ac71d6f86
SHA512
a99b6a2fefe34507fd687b58a9618a27ca617966798b410a72c9e53462c3f9c6dd0476a22bb9686cbf49994ca502743b4d25fdc55125359d4fe2860094bf0e82
diff --git a/gui-wm/river/files/river-0.3.6-fix-no-lazypath.patch
b/gui-wm/river/files/river-0.3.6-fix-no-lazypath.patch
deleted file mode 100644
index fe955884f6..0000000000
--- a/gui-wm/river/files/river-0.3.6-fix-no-lazypath.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Eric Joldasov <[email protected]>
-
-Temporary fix for building river when out-of-source. This is exactly
-things that "separate BUILD_DIR by default" in `zig.eclass` was meant
-to catch.
-
-Proper fix here would be to patch upstream to use `std.Build.LazyPath`
-instead of plain string, like mentioned in TODO here:
-https://codeberg.org/ifreund/zig-wayland/src/tag/v0.2.0/build.zig#L134-L135
-
-diff --git a/build.zig b/build.zig
-index 55f7ced..f49f9b1 100644
---- a/build.zig
-+++ b/build.zig
-@@ -100,11 +100,11 @@ pub fn build(b: *Build) !void {
-
scanner.addSystemProtocol("unstable/pointer-gestures/pointer-gestures-unstable-v1.xml");
-
scanner.addSystemProtocol("unstable/xdg-decoration/xdg-decoration-unstable-v1.xml");
-
-- scanner.addCustomProtocol("protocol/river-control-unstable-v1.xml");
-- scanner.addCustomProtocol("protocol/river-status-unstable-v1.xml");
-- scanner.addCustomProtocol("protocol/river-layout-v3.xml");
-- scanner.addCustomProtocol("protocol/wlr-layer-shell-unstable-v1.xml");
--
scanner.addCustomProtocol("protocol/wlr-output-power-management-unstable-v1.xml");
-+
scanner.addCustomProtocol(b.pathFromRoot("protocol/river-control-unstable-v1.xml"));
-+
scanner.addCustomProtocol(b.pathFromRoot("protocol/river-status-unstable-v1.xml"));
-+ scanner.addCustomProtocol(b.pathFromRoot("protocol/river-layout-v3.xml"));
-+
scanner.addCustomProtocol(b.pathFromRoot("protocol/wlr-layer-shell-unstable-v1.xml"));
-+
scanner.addCustomProtocol(b.pathFromRoot("protocol/wlr-output-power-management-unstable-v1.xml"));
-
- // Some of these versions may be out of date with what wlroots implements.
- // This is not a problem in practice though as long as river successfully
compiles.
diff --git a/gui-wm/river/river-0.3.9.ebuild b/gui-wm/river/river-0.3.12.ebuild
similarity index 80%
rename from gui-wm/river/river-0.3.9.ebuild
rename to gui-wm/river/river-0.3.12.ebuild
index 005618f415..709b9ef5d2 100644
--- a/gui-wm/river/river-0.3.9.ebuild
+++ b/gui-wm/river/river-0.3.12.ebuild
@@ -8,12 +8,12 @@ HOMEPAGE="https://isaacfreund.com/software/river/
https://codeberg.org/river/riv
declare -g -r -A ZBS_DEPENDENCIES=(
[pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX.tar.gz]='https://codeberg.org/ifreund/zig-pixman/archive/v0.3.0.tar.gz'
-
[wayland-0.3.0-lQa1kjPIAQDmhGYpY-zxiRzQJFHQ2VqhJkQLbKKdt5wl.tar.gz]='https://codeberg.org/ifreund/zig-wayland/archive/v0.3.0.tar.gz'
-
[wlroots-0.18.2-jmOlchnIAwBq45_cxU1V3OWErxxJjQZlc9PyJfR-l3uk.tar.gz]='https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.2.tar.gz'
+
[wayland-0.4.0-lQa1khbMAQAsLS2eBR7M5lofyEGPIbu2iFDmoz8lPC27.tar.gz]='https://codeberg.org/ifreund/zig-wayland/archive/v0.4.0.tar.gz'
+
[wlroots-0.19.3-jmOlcuL_AwBHhLCwpFsXbTizE3q9BugFmGX-XIxqcPMc.tar.gz]='https://codeberg.org/ifreund/zig-wlroots/archive/v0.19.3.tar.gz'
[xkbcommon-0.3.0-VDqIe3K9AQB2fG5ZeRcMC9i7kfrp5m2rWgLrmdNn9azr.tar.gz]='https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.3.0.tar.gz'
)
-ZIG_SLOT="0.14"
+ZIG_SLOT="0.15"
inherit zig
# TODO verify-sig support
SRC_URI="
@@ -41,7 +41,7 @@ DEPEND="
dev-libs/libevdev
dev-libs/libinput:=
dev-libs/wayland
- gui-libs/wlroots:0.18[X?]
+ gui-libs/wlroots:0.19[X?]
x11-libs/libxkbcommon[wayland,X?]
x11-libs/pixman
"
@@ -53,9 +53,11 @@ src_configure() {
local my_zbs_args=(
-Dstrip=false # Let Portage control this
-Dpie=true
- -Dno-llvm=$(usex llvm false true)
-Dman-pages=$(usex man true false)
-Dxwayland=$(usex X true false)
+ -Dfish-completion=true
+ -Dzsh-completion=true
+ -Dbash-completion=true
)
zig_src_configure
diff --git a/gui-wm/river/river-0.3.7.ebuild b/gui-wm/river/river-0.3.7.ebuild
deleted file mode 100644
index 1c555b20d7..0000000000
--- a/gui-wm/river/river-0.3.7.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-declare -r -A ZBS_DEPENDENCIES=(
-
[zig-pixman-12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56.tar.gz]='https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz'
-
[zig-wayland-1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242.tar.gz]='https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz'
-
[zig-wlroots-122083317b028705b5d27be12976feebf17066a4e51802b3b5e9f970bec580e433e1.tar.gz]='https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.1.tar.gz'
-
[zig-xkbcommon-1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f.tar.gz]='https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz'
-)
-
-ZIG_SLOT="0.13"
-inherit zig
-
-DESCRIPTION="A dynamic tiling Wayland compositor"
-HOMEPAGE="https://isaacfreund.com/software/river/
https://codeberg.org/river/river";
-# TODO verify-sig support
-SRC_URI="
- https://codeberg.org/river/river/archive/v${PV}.tar.gz -> ${P}.tar.gz
- ${ZBS_DEPENDENCIES_SRC_URI}
-"
-S="${WORKDIR}/${PN}"
-
-# river: GPL-3-or-later
-# zig-pixman, zig-wayland, zig-wlroots, zig-xkbcommon: MIT
-LICENSE="GPL-3+ MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="X +llvm man"
-
-BDEPEND="
- dev-libs/wayland-protocols
- dev-util/wayland-scanner
- man? ( app-text/scdoc )
- || (
- dev-lang/zig:${ZIG_SLOT}[llvm(+)?]
- dev-lang/zig-bin:${ZIG_SLOT}
- )
-"
-DEPEND="
- dev-libs/libevdev
- dev-libs/libinput:=
- dev-libs/wayland
- gui-libs/wlroots:0.18[X?]
- x11-libs/libxkbcommon[wayland,X?]
- x11-libs/pixman
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/river-0.3.6-fix-no-lazypath.patch" )
-
-DOCS=( "README.md" )
-
-src_configure() {
- local my_zbs_args=(
- -Dstrip=false # Let Portage control this
- -Dpie=true
- -Dno-llvm=$(usex llvm false true)
- -Dman-pages=$(usex man true false)
- -Dxwayland=$(usex X true false)
- )
-
- zig_src_configure
-}
-
-src_install() {
- zig_src_install
-
- insinto /usr/share/wayland-sessions/
- doins contrib/river.desktop
-
- insinto /usr/share/river/
- doins -r example/
-}
