* [gentoo-commits] repo/proj/guru:dev commit in: gui-wm/river/
@ 2022-11-28 18:28 Cara Salter
0 siblings, 0 replies; 7+ messages in thread
From: Cara Salter @ 2022-11-28 18:28 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: Cara Salter <cara <AT> devcara <DOT> com>
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] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: gui-wm/river/
@ 2022-12-01 21:35 Cara Salter
0 siblings, 0 replies; 7+ messages in thread
From: Cara Salter @ 2022-12-01 21:35 UTC (permalink / raw
To: gentoo-commits
commit: 82110cad75e49a36f725ad8d56fad7844136c75c
Author: Cara Salter <cara <AT> devcara <DOT> com>
AuthorDate: Thu Dec 1 21:33:26 2022 +0000
Commit: Cara Salter <cara <AT> devcara <DOT> com>
CommitDate: Thu Dec 1 21:34:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=82110cad
gui-wm/river: treeclean
Removing River due to a hard dependency on Zig 0.9.1, which was removed
due to relying on LLVM 13.
Bug: 876181
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 deletions(-)
diff --git a/gui-wm/river/Manifest b/gui-wm/river/Manifest
deleted file mode 100644
index 5ca331bb5..000000000
--- a/gui-wm/river/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 54c19695f..000000000
--- a/gui-wm/river/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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
deleted file mode 100644
index 9ed07725d..000000000
--- a/gui-wm/river/river-0.1.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: gui-wm/river/
@ 2024-08-04 7:11 Daichi Yamamoto
0 siblings, 0 replies; 7+ messages in thread
From: Daichi Yamamoto @ 2024-08-04 7:11 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: Daichi Yamamoto <dev <AT> dyama <DOT> net>
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] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: gui-wm/river/
@ 2024-08-04 8:14 Daichi Yamamoto
0 siblings, 0 replies; 7+ messages in thread
From: Daichi Yamamoto @ 2024-08-04 8:14 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: Daichi Yamamoto <dev <AT> dyama <DOT> net>
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] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: gui-wm/river/
@ 2024-08-04 9:52 Eric Joldasov
0 siblings, 0 replies; 7+ messages in thread
From: Eric Joldasov @ 2024-08-04 9:52 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: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
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] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: gui-wm/river/
@ 2024-08-04 17:32 Daichi Yamamoto
0 siblings, 0 replies; 7+ messages in thread
From: Daichi Yamamoto @ 2024-08-04 17:32 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: Daichi Yamamoto <dev <AT> dyama <DOT> net>
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] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: gui-wm/river/
@ 2024-08-15 17:37 Eric Joldasov
0 siblings, 0 replies; 7+ messages in thread
From: Eric Joldasov @ 2024-08-15 17:37 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: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
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] 7+ messages in thread
end of thread, other threads:[~2024-08-15 17:37 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-04 9:52 [gentoo-commits] repo/proj/guru:dev commit in: gui-wm/river/ Eric Joldasov
-- strict thread matches above, loose matches on Subject: below --
2024-08-15 17:37 Eric Joldasov
2024-08-04 17:32 Daichi Yamamoto
2024-08-04 8:14 Daichi Yamamoto
2024-08-04 7:11 Daichi Yamamoto
2022-12-01 21:35 Cara Salter
2022-11-28 18:28 Cara Salter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox