From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A320C15852A for ; Fri, 23 Aug 2024 10:40:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF275E2A38; Fri, 23 Aug 2024 10:40:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AFC16E2A38 for ; Fri, 23 Aug 2024 10:40:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 50AF5340C77 for ; Fri, 23 Aug 2024 10:40:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7FEA21EF2 for ; Fri, 23 Aug 2024 10:40:01 +0000 (UTC) From: "Eric Joldasov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Eric Joldasov" Message-ID: <1724408654.5f8a4e0b0720c964e18aa7791ae454f0dfb0eff9.bratishkaerik@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: gui-wm/river/, gui-wm/river/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: gui-wm/river/files/river-0.3.5-zig-0.12.0.patch gui-wm/river/river-0.3.5.ebuild X-VCS-Directories: gui-wm/river/ gui-wm/river/files/ X-VCS-Committer: bratishkaerik X-VCS-Committer-Name: Eric Joldasov X-VCS-Revision: 5f8a4e0b0720c964e18aa7791ae454f0dfb0eff9 X-VCS-Branch: dev Date: Fri, 23 Aug 2024 10:40:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6915f5b9-07a2-45ba-ae8b-700874de9805 X-Archives-Hash: dcf91e1944345b0868938fdfbf5321f4 commit: 5f8a4e0b0720c964e18aa7791ae454f0dfb0eff9 Author: Eric Joldasov landless-city net> AuthorDate: Fri Aug 23 10:24:14 2024 +0000 Commit: Eric Joldasov getgoogleoff me> CommitDate: Fri Aug 23 10:24:14 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5f8a4e0b gui-wm/river: drop 0.3.5 Signed-off-by: Eric Joldasov landless-city.net> gui-wm/river/files/river-0.3.5-zig-0.12.0.patch | 27 ----- gui-wm/river/river-0.3.5.ebuild | 154 ------------------------ 2 files changed, 181 deletions(-) diff --git a/gui-wm/river/files/river-0.3.5-zig-0.12.0.patch b/gui-wm/river/files/river-0.3.5-zig-0.12.0.patch deleted file mode 100644 index d974d9b67..000000000 --- a/gui-wm/river/files/river-0.3.5-zig-0.12.0.patch +++ /dev/null @@ -1,27 +0,0 @@ -zig-wayland-0.2.0 ---- a/deps/p/1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242/src/scanner.zig -+++ b/deps/p/1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242/src/scanner.zig -@@ -528,7 +528,7 @@ - // These interfaces are special in that their version may never be increased. - // That is, they are pinned to version 1 forever. They also may break the - // normally required tree object creation hierarchy. -- const version_locked_interfaces = std.StaticStringMap(void).initComptime(.{ -+ const version_locked_interfaces = std.ComptimeStringMap(void, .{ - .{"wl_display"}, - .{"wl_registry"}, - .{"wl_callback"}, - -river-0.3.5 ---- a/river/command.zig -+++ b/river/command.zig -@@ -36,9 +36,8 @@ - vertical, - }; - --const command_impls = std.StaticStringMap( -+const command_impls = std.ComptimeStringMap( - *const fn (*Seat, []const [:0]const u8, *?[]const u8) Error!void, --).initComptime( - .{ - // zig fmt: off - .{ "attach-mode", @import("command/attach_mode.zig").defaultAttachMode }, diff --git a/gui-wm/river/river-0.3.5.ebuild b/gui-wm/river/river-0.3.5.ebuild deleted file mode 100644 index 65e6d4373..000000000 --- a/gui-wm/river/river-0.3.5.ebuild +++ /dev/null @@ -1,154 +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}" - -PATCHES=( - "${FILESDIR}/${P}-zig-0.12.0.patch" -) - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+X +llvm +man pie" - -EZIG_MIN="0.12" -EZIG_MAX_EXCLUSIVE="0.13" - -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 -}