* [gentoo-commits] repo/proj/guru:master commit in: gui-wm/river/
@ 2022-12-01 3:59 Haelwenn Monnier
0 siblings, 0 replies; 9+ messages in thread
From: Haelwenn Monnier @ 2022-12-01 3:59 UTC (permalink / raw
To: gentoo-commits
commit: 5c5f27c0b998b97339086d5cf7a3210e49fc8fba
Author: Cara Salter <cara <AT> devcara <DOT> com>
AuthorDate: Mon Nov 28 18:26:26 2022 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Mon Nov 28 18:28:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5c5f27c0
gui-wm/river: new package, add 0.1.3
Signed-off-by: Cara Salter <cara <AT> devcara.com>
gui-wm/river/Manifest | 1 +
gui-wm/river/metadata.xml | 8 ++++++++
gui-wm/river/river-0.1.3.ebuild | 38 ++++++++++++++++++++++++++++++++++++++
3 files changed, 47 insertions(+)
diff --git a/gui-wm/river/Manifest b/gui-wm/river/Manifest
new file mode 100644
index 000000000..5ca331bb5
--- /dev/null
+++ b/gui-wm/river/Manifest
@@ -0,0 +1 @@
+DIST river-0.1.3.tar.gz 249131 BLAKE2B 9e018c85093be6b1c2e5a05f0a5858dceb820710178bd4fd556550f7573c7d982252264309bd2dfb1247f37e9cab625dce3b3c2fa5da2ad9c9b19bfac4c059ba SHA512 8dd8ad8b17fb1d9d65e413aaaa456fda89f8bedd580db247c3ffa8235a67712394182b3498a9c6eb3707cfc571c398bb5086cf09810e4a9438d26ea19f41f5a9
diff --git a/gui-wm/river/metadata.xml b/gui-wm/river/metadata.xml
new file mode 100644
index 000000000..54c19695f
--- /dev/null
+++ b/gui-wm/river/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>cara@devcara.com</email>
+ <name>Cara Salter</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/gui-wm/river/river-0.1.3.ebuild b/gui-wm/river/river-0.1.3.ebuild
new file mode 100644
index 000000000..9ed07725d
--- /dev/null
+++ b/gui-wm/river/river-0.1.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A dynamic tiling Wayland compositor"
+HOMEPAGE="https://github.com/riverwm/river"
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/riverwm/river"
+else
+ SRC_URI="https://github.com/riverwm/river/releases/download/v${PV}/river-${PV}.tar.gz"
+fi
+
+PATCHES=()
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="x11-libs/libxkbcommon
+ dev-libs/libevdev
+ x11-libs/pixman
+ virtual/pkgconfig
+ app-text/scdoc
+ dev-libs/wayland
+ dev-libs/wayland-protocols
+ >gui-libs/wlroots-0.16"
+RDEPEND="${DEPEND}"
+BDEPEND="=dev-lang/zig-0.9.1-r3"
+
+src_install() {
+ zig build -Drelease-safe --prefix "${D}/usr" install
+
+ dodir /usr/share/examples/river
+
+ cp "${S}/example/init" "${D}/usr/share/examples/river/init"
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: gui-wm/river/
@ 2024-08-05 5:20 Viorel Munteanu
0 siblings, 0 replies; 9+ messages in thread
From: Viorel Munteanu @ 2024-08-05 5:20 UTC (permalink / raw
To: gentoo-commits
commit: 47930c50ee78ed8c98e907eb76bf399a16988207
Author: Daichi Yamamoto <dev <AT> dyama <DOT> net>
AuthorDate: Sun Aug 4 07:11:27 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Aug 4 07:11:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=47930c50
gui-wm/river: install example/
Signed-off-by: Daichi Yamamoto <dev <AT> dyama.net>
gui-wm/river/river-0.3.5.ebuild | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/gui-wm/river/river-0.3.5.ebuild b/gui-wm/river/river-0.3.5.ebuild
index 8226a42ae..9404ae635 100644
--- a/gui-wm/river/river-0.3.5.ebuild
+++ b/gui-wm/river/river-0.3.5.ebuild
@@ -49,11 +49,11 @@ ezig_build() {
src_unpack() {
default
- edo mkdir "${S}/deps"
- edo mv zig-pixman "${S}/deps"
- edo mv zig-wayland "${S}/deps"
- edo mv zig-wlroots "${S}/deps"
- edo mv zig-xkbcommon "${S}/deps"
+ mkdir "${S}/deps" || die
+ mv zig-pixman "${S}/deps" || die
+ mv zig-wayland "${S}/deps" || die
+ mv zig-wlroots "${S}/deps" || die
+ mv zig-xkbcommon "${S}/deps" || die
}
src_configure() {
@@ -82,6 +82,10 @@ src_install() {
ezig_build install --prefix "${ED}/usr"
dodoc README.md
+
insinto /usr/share/wayland-sessions
doins contrib/river.desktop
+
+ insinto /usr/share/${PN}
+ doins -r example
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: gui-wm/river/
@ 2024-08-05 5:20 Viorel Munteanu
0 siblings, 0 replies; 9+ messages in thread
From: Viorel Munteanu @ 2024-08-05 5:20 UTC (permalink / raw
To: gentoo-commits
commit: 6c5a0a81f416686a1bccfaec96f95bf5655dd856
Author: Daichi Yamamoto <dev <AT> dyama <DOT> net>
AuthorDate: Sun Aug 4 08:11:15 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Aug 4 08:11:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6c5a0a81
gui-wm/river: add deps
Signed-off-by: Daichi Yamamoto <dev <AT> dyama.net>
gui-wm/river/river-0.3.5.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/gui-wm/river/river-0.3.5.ebuild b/gui-wm/river/river-0.3.5.ebuild
index 9404ae635..86665f2cc 100644
--- a/gui-wm/river/river-0.3.5.ebuild
+++ b/gui-wm/river/river-0.3.5.ebuild
@@ -33,6 +33,7 @@ DEPEND="
|| ( dev-lang/zig-bin:${EZIG_MIN} dev-lang/zig:${EZIG_MIN} )
dev-libs/wayland
gui-libs/wlroots:0.18
+ xwayland? ( x11-base/xwayland )
x11-libs/libxkbcommon
x11-libs/pixman
"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: gui-wm/river/
@ 2024-08-05 5:20 Viorel Munteanu
0 siblings, 0 replies; 9+ messages in thread
From: Viorel Munteanu @ 2024-08-05 5:20 UTC (permalink / raw
To: gentoo-commits
commit: 9ff157ed51d286d07f6da1414293d34696dcd13f
Author: Daichi Yamamoto <dev <AT> dyama <DOT> net>
AuthorDate: Sun Aug 4 17:31:39 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Aug 4 17:31:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9ff157ed
gui-wm/river: remove *sh-completion USE flags
Signed-off-by: Daichi Yamamoto <dev <AT> dyama.net>
gui-wm/river/metadata.xml | 1 -
gui-wm/river/river-0.3.5.ebuild | 5 +----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/gui-wm/river/metadata.xml b/gui-wm/river/metadata.xml
index 44c7580c5..34c03a7a1 100644
--- a/gui-wm/river/metadata.xml
+++ b/gui-wm/river/metadata.xml
@@ -6,7 +6,6 @@
<name>Daichi Yamamoto</name>
</maintainer>
<use>
- <flag name="fish-completion">Enable fish-completion support</flag>
<flag name="llvm">Use LLVM Zig backend</flag>
</use>
<upstream>
diff --git a/gui-wm/river/river-0.3.5.ebuild b/gui-wm/river/river-0.3.5.ebuild
index 631d339a4..65e6d4373 100644
--- a/gui-wm/river/river-0.3.5.ebuild
+++ b/gui-wm/river/river-0.3.5.ebuild
@@ -24,7 +24,7 @@ PATCHES=(
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="+X +llvm +man pie bash-completion zsh-completion fish-completion"
+IUSE="+X +llvm +man pie"
EZIG_MIN="0.12"
EZIG_MAX_EXCLUSIVE="0.13"
@@ -130,9 +130,6 @@ src_configure() {
-Dpie=$(usex pie true false)
-Dno-llvm=$(usex llvm false true)
-Dman-pages=$(usex man true false)
- -Dbash-completion=$(usex bash-completion true false)
- -Dzsh-completion=$(usex zsh-completion true false)
- -Dfish-completion=$(usex fish-completion true false)
-Dxwayland=$(usex X true false)
)
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: gui-wm/river/
@ 2024-08-05 5:20 Viorel Munteanu
0 siblings, 0 replies; 9+ messages in thread
From: Viorel Munteanu @ 2024-08-05 5:20 UTC (permalink / raw
To: gentoo-commits
commit: a68366316366517a3e9b9409911c00226dccf0dd
Author: Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Sun Aug 4 09:45:21 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Aug 4 09:45:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a6836631
gui-wm/river: fix Zig version detection in 0.3.5
It used zig version selected by user in `eselect-zig` previously,
which is incorrect, as ebuild should use own, detected Zig version.
Seems like this logic is also copy-pasted from
https://github.com/bsd-ac/wayland-desktop/blob/2724ddc7532e81ba553f17e6bd2df861ccb442ee/gui-wm/river/river-0.3.2.ebuild ,
which, in its turn, has old logic from sys-fs/ncdu. Not critical, but
fixed this too.
Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
gui-wm/river/river-0.3.5.ebuild | 76 ++++++++++++++++++++++++++++++++++++-----
1 file changed, 67 insertions(+), 9 deletions(-)
diff --git a/gui-wm/river/river-0.3.5.ebuild b/gui-wm/river/river-0.3.5.ebuild
index 86665f2cc..068cdf626 100644
--- a/gui-wm/river/river-0.3.5.ebuild
+++ b/gui-wm/river/river-0.3.5.ebuild
@@ -28,6 +28,7 @@ KEYWORDS="~amd64"
IUSE="+llvm +man pie xwayland bash-completion zsh-completion fish-completion"
EZIG_MIN="0.12"
+EZIG_MAX_EXCLUSIVE="0.13"
DEPEND="
|| ( dev-lang/zig-bin:${EZIG_MIN} dev-lang/zig:${EZIG_MIN} )
@@ -39,12 +40,69 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+DOCS=( README.md )
+
# https://github.com/ziglang/zig/issues/3382
QA_FLAGS_IGNORED="usr/bin/*"
-ezig_build() {
- EZIG=zig
- edo "${EZIG}" build "${ZIG_BUILD_ARGS[@]}" "${@}"
+# Many thanks to Florian Schmaus (Flowdalic)!
+# Adapted from https://github.com/gentoo/gentoo/pull/28986
+# Set the EZIG environment variable.
+zig-set_EZIG() {
+ [[ -n ${EZIG} ]] && return
+
+ local candidate selected selected_ver ver
+
+ for candidate in "${BROOT}"/usr/bin/zig-*; do
+ if [[ ! -L ${candidate} || ${candidate} != */zig?(-bin)-+([0-9.]) ]]; then
+ continue
+ fi
+
+ ver=${candidate##*-}
+
+ if [[ -n ${EZIG_EXACT_VER} ]]; then
+ ver_test "${ver}" -ne "${EZIG_EXACT_VER}" && continue
+
+ selected="${candidate}"
+ selected_ver="${ver}"
+ break
+ fi
+
+ if [[ -n ${EZIG_MIN} ]] \
+ && ver_test "${ver}" -lt "${EZIG_MIN}"; then
+ # Candidate does not satisfy EZIG_MIN condition.
+ continue
+ fi
+
+ if [[ -n ${EZIG_MAX_EXCLUSIVE} ]] \
+ && ver_test "${ver}" -ge "${EZIG_MAX_EXCLUSIVE}"; then
+ # Candidate does not satisfy EZIG_MAX_EXCLUSIVE condition.
+ continue
+ fi
+
+ if [[ -n ${selected_ver} ]] \
+ && ver_test "${selected_ver}" -gt "${ver}"; then
+ # Candidate is older than the currently selected candidate.
+ continue
+ fi
+
+ selected="${candidate}"
+ selected_ver="${ver}"
+ done
+
+ if [[ -z ${selected} ]]; then
+ die "Could not find (suitable) zig installation in ${BROOT}/usr/bin"
+ fi
+
+ export EZIG="${selected}"
+ export EZIG_VER="${selected_ver}"
+}
+
+# Invoke zig with the optionally provided arguments.
+ezig() {
+ zig-set_EZIG
+
+ edo "${EZIG}" "${@}"
}
src_unpack() {
@@ -58,7 +116,8 @@ src_unpack() {
}
src_configure() {
- export ZIG_BUILD_ARGS=(
+ export ZBS_ARGS=(
+ --prefix usr/
-Doptimize=ReleaseSafe
-Dpie=$(usex pie true false)
@@ -72,17 +131,16 @@ src_configure() {
}
src_compile() {
- ezig_build
+ ezig build "${ZBS_ARGS[@]}"
}
src_test() {
- ezig_build test
+ ezig build test "${ZBS_ARGS[@]}"
}
src_install() {
- ezig_build install --prefix "${ED}/usr"
-
- dodoc README.md
+ DESTDIR="${ED}" ezig build install "${ZBS_ARGS[@]}"
+ einstalldocs
insinto /usr/share/wayland-sessions
doins contrib/river.desktop
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: gui-wm/river/
@ 2024-08-17 10:16 David Roman
0 siblings, 0 replies; 9+ messages in thread
From: David Roman @ 2024-08-17 10:16 UTC (permalink / raw
To: gentoo-commits
commit: dd5f6fdcf85e7e6fda1802bcf18d11d445a7c486
Author: Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Thu Aug 15 17:36:34 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Aug 15 17:36:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dd5f6fdc
gui-wm/river: bump Zig dependency to 0.13
Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
gui-wm/river/river-0.3.5-r1.ebuild | 150 +++++++++++++++++++++++++++++++++++++
1 file changed, 150 insertions(+)
diff --git a/gui-wm/river/river-0.3.5-r1.ebuild b/gui-wm/river/river-0.3.5-r1.ebuild
new file mode 100644
index 000000000..95351b560
--- /dev/null
+++ b/gui-wm/river/river-0.3.5-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo
+
+DESCRIPTION="A dynamic tiling Wayland compositor"
+HOMEPAGE="https://isaacfreund.com/software/river/"
+
+SRC_URI="
+ https://codeberg.org/river/river/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz -> zig-pixman-0.2.0.tar.gz
+ https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz -> zig-wayland-0.2.0.tar.gz
+ https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.0.tar.gz -> zig-wlroots-0.18.0.tar.gz
+ https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz -> zig-xkbcommon-0.2.0.tar.gz
+"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+X +llvm +man pie"
+
+EZIG_MIN="0.13"
+EZIG_MAX_EXCLUSIVE="0.14"
+
+DEPEND="
+ dev-libs/libevdev
+ dev-libs/wayland
+ dev-libs/wayland-protocols
+ gui-libs/wlroots:0.18=[X?]
+ x11-libs/libxkbcommon:=[X?]
+ x11-libs/pixman
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ || ( dev-lang/zig-bin:${EZIG_MIN} dev-lang/zig:${EZIG_MIN} )
+ man? ( app-text/scdoc )
+ virtual/pkgconfig
+"
+
+DOCS=( README.md )
+
+# https://github.com/ziglang/zig/issues/3382
+QA_FLAGS_IGNORED="usr/bin/*"
+
+# Many thanks to Florian Schmaus (Flowdalic)!
+# Adapted from https://github.com/gentoo/gentoo/pull/28986
+# Set the EZIG environment variable.
+zig-set_EZIG() {
+ [[ -n ${EZIG} ]] && return
+
+ local candidate selected selected_ver ver
+
+ for candidate in "${BROOT}"/usr/bin/zig-*; do
+ if [[ ! -L ${candidate} || ${candidate} != */zig?(-bin)-+([0-9.]) ]]; then
+ continue
+ fi
+
+ ver=${candidate##*-}
+
+ if [[ -n ${EZIG_EXACT_VER} ]]; then
+ ver_test "${ver}" -ne "${EZIG_EXACT_VER}" && continue
+
+ selected="${candidate}"
+ selected_ver="${ver}"
+ break
+ fi
+
+ if [[ -n ${EZIG_MIN} ]] \
+ && ver_test "${ver}" -lt "${EZIG_MIN}"; then
+ # Candidate does not satisfy EZIG_MIN condition.
+ continue
+ fi
+
+ if [[ -n ${EZIG_MAX_EXCLUSIVE} ]] \
+ && ver_test "${ver}" -ge "${EZIG_MAX_EXCLUSIVE}"; then
+ # Candidate does not satisfy EZIG_MAX_EXCLUSIVE condition.
+ continue
+ fi
+
+ if [[ -n ${selected_ver} ]] \
+ && ver_test "${selected_ver}" -gt "${ver}"; then
+ # Candidate is older than the currently selected candidate.
+ continue
+ fi
+
+ selected="${candidate}"
+ selected_ver="${ver}"
+ done
+
+ if [[ -z ${selected} ]]; then
+ die "Could not find (suitable) zig installation in ${BROOT}/usr/bin"
+ fi
+
+ export EZIG="${selected}"
+ export EZIG_VER="${selected_ver}"
+}
+
+# Invoke zig with the optionally provided arguments.
+ezig() {
+ zig-set_EZIG
+
+ edo "${EZIG}" "${@}"
+}
+
+src_unpack() {
+ default
+
+ # unpacking into ${S} to patch zig-wayland-0.2.0
+ # without patches, it would be better using ${WORKDIR}/deps
+ mkdir "${S}/deps" || die
+ ezig fetch --global-cache-dir "${S}/deps" "${DISTDIR}/zig-pixman-0.2.0.tar.gz"
+ ezig fetch --global-cache-dir "${S}/deps" "${DISTDIR}/zig-wayland-0.2.0.tar.gz"
+ ezig fetch --global-cache-dir "${S}/deps" "${DISTDIR}/zig-wlroots-0.18.0.tar.gz"
+ ezig fetch --global-cache-dir "${S}/deps" "${DISTDIR}/zig-xkbcommon-0.2.0.tar.gz"
+}
+
+src_configure() {
+ export ZBS_ARGS=(
+ --prefix usr/
+ --system "${S}/deps/p"
+ -Doptimize=ReleaseSafe
+
+ -Dpie=$(usex pie true false)
+ -Dno-llvm=$(usex llvm false true)
+ -Dman-pages=$(usex man true false)
+ -Dxwayland=$(usex X true false)
+ )
+}
+
+src_compile() {
+ ezig build "${ZBS_ARGS[@]}"
+}
+
+src_test() {
+ ezig build test "${ZBS_ARGS[@]}"
+}
+
+src_install() {
+ DESTDIR="${ED}" ezig build install "${ZBS_ARGS[@]}"
+ einstalldocs
+
+ insinto /usr/share/wayland-sessions
+ doins contrib/river.desktop
+
+ insinto /usr/share/${PN}
+ doins -r example
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: gui-wm/river/
2024-12-28 20:07 [gentoo-commits] repo/proj/guru:dev " Florian Schmaus
@ 2024-12-28 20:08 ` Florian Schmaus
0 siblings, 0 replies; 9+ messages in thread
From: Florian Schmaus @ 2024-12-28 20:08 UTC (permalink / raw
To: gentoo-commits
commit: f17c600a974dfabc4c290bcc5f3b610a835206a7
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 20:07:03 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 20:07:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f17c600a
gui-wm/river: drop 0.3.5-r1
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
gui-wm/river/Manifest | 5 --
gui-wm/river/river-0.3.5-r1.ebuild | 150 -------------------------------------
2 files changed, 155 deletions(-)
diff --git a/gui-wm/river/Manifest b/gui-wm/river/Manifest
index 123660472..05556e3e0 100644
--- a/gui-wm/river/Manifest
+++ b/gui-wm/river/Manifest
@@ -1,10 +1,5 @@
-DIST river-0.3.5.tar.gz 170903 BLAKE2B a4bdfc0ddd1dc92d6bed392c8a68a2639ef6ae3ee5d217c93d326edcec52af87286ac1c376a60554f9f65443a3130a1d44ff7841dba903a0d17516c94c95ce27 SHA512 49e3d0488030aee4f69936605fafc0027b2c78a9a399b5153d54a5ba64592c7efdc67bfd7fedcab6ba93c0689bc921f5a978f7b4b1a12e0c5fda0242900d328c
DIST river-0.3.6.tar.gz 171853 BLAKE2B ffa66b698a250eeaef6034ce7f58175d99ae93b644525b30e192938620410efe494bf8bbf0dc6885d784d1566c26a13e026a490ec21db8e664d42a1ddb5eb222 SHA512 62a7a39a697507813018e02d7d05374dfdab2bbd531623b870b1ea75d34a4bd3dea55146fb6b37620ee4633d5a1fd011461de097bc1fd4db6c6ca95251033f27
-DIST zig-pixman-0.2.0.tar.gz 7874 BLAKE2B 25e0e0a65ab45c08e13ed48393e0d009a63e0ec4c2d8452f08ec4b013f9b696adb1d7356a49b1c3b25710982fb34629002df8d433382d433fcdefd1de5fd4358 SHA512 61ce38e9788e9a3701cf32b2d8721424088e1a8bd11841fecc999a31f9b46148e63a35cf770a39edcc7887913019654f7df945b7d7e3b57437d007f7d45609b9
DIST zig-pixman-12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56.tar.gz 7874 BLAKE2B 25e0e0a65ab45c08e13ed48393e0d009a63e0ec4c2d8452f08ec4b013f9b696adb1d7356a49b1c3b25710982fb34629002df8d433382d433fcdefd1de5fd4358 SHA512 61ce38e9788e9a3701cf32b2d8721424088e1a8bd11841fecc999a31f9b46148e63a35cf770a39edcc7887913019654f7df945b7d7e3b57437d007f7d45609b9
-DIST zig-wayland-0.2.0.tar.gz 56543 BLAKE2B aaf82efe78d25c59a87de050147857fcf9a19764141cb40d92b0dd48b96ea0ec52d00a1ab0df1afe4c45cda6d64dda97f296f0aa29d8b9ea3da49e1d5cd69e50 SHA512 dfb140c06d9e3c566034f9102426e7bd47dcde87a2ae16d43ce3ea72cf44bea872bab1d9a23a24ae9d57d2d4ae6c56060a6b10f869de3990046426b0462db85e
DIST zig-wayland-1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242.tar.gz 56543 BLAKE2B aaf82efe78d25c59a87de050147857fcf9a19764141cb40d92b0dd48b96ea0ec52d00a1ab0df1afe4c45cda6d64dda97f296f0aa29d8b9ea3da49e1d5cd69e50 SHA512 dfb140c06d9e3c566034f9102426e7bd47dcde87a2ae16d43ce3ea72cf44bea872bab1d9a23a24ae9d57d2d4ae6c56060a6b10f869de3990046426b0462db85e
-DIST zig-wlroots-0.18.0.tar.gz 56568 BLAKE2B 2ff804f7472d9c48cc29375afcdbdaba996b0c73b4660a89cd982058c79603a0d3f5e7233b0bfe7f2a5af33046ea7dddddad95136a890997020be0f0beb3b050 SHA512 a67b35c0475253b581728a407d46e256ca1f587d7cc105f00f5a7e5eb39808cea46a3d302c965f92e08801e99e67a450c11f085a94b57b1d86c0c3bab83b806d
DIST zig-wlroots-122083317b028705b5d27be12976feebf17066a4e51802b3b5e9f970bec580e433e1.tar.gz 56926 BLAKE2B 50a143f816b47516b3fc3b051a7445162efbcbb802a3515fe554e005e2f1191f75eaeea4bab68972ecb5b9f0b72f7cec12838c7ec98a1d05ed54803b3a79ca66 SHA512 523f29b06ece2aefbd90e8f9ce15bfcf59edf47e583fe963a8f58af0209d7e9a8dda857424469a40e3c7defb31d01df9f977f8dc58dc3ba7468e20f7b3a4e417
-DIST zig-xkbcommon-0.2.0.tar.gz 22700 BLAKE2B 85045d002b4ec1ac8dadda67d3ce6f588e53938ac0a67c06d6cebc85a944d7a23fd1cc295410ce1a91cce9ffb587834f7eca2400e1468fec0193583ac71d6f86 SHA512 a99b6a2fefe34507fd687b58a9618a27ca617966798b410a72c9e53462c3f9c6dd0476a22bb9686cbf49994ca502743b4d25fdc55125359d4fe2860094bf0e82
DIST zig-xkbcommon-1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f.tar.gz 22700 BLAKE2B 85045d002b4ec1ac8dadda67d3ce6f588e53938ac0a67c06d6cebc85a944d7a23fd1cc295410ce1a91cce9ffb587834f7eca2400e1468fec0193583ac71d6f86 SHA512 a99b6a2fefe34507fd687b58a9618a27ca617966798b410a72c9e53462c3f9c6dd0476a22bb9686cbf49994ca502743b4d25fdc55125359d4fe2860094bf0e82
diff --git a/gui-wm/river/river-0.3.5-r1.ebuild b/gui-wm/river/river-0.3.5-r1.ebuild
deleted file mode 100644
index 95351b560..000000000
--- a/gui-wm/river/river-0.3.5-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo
-
-DESCRIPTION="A dynamic tiling Wayland compositor"
-HOMEPAGE="https://isaacfreund.com/software/river/"
-
-SRC_URI="
- https://codeberg.org/river/river/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz -> zig-pixman-0.2.0.tar.gz
- https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz -> zig-wayland-0.2.0.tar.gz
- https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.0.tar.gz -> zig-wlroots-0.18.0.tar.gz
- https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz -> zig-xkbcommon-0.2.0.tar.gz
-"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+X +llvm +man pie"
-
-EZIG_MIN="0.13"
-EZIG_MAX_EXCLUSIVE="0.14"
-
-DEPEND="
- dev-libs/libevdev
- dev-libs/wayland
- dev-libs/wayland-protocols
- gui-libs/wlroots:0.18=[X?]
- x11-libs/libxkbcommon:=[X?]
- x11-libs/pixman
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- || ( dev-lang/zig-bin:${EZIG_MIN} dev-lang/zig:${EZIG_MIN} )
- man? ( app-text/scdoc )
- virtual/pkgconfig
-"
-
-DOCS=( README.md )
-
-# https://github.com/ziglang/zig/issues/3382
-QA_FLAGS_IGNORED="usr/bin/*"
-
-# Many thanks to Florian Schmaus (Flowdalic)!
-# Adapted from https://github.com/gentoo/gentoo/pull/28986
-# Set the EZIG environment variable.
-zig-set_EZIG() {
- [[ -n ${EZIG} ]] && return
-
- local candidate selected selected_ver ver
-
- for candidate in "${BROOT}"/usr/bin/zig-*; do
- if [[ ! -L ${candidate} || ${candidate} != */zig?(-bin)-+([0-9.]) ]]; then
- continue
- fi
-
- ver=${candidate##*-}
-
- if [[ -n ${EZIG_EXACT_VER} ]]; then
- ver_test "${ver}" -ne "${EZIG_EXACT_VER}" && continue
-
- selected="${candidate}"
- selected_ver="${ver}"
- break
- fi
-
- if [[ -n ${EZIG_MIN} ]] \
- && ver_test "${ver}" -lt "${EZIG_MIN}"; then
- # Candidate does not satisfy EZIG_MIN condition.
- continue
- fi
-
- if [[ -n ${EZIG_MAX_EXCLUSIVE} ]] \
- && ver_test "${ver}" -ge "${EZIG_MAX_EXCLUSIVE}"; then
- # Candidate does not satisfy EZIG_MAX_EXCLUSIVE condition.
- continue
- fi
-
- if [[ -n ${selected_ver} ]] \
- && ver_test "${selected_ver}" -gt "${ver}"; then
- # Candidate is older than the currently selected candidate.
- continue
- fi
-
- selected="${candidate}"
- selected_ver="${ver}"
- done
-
- if [[ -z ${selected} ]]; then
- die "Could not find (suitable) zig installation in ${BROOT}/usr/bin"
- fi
-
- export EZIG="${selected}"
- export EZIG_VER="${selected_ver}"
-}
-
-# Invoke zig with the optionally provided arguments.
-ezig() {
- zig-set_EZIG
-
- edo "${EZIG}" "${@}"
-}
-
-src_unpack() {
- default
-
- # unpacking into ${S} to patch zig-wayland-0.2.0
- # without patches, it would be better using ${WORKDIR}/deps
- mkdir "${S}/deps" || die
- ezig fetch --global-cache-dir "${S}/deps" "${DISTDIR}/zig-pixman-0.2.0.tar.gz"
- ezig fetch --global-cache-dir "${S}/deps" "${DISTDIR}/zig-wayland-0.2.0.tar.gz"
- ezig fetch --global-cache-dir "${S}/deps" "${DISTDIR}/zig-wlroots-0.18.0.tar.gz"
- ezig fetch --global-cache-dir "${S}/deps" "${DISTDIR}/zig-xkbcommon-0.2.0.tar.gz"
-}
-
-src_configure() {
- export ZBS_ARGS=(
- --prefix usr/
- --system "${S}/deps/p"
- -Doptimize=ReleaseSafe
-
- -Dpie=$(usex pie true false)
- -Dno-llvm=$(usex llvm false true)
- -Dman-pages=$(usex man true false)
- -Dxwayland=$(usex X true false)
- )
-}
-
-src_compile() {
- ezig build "${ZBS_ARGS[@]}"
-}
-
-src_test() {
- ezig build test "${ZBS_ARGS[@]}"
-}
-
-src_install() {
- DESTDIR="${ED}" ezig build install "${ZBS_ARGS[@]}"
- einstalldocs
-
- insinto /usr/share/wayland-sessions
- doins contrib/river.desktop
-
- insinto /usr/share/${PN}
- doins -r example
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: gui-wm/river/
2024-12-28 20:06 [gentoo-commits] repo/proj/guru:dev " Florian Schmaus
@ 2024-12-28 20:08 ` Florian Schmaus
0 siblings, 0 replies; 9+ messages in thread
From: Florian Schmaus @ 2024-12-28 20:08 UTC (permalink / raw
To: gentoo-commits
commit: 295f6f8eb933542c5c69300e22e74553e1ddab35
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 20:05:25 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 20:05:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=295f6f8e
gui-wm/river: drop unnecessary definition of src_unpack()
Since zig_src_unpack() is an exported phase function of zig.eclass, so
there is no need to explictily define src_unpack() (if no other
inherited eclass also exports src_unpack(), which is not the case for
this ebuild).
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
gui-wm/river/river-0.3.6.ebuild | 4 ----
1 file changed, 4 deletions(-)
diff --git a/gui-wm/river/river-0.3.6.ebuild b/gui-wm/river/river-0.3.6.ebuild
index 1342330ce..6ddf852d6 100644
--- a/gui-wm/river/river-0.3.6.ebuild
+++ b/gui-wm/river/river-0.3.6.ebuild
@@ -52,10 +52,6 @@ PATCHES=( "${FILESDIR}/${P}-fix-no-lazypath.patch" )
DOCS=( "README.md" )
-src_unpack() {
- zig_src_unpack
-}
-
src_configure() {
local my_zbs_args=(
-Dstrip=false # Let Portage control this
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: gui-wm/river/
@ 2025-03-08 11:18 Lucio Sauer
0 siblings, 0 replies; 9+ messages in thread
From: Lucio Sauer @ 2025-03-08 11:18 UTC (permalink / raw
To: gentoo-commits
commit: 49f3fb9bf3a37edb18ffb00677a1b453f26848ef
Author: Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Fri Mar 7 15:48:17 2025 +0000
Commit: Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Fri Mar 7 15:48:17 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=49f3fb9b
gui-wm/river: add 0.3.8
Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
gui-wm/river/Manifest | 5 +++
gui-wm/river/river-0.3.8.ebuild | 72 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 77 insertions(+)
diff --git a/gui-wm/river/Manifest b/gui-wm/river/Manifest
index e2436386c..d65591fdf 100644
--- a/gui-wm/river/Manifest
+++ b/gui-wm/river/Manifest
@@ -1,5 +1,10 @@
+DIST pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX.tar.gz 7966 BLAKE2B 8d6607e878b0bacc0fc16bcc2264ddd89e349b61a1b269e59b2e19b311064453a473f2401103b0e40906f7190d154d403b712e05fe937abe2f6253f7d8337820 SHA512 2eb43d460aff9ff2da015afc9230ca73588ada59df59465a3efa8f074d9d641fec4bf52ab3de475ec1a5ba2f04afc59221f231af5e2cf5aba7252bbde6be35a5
DIST river-0.3.6.tar.gz 171853 BLAKE2B ffa66b698a250eeaef6034ce7f58175d99ae93b644525b30e192938620410efe494bf8bbf0dc6885d784d1566c26a13e026a490ec21db8e664d42a1ddb5eb222 SHA512 62a7a39a697507813018e02d7d05374dfdab2bbd531623b870b1ea75d34a4bd3dea55146fb6b37620ee4633d5a1fd011461de097bc1fd4db6c6ca95251033f27
DIST river-0.3.7.tar.gz 172036 BLAKE2B d428ec0abf562c0b0ef153499862e0c0c32b37721c870c7f0d54599634fccd5339595eb51e34d401e877378b10c945ad7e0fbf73a90c27c3a1c9eb0883ca88df SHA512 4297b2bd566a3f87fd0c158affd8573661d722ebb7e795356040b15185f09e67dcfac938fa26757d683a274dc08781559b059584dc4934c1d6f51666bf8cb9ec
+DIST river-0.3.8.tar.gz 173936 BLAKE2B 33986135b3425310c441a10e656faf0263befc341348de81c3fd258d00224e214464cf69021671137040d1b7a5a2d3c0168f2602528f6edb92e3d4519b28655a SHA512 2182df2dcd18bc1258d3b7ded3d2ae243686962adec9749677c3799717d61ad74d298e9e8297fb04d1aa70179f8a6f4cccf1425a02581f1783e18c7064e70cf0
+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 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
diff --git a/gui-wm/river/river-0.3.8.ebuild b/gui-wm/river/river-0.3.8.ebuild
new file mode 100644
index 000000000..005618f41
--- /dev/null
+++ b/gui-wm/river/river-0.3.8.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A dynamic tiling Wayland compositor"
+HOMEPAGE="https://isaacfreund.com/software/river/ https://codeberg.org/river/river"
+
+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'
+ [xkbcommon-0.3.0-VDqIe3K9AQB2fG5ZeRcMC9i7kfrp5m2rWgLrmdNn9azr.tar.gz]='https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.3.0.tar.gz'
+)
+
+ZIG_SLOT="0.14"
+inherit zig
+# TODO verify-sig support
+SRC_URI="
+ https://codeberg.org/river/river/releases/download/v${PV}/${P}.tar.gz
+ ${ZBS_DEPENDENCIES_SRC_URI}
+"
+
+# 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}"
+
+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/
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2025-03-08 11:18 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-05 5:20 [gentoo-commits] repo/proj/guru:master commit in: gui-wm/river/ Viorel Munteanu
-- strict thread matches above, loose matches on Subject: below --
2025-03-08 11:18 Lucio Sauer
2024-12-28 20:07 [gentoo-commits] repo/proj/guru:dev " Florian Schmaus
2024-12-28 20:08 ` [gentoo-commits] repo/proj/guru:master " Florian Schmaus
2024-12-28 20:06 [gentoo-commits] repo/proj/guru:dev " Florian Schmaus
2024-12-28 20:08 ` [gentoo-commits] repo/proj/guru:master " Florian Schmaus
2024-08-17 10:16 David Roman
2024-08-05 5:20 Viorel Munteanu
2024-08-05 5:20 Viorel Munteanu
2024-08-05 5:20 Viorel Munteanu
2022-12-01 3:59 Haelwenn Monnier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox