x11-wm/phoc: update to 0.8.0

Changes:	https://source.puri.sm/Librem5/phoc/-/releases/v0.8.0
Reported by:	Repology

3 files changed, 39 insertions, 11 deletions

diff --git a/x11-wm/phoc/Makefile b/x11-wm/phoc/Makefile
index 436d9c8275a5..466a73f740c9 100644
--- a/x11-wm/phoc/Makefile
+++ b/x11-wm/phoc/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	phoc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.7.1
-PORTREVISION=	2
+DISTVERSION=	0.8.0
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
@@ -9,7 +8,6 @@ PATCHFILES+=	4912c5a9454b.patch:-p1 # https://source.puri.sm/Librem5/phoc/-/merg
 PATCHFILES+=	00e5da6dd7a2.patch:-p1 # https://source.puri.sm/Librem5/phoc/-/merge_requests/241
 PATCHFILES+=	b278fd6b4f57.patch:-p1 # https://source.puri.sm/Librem5/phoc/-/merge_requests/241
 PATCHFILES+=	3f418c11d813.patch:-p1 # https://source.puri.sm/Librem5/phoc/-/merge_requests/241
-PATCHFILES+=	39da5a00f3b3.patch:-p1 # https://source.puri.sm/Librem5/phoc/-/merge_requests/241
 PATCHFILES+=	4a688ffec053.patch:-p1 # https://source.puri.sm/Librem5/phoc/-/merge_requests/241
 PATCHFILES+=	8010e3d9ca00.patch:-p1 # https://source.puri.sm/Librem5/phoc/-/merge_requests/241
 PATCHFILES+=	8ec2886673d3.patch:-p1 # https://source.puri.sm/Librem5/phoc/-/merge_requests/241
@@ -35,7 +33,7 @@ USE_GNOME=	gnomedesktop3
 USE_XORG=	pixman xcb
 GL_SITE=	https://source.puri.sm
 GL_ACCOUNT=	Librem5
-GL_COMMIT=	8e51b02c7fb9b103d8e80fb77145dddfb4b5b3a2
+GL_COMMIT=	527689df1300277af2cdfc872474c8322e38f690
 SHEBANG_FILES=	build-aux/post_install.py
 CFLAGS+=	-Wno-error=format-nonliteral # clang
 PLIST_FILES=	bin/${PORTNAME}
diff --git a/x11-wm/phoc/distinfo b/x11-wm/phoc/distinfo
index 6429e891d338..236cccf7487a 100644
--- a/x11-wm/phoc/distinfo
+++ b/x11-wm/phoc/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1623582410
-SHA256 (Librem5-phoc-8e51b02c7fb9b103d8e80fb77145dddfb4b5b3a2_GL0.tar.gz) = ac8b4723bde47f9b00f2ec73b0ae448c51670ba2294079cc93e41fab3764d24b
-SIZE (Librem5-phoc-8e51b02c7fb9b103d8e80fb77145dddfb4b5b3a2_GL0.tar.gz) = 143914
+TIMESTAMP = 1625875601
+SHA256 (Librem5-phoc-527689df1300277af2cdfc872474c8322e38f690_GL0.tar.gz) = 3403ef0eb064013ec5e2b6df966bf461649d16aab2f8d8df8c632cec81dffb53
+SIZE (Librem5-phoc-527689df1300277af2cdfc872474c8322e38f690_GL0.tar.gz) = 144698
 SHA256 (4912c5a9454b.patch) = dc833187095b92132df7cdef804e3aa5521cad360b43fc4370bd6b72e708c84f
 SIZE (4912c5a9454b.patch) = 23928
 SHA256 (00e5da6dd7a2.patch) = 123d7e9d13c178ef98fbeea55fedd1204061185fe3ea740333dc51ba6439fdbb
@@ -9,8 +9,6 @@ SHA256 (b278fd6b4f57.patch) = 851dcb0fa5a9cc537bdb71dc6ca30e19228580094ebbaf88c7
 SIZE (b278fd6b4f57.patch) = 4110
 SHA256 (3f418c11d813.patch) = 45ca59ff8bcc4316286c814b6264d202866b561bbc431514537d9d86b51396de
 SIZE (3f418c11d813.patch) = 3930
