x11-wm/phoc: Version Bump to 0.12.0

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Gerben Jan Dijkman <gjdijkman@gjdwebserver.nl>

7 files changed, 2 insertions, 217 deletions

diff --git a/x11-wm/phoc/Manifest b/x11-wm/phoc/Manifest
index a8df586db..fb3617b8c 100644
--- a/x11-wm/phoc/Manifest
+++ b/x11-wm/phoc/Manifest
@@ -1,4 +1,3 @@
 DIST phoc-v0.11.0.tar.gz 161198 BLAKE2B 1121dead62dc1088043843e3816d11b9ee0231566eccd78add1ed6e75a2d158e8bc844dd4831a05b0a3ff1c5a3d8181c46c3163ba105285a0833b246e50dc386 SHA512 0ed455a9216ec1fb8100cf8422d771c56e37067f8c1a809b1cde0e424d48622780fd0ffd6b164e1217218c56a016e448a23d7acb03559c5b7058d6b359e56e14
-DIST phoc-v0.9.0.tar.gz 154836 BLAKE2B c701b1f9384d86d381719320303f9baa0000a0cabaed6d81d359a2f72f0c067da965ba57659c63b65aee32604b2bec65a4e6c8a59c3bbd8433ef3231a139bf3c SHA512 1146bd689a1a2fac60f2b4ea5893bd49c6cb4628cc4a6422a053e3210fed238ab572c28144f262ed5cc2992ebd3870e587a051e2b62f39e2fc146218387a5d89
+DIST phoc-v0.12.0.tar.gz 164086 BLAKE2B 64db3b0ee6994e53e0270cd721fc89452f85c7852e92e97e087dd584dd9c1bb8b6449b14c2cb738e5cfb1917829d2b823a4e3568b5ecd8d1fd0e46c64e2e017e SHA512 4eea728f576da1b4e70ac4b697a685077b8053045f5bb5dced0a327ee59dfca7df9c94f68f1a2dd4de852e9787a64a045e04edd814293820a623c910a75ed630
 DIST wlroots-2fce64d30d378d7009a5770b2472231a0e535ada.tar.gz 506577 BLAKE2B 4ea1bfa90e6b6e00c68ab29c04519876c5fefc229d3affde035cfb4b7355f7119cf2bca3d5337aca297741e4795a22739b3a8d627ffe5fbc37bcf24fa91bc3d2 SHA512 cecf7427bdcb231516d665e47cd2508fabda0ba03b2e0f8f3279197c0403c9d8f07f7a00906179e80e53fe9e0a1a226bda99f94d398ba278803b98b76574a2b4
