diff options
| -rw-r--r-- | gui-wm/river/files/river-0.3.5-build-zig-zon.patch | 27 | ||||
| -rw-r--r-- | gui-wm/river/files/river-0.3.5-zig-0.12.0.patch | 4 | ||||
| -rw-r--r-- | gui-wm/river/metadata.xml | 1 | ||||
| -rw-r--r-- | gui-wm/river/river-0.3.5.ebuild | 29 |
4 files changed, 20 insertions, 41 deletions
diff --git a/gui-wm/river/files/river-0.3.5-build-zig-zon.patch b/gui-wm/river/files/river-0.3.5-build-zig-zon.patch deleted file mode 100644 index ae916f5b6..000000000 --- a/gui-wm/river/files/river-0.3.5-build-zig-zon.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/build.zig.zon -+++ b/build.zig.zon -@@ -4,20 +4,16 @@ - .paths = .{""}, - .dependencies = .{ - .@"zig-pixman" = .{ -- .url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz", -- .hash = "12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56", -+ .path = "deps/zig-pixman", - }, - .@"zig-wayland" = .{ -- .url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz", -- .hash = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242", -+ .path = "deps/zig-wayland", - }, - .@"zig-wlroots" = .{ -- .url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.0.tar.gz", -- .hash = "12204d789e17c158971f69c7b900e8d8f288e7b9e42b2242f3adfbca57e8266d848f", -+ .path = "deps/zig-wlroots", - }, - .@"zig-xkbcommon" = .{ -- .url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz", -- .hash = "1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f", -+ .path = "deps/zig-xkbcommon", - }, - }, - } 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 index 88442d220..d974d9b67 100644 --- 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 @@ -1,6 +1,6 @@ zig-wayland-0.2.0 ---- a/deps/zig-wayland/src/scanner.zig -+++ b/deps/zig-wayland/src/scanner.zig +--- 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 diff --git a/gui-wm/river/metadata.xml b/gui-wm/river/metadata.xml index 9d512004a..44c7580c5 100644 --- a/gui-wm/river/metadata.xml +++ b/gui-wm/river/metadata.xml @@ -8,7 +8,6 @@ <use> <flag name="fish-completion">Enable fish-completion support</flag> <flag name="llvm">Use LLVM Zig backend</flag> - <flag name="xwayland">Enable xwayland support</flag> </use> <upstream> <remote-id type="codeberg">river/river</remote-id> diff --git a/gui-wm/river/river-0.3.5.ebuild b/gui-wm/river/river-0.3.5.ebuild index 068cdf626..631d339a4 100644 --- a/gui-wm/river/river-0.3.5.ebuild +++ b/gui-wm/river/river-0.3.5.ebuild @@ -18,27 +18,31 @@ SRC_URI=" S="${WORKDIR}/${PN}" PATCHES=( - "${FILESDIR}/${P}-build-zig-zon.patch" "${FILESDIR}/${P}-zig-0.12.0.patch" ) LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64" -IUSE="+llvm +man pie xwayland bash-completion zsh-completion fish-completion" +IUSE="+X +llvm +man pie 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} ) + dev-libs/libevdev dev-libs/wayland - gui-libs/wlroots:0.18 - xwayland? ( x11-base/xwayland ) - x11-libs/libxkbcommon + 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 ) @@ -108,16 +112,19 @@ 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 - mv zig-pixman "${S}/deps" || die - mv zig-wayland "${S}/deps" || die - mv zig-wlroots "${S}/deps" || die - mv zig-xkbcommon "${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) @@ -126,7 +133,7 @@ src_configure() { -Dbash-completion=$(usex bash-completion true false) -Dzsh-completion=$(usex zsh-completion true false) -Dfish-completion=$(usex fish-completion true false) - -Dxwayland=$(usex xwayland true false) + -Dxwayland=$(usex X true false) ) } |