-SHA256 (39da5a00f3b3.patch) = a479b5a3beb9e0d6a7ada708daeea93c6bddad28b98de2e490c3110d45426ca7
-SIZE (39da5a00f3b3.patch) = 2066
 SHA256 (4a688ffec053.patch) = 5c1ba160d978e2b2a6543db22b83ae9f54308684ed2475afaa1d01e2442cff32
 SIZE (4a688ffec053.patch) = 3583
 SHA256 (8010e3d9ca00.patch) = f485ed1d76c932d262752fd9d1b6bc242fa03c39b312b72cddfb8b8ef84d4ed2
diff --git a/x11-wm/phoc/files/patch-wlroots-0.14 b/x11-wm/phoc/files/patch-wlroots-0.14
index 28b292e868cd..48871450bc20 100644
--- a/x11-wm/phoc/files/patch-wlroots-0.14
+++ b/x11-wm/phoc/files/patch-wlroots-0.14
@@ -1,3 +1,6 @@
+../src/desktop.c:17:10: fatal error: 'wlr/types/wlr_gtk_primary_selection.h' file not found
+#include <wlr/types/wlr_gtk_primary_selection.h>
+         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 In file included from ../tests/test-xdg-shell.c:7:
 In file included from ../tests/testlib.h:6:
 In file included from ../src/server.h:14:
@@ -5,7 +8,27 @@ In file included from ../src/server.h:14:
 #include <wlr/types/wlr_gtk_primary_selection.h>
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
---- src/desktop.h.orig	2021-06-13 11:06:50 UTC
+--- src/desktop.c.orig	2021-07-10 00:06:41 UTC
++++ src/desktop.c
+@@ -14,7 +14,7 @@
+ #include <wlr/types/wlr_data_control_v1.h>
+ #include <wlr/types/wlr_export_dmabuf_v1.h>
+ #include <wlr/types/wlr_gamma_control_v1.h>
+-#include <wlr/types/wlr_gtk_primary_selection.h>
++#include <wlr/types/wlr_primary_selection_v1.h>
+ #include <wlr/types/wlr_idle.h>
+ #include <wlr/types/wlr_input_inhibitor.h>
+ #include <wlr/types/wlr_layer_shell_v1.h>
+@@ -600,7 +600,7 @@ phoc_desktop_constructed (GObject *object)
+ 						 WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT);
+   self->idle = wlr_idle_create(server->wl_display);
+   self->primary_selection_device_manager =
+-    wlr_gtk_primary_selection_device_manager_create(server->wl_display);
++    wlr_primary_selection_v1_device_manager_create(server->wl_display);
+   self->input_inhibit =
+     wlr_input_inhibit_manager_create(server->wl_display);
+   self->input_inhibit_activate.notify = input_inhibit_activate;
+--- src/desktop.h.orig	2021-07-10 00:06:41 UTC
 +++ src/desktop.h
 @@ -8,7 +8,7 @@
  #include <wlr/types/wlr_compositor.h>
@@ -13,6 +36,15 @@ In file included from ../src/server.h:14:
  #include <wlr/types/wlr_gamma_control_v1.h>
 -#include <wlr/types/wlr_gtk_primary_selection.h>
 +#include <wlr/types/wlr_primary_selection.h>
- #include <wlr/types/wlr_idle_inhibit_v1.h>
  #include <wlr/types/wlr_idle.h>
  #include <wlr/types/wlr_input_inhibitor.h>
+ #include <wlr/types/wlr_input_method_v2.h>
+@@ -68,7 +68,7 @@ struct _PhocDesktop {
+ 	struct wlr_export_dmabuf_manager_v1 *export_dmabuf_manager_v1;
+ 	struct wlr_server_decoration_manager *server_decoration_manager;
+ 	struct wlr_xdg_decoration_manager_v1 *xdg_decoration_manager;
+-	struct wlr_gtk_primary_selection_device_manager *primary_selection_device_manager;
++	struct wlr_primary_selection_v1_device_manager *primary_selection_device_manager;
+ 	struct wlr_idle *idle;
+ 	struct wlr_input_inhibit_manager *input_inhibit;
+ 	struct wlr_layer_shell_v1 *layer_shell;