-DIST wlroots-5413b1ec61c6e3390929db595c0ec92f92ea2594.tar.gz 477754 BLAKE2B 6424b3ec038b3cb658ffeeb6302c210f5632fc524017c6de2f33794650b44dcd79d6079bd2799df5e5440f4710c7155fd81e1beedb7694f6b953ec62572dcbd2 SHA512 353532240840ccd11192a807d8d2c3d13ca42cbdaf7366e6a4908a4698d0305910ff152b12fe6839dde72f63b4ea279f47d4268196d34d2ee02f69c9ae9e4e9d
diff --git a/x11-wm/phoc/files/0001-seat-Don-t-notify-on-key-release.patch b/x11-wm/phoc/files/0001-seat-Don-t-notify-on-key-release.patch
deleted file mode 100644
index 2a896de49..000000000
--- a/x11-wm/phoc/files/0001-seat-Don-t-notify-on-key-release.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 63d8f9ceb0d2336db4276e717aabe427153b76bb Mon Sep 17 00:00:00 2001
-From: Arnaud Ferraris <arnaud.ferraris@gmail.com>
-Date: Sat, 6 Jun 2020 02:24:37 +0200
-Subject: [PATCH 1/2] seat: Don't notify on key release
-
----
- src/seat.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/seat.c b/src/seat.c
-index b04fed1..679a3f5 100644
---- a/src/seat.c
-+++ b/src/seat.c
-@@ -42,9 +42,9 @@ handle_keyboard_key (struct wl_listener
-     wl_container_of (listener, keyboard, keyboard_key);
-   PhocDesktop *desktop = server->desktop;
- 
--  wlr_idle_notify_activity (desktop->idle, keyboard->seat->seat);
-   struct wlr_event_keyboard_key *event = data;
--
-+  if (event->state == WLR_KEY_PRESSED)
-+      wlr_idle_notify_activity(desktop->idle, keyboard->seat->seat);
-   phoc_keyboard_handle_key (keyboard, event);
- }
- 
--- 
-2.26.2
-
diff --git a/x11-wm/phoc/files/0002-seat-inhibit-touch-events-when-in-power-save-mode-or.patch b/x11-wm/phoc/files/0002-seat-inhibit-touch-events-when-in-power-save-mode-or.patch
deleted file mode 100644
index 5f02f4aed..000000000
--- a/x11-wm/phoc/files/0002-seat-inhibit-touch-events-when-in-power-save-mode-or.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From c6aeee2009a2ee4647fd74da0fc3bd87f61a70fd Mon Sep 17 00:00:00 2001
-From: Arnaud Ferraris <arnaud.ferraris@gmail.com>
-Date: Sat, 6 Jun 2020 02:52:10 +0200
-Subject: [PATCH 2/2] seat: inhibit touch events when in power save mode or
- blank display
-
----
- src/desktop.c | 2 ++
- src/output.c  | 3 +++
- src/seat.c    | 6 ++++++
- src/server.c  | 1 +
- src/server.h  | 1 +
- 5 files changed, 13 insertions(+)
-
-diff --git a/src/desktop.c b/src/desktop.c
-index 8fbb98e..40b2492 100644
---- a/src/desktop.c
-+++ b/src/desktop.c
-@@ -703,6 +703,7 @@ phoc_desktop_new (struct roots_config *c
- void
- phoc_desktop_toggle_output_blank (PhocDesktop *self)
- {
-+  PhocServer *server = phoc_server_get_default ();
-   PhocOutput *output;
- 
-   wl_list_for_each(output, &self->outputs, link) {
-@@ -710,6 +711,7 @@ phoc_desktop_toggle_output_blank (PhocDe
- 
-     wlr_output_enable (output->wlr_output, enable);
-     wlr_output_commit (output->wlr_output);
-+    server->active = enable;
-     if (enable)
-       phoc_output_damage_whole(output);
-   }
-diff --git a/src/output.c b/src/output.c
-index c03889f..045cbc0 100644
---- a/src/output.c
-+++ b/src/output.c
-@@ -928,6 +928,7 @@ handle_output_manager_test (struct wl_li
- void
- phoc_output_handle_output_power_manager_set_mode (struct wl_listener *listener, void *data)
- {
-+  PhocServer *server = phoc_server_get_default ();
-   struct wlr_output_power_v1_set_mode_event *event = data;
-   PhocOutput *self;
-   bool enable = true;
-@@ -951,6 +952,8 @@ phoc_output_handle_output_power_manager_
-   if (enable == self->wlr_output->enabled)
-     return;
- 
-+  server->active = enable;
-+
-   wlr_output_enable (self->wlr_output, enable);
-   if (!wlr_output_commit (self->wlr_output)) {
-     g_warning ("Failed to commit power mode change to %d for %p", enable, self);
-diff --git a/src/seat.c b/src/seat.c
-index 679a3f5..2a4c007 100644
---- a/src/seat.c
-+++ b/src/seat.c
-@@ -178,6 +178,8 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
- 	struct roots_cursor *cursor =
- 		wl_container_of(listener, cursor, touch_down);
- 	PhocDesktop *desktop = server->desktop;
-+	if (!server->active)
-+		return;
- 	wlr_idle_notify_activity(desktop->idle, cursor->seat->seat);
- 	struct wlr_event_touch_down *event = data;
- 	roots_cursor_handle_touch_down(cursor, event);
-@@ -188,6 +190,8 @@ static void handle_touch_up(struct wl_listener *listener, void *data) {
- 	struct roots_cursor *cursor =
- 		wl_container_of(listener, cursor, touch_up);
- 	PhocDesktop *desktop = server->desktop;
-+	if (!server->active)
-+		return;
- 	wlr_idle_notify_activity(desktop->idle, cursor->seat->seat);
- 	struct wlr_event_touch_up *event = data;
- 	roots_cursor_handle_touch_up(cursor, event);
-@@ -198,6 +202,8 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) {
- 	struct roots_cursor *cursor =
- 		wl_container_of(listener, cursor, touch_motion);
- 	PhocDesktop *desktop = server->desktop;
-+	if (!server->active)
-+		return;
- 	wlr_idle_notify_activity(desktop->idle, cursor->seat->seat);
- 	struct wlr_event_touch_motion *event = data;
- 	roots_cursor_handle_touch_motion(cursor, event);
-diff --git a/src/server.c b/src/server.c
-index 838841b..41452cf 100644
---- a/src/server.c
-+++ b/src/server.c
-@@ -276,6 +276,7 @@ phoc_server_setup (PhocServer *self, const char *config_path,
-     phoc_startup_session (self);
- 
-   self->inited = TRUE;
-+  self->active = TRUE;
-   return TRUE;
- }
- 
-diff --git a/src/server.h b/src/server.h
-index 9501432..532b064 100644
---- a/src/server.h
-+++ b/src/server.h
-@@ -37,6 +37,7 @@ struct _PhocServer {
-   PhocInput *input;
-   PhocServerDebugFlags debug_flags;
-   gboolean inited;
-+  gboolean active;
- 
-   /* The session */
-   gchar *session;
--- 
-2.26.2
diff --git a/x11-wm/phoc/files/Revert-layer-shell-error-on-0-dimension-without-anchors.diff b/x11-wm/phoc/files/Revert-layer-shell-error-on-0-dimension-without-anchors.diff
deleted file mode 100644
index be1eeb571..000000000
--- a/x11-wm/phoc/files/Revert-layer-shell-error-on-0-dimension-without-anchors.diff
+++ /dev/null
@@ -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;
diff --git a/x11-wm/phoc/files/xcursor-fix-false-positive-stringop-truncation.diff b/x11-wm/phoc/files/xcursor-fix-false-positive-stringop-truncation.diff
deleted file mode 100644
index d08b859a3..000000000
--- a/x11-wm/phoc/files/xcursor-fix-false-positive-stringop-truncation.diff
+++ /dev/null
@@ -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 *
diff --git a/x11-wm/phoc/metadata.xml b/x11-wm/phoc/metadata.xml
index 52a95ab63..1d46517a0 100644
--- a/x11-wm/phoc/metadata.xml
+++ b/x11-wm/phoc/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gerben Jan Dijkman</name>
 	</maintainer>
 	<upstream>
-		<doc>https://source.puri.sm/Librem5/phoc</doc>
 		<bugs-to>https://source.puri.sm/Librem5/phoc/-/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-wm/phoc/phoc-0.9.0.ebuild b/x11-wm/phoc/phoc-0.12.0.ebuild
index 853cddc45..1b8747b84 100644
--- a/x11-wm/phoc/phoc-0.9.0.ebuild
+++ b/x11-wm/phoc/phoc-0.12.0.ebuild
@@ -8,14 +8,12 @@ inherit meson vala xdg gnome2-utils
 MY_PV="v${PV}"
 MY_P="${PN}-${MY_PV}"
 
-WL_COMMIT="5413b1ec61c6e3390929db595c0ec92f92ea2594"
+WL_COMMIT="2fce64d30d378d7009a5770b2472231a0e535ada"
 WL_P="wlroots-${WL_COMMIT}"
 
 DESCRIPTION="Wlroots based Phone compositor"
 HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phoc"
 
-# we don't use the version on gentoo because it breaks
-# the phoc installation. we follow method used in archlinuxarm
 SRC_URI="
 	https://gitlab.gnome.org/World/Phosh/phoc/-/archive/${MY_PV}/${MY_P}.tar.gz
 	https://source.puri.sm/Librem5/wlroots/-/archive/${WL_COMMIT}/${WL_P}.tar.gz
@@ -54,20 +52,12 @@ BDEPEND="
 	x11-base/xorg-server
 "
 
-PATCHES=(
-	"${FILESDIR}/0001-seat-Don-t-notify-on-key-release.patch"
-)
-
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	default
 	rm -r "${S}"/subprojects/wlroots || die "Failed to remove bundled wlroots"
 	cp -r "${WORKDIR}/${WL_P}" "${S}"/subprojects/wlroots || die "Failed to copy right version of wlroots"
-
-	cd "${S}"/subprojects/wlroots
-	eapply "${FILESDIR}"/xcursor-fix-false-positive-stringop-truncation.diff
-
 }
 
 src_configure() {