Fixed

x11-wm/phoc/Manifest

@@ -1,3 +1,2 @@
 DIST phoc-v0.8.0.tar.gz 144611 BLAKE2B f5ad96a3917ccd849f73e427077e08a19ce4109b639519239fbecb7183d19579e791ecc7628b22fd8632f6f47a55279860d3c6af3eb25d42115b7343c89611cb SHA512 b2cc687852385d4010c22e01ea65870dcc71f4a6a53782a615df11641ce5cc4b29add7afefd5560b95d03fe045b6ffa7387b68dfe114828cd62bdae9424e692d
-DIST wlroot-0.12.0.tar.gz 476936 BLAKE2B 4129c87a148085f95f4cee6973308d79ab3f8b024247287a68dadd6729da8a5f8cc1e4ada63c15477a2c8e8258032440afe4a21a26f947143d17c87b0ca8a1a4 SHA512 560eae30932b777c1f07fb44592d5601c5d10ef74b31b6b9e4166a14caadab2bfa88d39282f159785d4c7f22f78d204f9bb7fab65d58afaf14b72a8486f9b415
 DIST wlroots-0.12.0.tar.gz 476936 BLAKE2B 4129c87a148085f95f4cee6973308d79ab3f8b024247287a68dadd6729da8a5f8cc1e4ada63c15477a2c8e8258032440afe4a21a26f947143d17c87b0ca8a1a4 SHA512 560eae30932b777c1f07fb44592d5601c5d10ef74b31b6b9e4166a14caadab2bfa88d39282f159785d4c7f22f78d204f9bb7fab65d58afaf14b72a8486f9b415

x11-wm/phoc/files/Revert-layer-shell-error-on-0-dimension-without-anchors.diff

@@ -1,42 +0,0 @@
-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Fri, 1 Jan 2021 13:58:55 +0100
-Subject: Revert "layer-shell: error on 0 dimension without anchors"
-
-This reverts commit 8dec751a6d84335fb04288b8efab6dd5c90288d3.
-
-Revert this until phosh has a fixed release.
----
- types/wlr_layer_shell_v1.c | 20 --------------------
- 1 file changed, 20 deletions(-)
-
-diff --git a/types/wlr_layer_shell_v1.c b/types/wlr_layer_shell_v1.c
-index bc68111..d83b22b 100644
---- a/types/wlr_layer_shell_v1.c
-+++ b/types/wlr_layer_shell_v1.c
-@@ -307,26 +307,6 @@ static void layer_surface_role_commit(struct wlr_surface *wlr_surface) {
- 		return;
- 	}
- 
--	const uint32_t horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
--		ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
--	if (surface->client_pending.desired_width == 0 &&
--		(surface->client_pending.anchor & horiz) != horiz) {
--		wl_resource_post_error(surface->resource,
--			ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_SIZE,
--			"width 0 requested without setting left and right anchors");
--		return;
--	}
--
--	const uint32_t vert = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
--		ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
--	if (surface->client_pending.desired_height == 0 &&
--		(surface->client_pending.anchor & vert) != vert) {
--		wl_resource_post_error(surface->resource,
--			ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_SIZE,
--			"height 0 requested without setting top and bottom anchors");
--		return;
--	}
--
- 	if (surface->closed) {
- 		// Ignore commits after the compositor has closed it
- 		return;

x11-wm/phoc/files/xcursor-fix-false-positive-stringop-truncation.diff

@@ -1,21 +0,0 @@
-Description: xcursor: strncpy truncation warning with GCC 10 on s390x
- Fix false positive stringop-truncation warning/error with GCC 10 on s390x
- .
-Author: Lukas Märdian <slyon@ubuntu.com>
-Bug: https://github.com/swaywm/wlroots/issues/2018
-Last-Update: 2021-03-03
----
---- wlroots-0.12.0.orig/xcursor/xcursor.c
-+++ wlroots-0.12.0/xcursor/xcursor.c
-@@ -655,8 +655,11 @@ _XcursorAddPathElt (char *path, const ch
- 	elt++;
- 	len--;
-     }
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wstringop-truncation"
-     strncpy (path + pathlen, elt, len);
-     path[pathlen + len] = '\0';
-+#pragma GCC diagnostic pop
- }
- 
- static char *

x11-wm/phoc/phoc-0.8.0-r1.ebuild

@@ -1,92 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vala meson gnome2-utils git-r3 xdg
-EGIT_REPO_URI="https://source.puri.sm/Librem5/phoc.git"
-
-KEYWORDS="~x86 ~amd64 ~arm ~arm64"
-if [[ ${PV} != 9999 ]]; then
-    #EGIT_COMMIT="tags/v${PV}"
-	EGIT_COMMIT="527689df1300277af2cdfc872474c8322e38f690"
-else
-    KEYWORDS=""
-fi
-
-WLROOT=0.12.0
-
-SRC_URI="https://github.com/swaywm/wlroots/archive/${WLROOT}.tar.gz -> wlroot-${WLROOT}.tar.gz"
-
-
-PATCHES=(
-	"${FILESDIR}/0001-seat-Don-t-notify-on-key-release.patch"
-	"${FILESDIR}/0002-seat-inhibit-touch-events-when-in-power-save-mode-or.patch"
-	#"${FILESDIR}/xcursor-fix-false-positive-stringop-truncation.diff"
-	#"${FILESDIR}/Revert-layer-shell-error-on-0-dimension-without-anchors.diff"
-)
-
-DESCRIPTION="Wlroots based Phone compositor"
-HOMEPAGE="https://source.puri.sm/Librem5/phoc"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+introspection"
-
-	#<=gui-libs/wlroots-0.11.0:0/11
-DEPEND="
-	dev-libs/glib
-	dev-libs/gobject-introspection
-	dev-libs/libinput
-	gnome-base/gnome-desktop
-	!gui-libs/wlroots
-	x11-libs/xcb-util
-	x11-libs/xcb-util-wm
-	x11-wm/mutter
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-		dev-util/ctags
-		x11-base/xorg-server
-		dev-util/meson
-		virtual/pkgconfig
-"
-
-src_unpack() {
-	default
-	git-r3_fetch
-	git-r3_checkout
-	rm -rf ${S}/subprojects/wlroots
-	mv ${WORKDIR}/wlroots-${WLROOT} ${S}/subprojects/wlroots
-}
-
-src_prepare() {
-	default
-	eapply_user
-	cd subprojects/wlroots
-	eapply ${FILESDIR}/xcursor-fix-false-positive-stringop-truncation.diff
-	eapply ${FILESDIR}/Revert-layer-shell-error-on-0-dimension-without-anchors.diff
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddefault_library=shared
-		-Dtests=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	dobin ${S}/helpers/scale-to-fit
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}