[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/files/, x11-wm/phoc/
commit: 26608cffa55a61f2adbe6dbfafa8468211bf9545
Author: Gerben Jan Dijkman gjdwebserver nl>
AuthorDate: Thu Nov 11 11:17:35 2021 +
Commit: Gerben Jan Dijkman gjdwebserver nl>
CommitDate: Thu Nov 11 11:17:35 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=26608cff
x11-wm/phoc: Fixed wlroots and dep
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Gerben Jan Dijkman gjdwebserver.nl>
x11-wm/phoc/Manifest | 2 +-
.../files/0001-seat-Don-t-notify-on-key-release.patch | 19 ++-
x11-wm/phoc/metadata.xml | 3 +++
x11-wm/phoc/phoc-0.9.0.ebuild | 12 ++--
4 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/x11-wm/phoc/Manifest b/x11-wm/phoc/Manifest
index 72e811c18..5c4d37dd2 100644
--- a/x11-wm/phoc/Manifest
+++ b/x11-wm/phoc/Manifest
@@ -1,2 +1,2 @@
DIST phoc-v0.9.0.tar.gz 154836 BLAKE2B
c701b1f9384d86d381719320303f9baaa0cabaed6d81d359a2f72f0c067da965ba57659c63b65aee32604b2bec65a4e6c8a59c3bbd8433ef3231a139bf3c
SHA512
1146bd689a1a2fac60f2b4ea5893bd49c6cb4628cc4a6422a053e3210fed238ab572c28144f262ed5cc2992ebd3870e587a051e2b62f39e2fc146218387a5d89
-DIST wlroots-0.12.0.tar.gz 476936 BLAKE2B
4129c87a148085f95f4cee6973308d79ab3f8b024247287a68dadd6729da8a5f8cc1e4ada63c15477a2c8e8258032440afe4a21a26f947143d17c87b0ca8a1a4
SHA512
560eae30932b777c1f07fb44592d5601c5d10ef74b31b6b9e4166a14caadab2bfa88d39282f159785d4c7f22f78d204f9bb7fab65d58afaf14b72a8486f9b415
+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
index a2928002b..2a896de49 100644
--- 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
@@ -11,15 +11,16 @@ diff --git a/src/seat.c b/src/seat.c
index b04fed1..679a3f5 100644
--- a/src/seat.c
+++ b/src/seat.c
-@@ -30,8 +30,9 @@ static void handle_keyboard_key(struct wl_listener
*listener, void *data) {
- PhocKeyboard *keyboard =
- 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);
+@@ -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);
}
--
diff --git a/x11-wm/phoc/metadata.xml b/x11-wm/phoc/metadata.xml
index 52a95ab63..d495e34d9 100644
--- a/x11-wm/phoc/metadata.xml
+++ b/x11-wm/phoc/metadata.xml
@@ -5,6 +5,9 @@
gjdijk...@gjdwebserver.nl
Gerben Jan Dijkman
+
+ Wayland compositor for mobile phones like the Librem 5.
+
https://source.puri.sm/Librem5/phoc
https://source.puri.sm/Librem5/phoc/-/issues
diff --git a/x11-wm/phoc/phoc-0.9.0.ebuild b/x11-wm/phoc/phoc-0.9.0.ebuild
index a60acea7a..a5de2747b 100644
--- a/x11-wm/phoc/phoc-0.9.0.ebuild
+++ b/x11-wm/phoc/phoc-0.9.0.ebuild
@@ -7,9 +7,9 @@ inherit meson vala xdg gnome2-utils
MY_PV="v${PV}"
MY_P="${PN}-${MY_PV}"
-# 0.13.0 does not work atm
-WL_PV="0.12.0"
-WL_P="wlroots-${WL_PV}"
+
+WL_COMMIT="5413b1ec61c6e3390929db595c0ec92f92ea2594"
+WL_P="wlroots-${WL_COMMIT}"
DESCRIPTION="Wlroots based Phone compositor"
HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phoc;
@@ -18,7 +18,7 @@ HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phoc;
# 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://github.com/swaywm/wlroots/releases/download/${WL_PV}/${WL_P}.tar.gz
+
https://source.puri.sm/Librem5/wlroots/-/archive/${WL_COMMIT}/${WL_P}.tar.gz
"
LICENSE="GPL-3"
@@ -44,6 +44,7 @@ RDEPEND="
x11-libs/xcb-util-wm
x11-wm/mutter
sys-auth/seatd
+ !gui-libs/wlroots
"
BDEPEND="
@@ -52,9 +53,9 @@ BDEPEND="
virtual/pkgconfig
x11-base/xorg-server
"
[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/files/, x11-wm/phoc/
commit: 0e2df95027a2ed8c11d42b06dd4972de5e563f6a
Author: Gerben Jan Dijkman gjdwebserver nl>
AuthorDate: Sun Aug 22 17:21:19 2021 +
Commit: Gerben Jan Dijkman gjdwebserver nl>
CommitDate: Sun Aug 22 17:21:25 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0e2df950
x11-wm/phoc: Fixed package
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Gerben jan Dijkman gjdwebserver.nl>
...shell-error-on-0-dimension-without-anchors.diff | 42 ++
...sor-fix-false-positive-stringop-truncation.diff | 21 +++
x11-wm/phoc/metadata.xml | 14 ++--
x11-wm/phoc/phoc-0.8.0.ebuild | 15
4 files changed, 84 insertions(+), 8 deletions(-)
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
new file mode 100644
index 0..be1eeb571
--- /dev/null
+++
b/x11-wm/phoc/files/Revert-layer-shell-error-on-0-dimension-without-anchors.diff
@@ -0,0 +1,42 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?=
+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
new file mode 100644
index 0..d08b859a3
--- /dev/null
+++ b/x11-wm/phoc/files/xcursor-fix-false-positive-stringop-truncation.diff
@@ -0,0 +1,21 @@
+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
+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 b372191c7..d495e34d9 100644
--- a/x11-wm/phoc/metadata.xml
+++ b/x11-wm/phoc/metadata.xml
@@ -1,5 +1,15 @@
-
+
http://www.gentoo.org/dtd/metadata.dtd;>
-
+
+ gjdijk...@gjdwebserver.nl
+ Gerben Jan Dijkman
+
+
+ Wayland compositor for mobile phones like the Librem 5.
+
+
+ https://source.puri.sm/Librem5/phoc
+ https://source.puri.sm/Librem5/phoc/-/issues
+
diff --git a/x11-wm/phoc/phoc-0.8.0.ebuild b/x11-wm/phoc/phoc-0.8.0.ebuild
index cda542c9d..0b27e0c08 100644
--- a/x11-wm/phoc/phoc-0.8.0.ebuild
+++ b/x11-wm/phoc/phoc-0.8.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit meson vala xdg
+inherit meson vala xdg gnome2-utils
MY_PV="v${PV}"
MY_P="${PN}-${MY_PV}"
@@ -12,7 +12,7 @@ WL_PV="0.12.0"
WL_P="wlroots-${WL_PV}"
DESCRIPTION="Wlroots based Phone compositor"
-HOMEPAGE="https://source.puri.sm/Librem5/phoc;
+HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phoc;
# we don't use the version on gentoo because it breaks
# the phoc
[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/files/, x11-wm/phoc/
commit: e86753a92486328a9684288ff2f15bc9e6f1703e
Author: Marco Scardovi scardovi com>
AuthorDate: Tue Jun 22 13:16:31 2021 +
Commit: Marco Scardovi scardovi com>
CommitDate: Tue Jun 22 13:16:58 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e86753a9
x11-wm/phoc: new package
phoc is a windows manager used for mobile devices like
librem 5 and pinephone. It can be used on tablet too like
pinetab. I will slowly add all the needed packages for phosh
too (phosh is the interface).
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Marco Scardovi scardovi.com>
x11-wm/phoc/Manifest | 2 +
.../0001-seat-Don-t-notify-on-key-release.patch| 27 +
...t-touch-events-when-in-power-save-mode-or.patch | 112 +
x11-wm/phoc/metadata.xml | 8 ++
x11-wm/phoc/phoc-0.7.1.ebuild | 84
5 files changed, 233 insertions(+)
diff --git a/x11-wm/phoc/Manifest b/x11-wm/phoc/Manifest
new file mode 100644
index 0..6019f26ab
--- /dev/null
+++ b/x11-wm/phoc/Manifest
@@ -0,0 +1,2 @@
+DIST phoc-v0.7.1.tar.gz 143801 BLAKE2B
4db2fb40d2b85ee27d53a71b0dc158b3b37b47f9517bf5133958bc2328892aa8a54c679b5293efc4b3d84ccee04866471c729c4d77d9e903136bed3fe9e35030
SHA512
80869036c36837c2e260a8662aee975f86797c0a68a0a513d2d52b904d1ca44bcd93e8bee850c08a9b3b3395727e4e28085860750acd1b092349c7da6410c820
+DIST wlroots-0.12.0.tar.gz 476936 BLAKE2B
4129c87a148085f95f4cee6973308d79ab3f8b024247287a68dadd6729da8a5f8cc1e4ada63c15477a2c8e8258032440afe4a21a26f947143d17c87b0ca8a1a4
SHA512
560eae30932b777c1f07fb44592d5601c5d10ef74b31b6b9e4166a14caadab2bfa88d39282f159785d4c7f22f78d204f9bb7fab65d58afaf14b72a8486f9b415
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
new file mode 100644
index 0..a2928002b
--- /dev/null
+++ b/x11-wm/phoc/files/0001-seat-Don-t-notify-on-key-release.patch
@@ -0,0 +1,27 @@
+From 63d8f9ceb0d2336db4276e717aabe427153b76bb Mon Sep 17 00:00:00 2001
+From: Arnaud Ferraris
+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
+@@ -30,8 +30,9 @@ static void handle_keyboard_key(struct wl_listener
*listener, void *data) {
+ PhocKeyboard *keyboard =
+ 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
new file mode 100644
index 0..5f02f4aed
--- /dev/null
+++
b/x11-wm/phoc/files/0002-seat-inhibit-touch-events-when-in-power-save-mode-or.patch
@@ -0,0 +1,112 @@
+From c6aeee2009a2ee4647fd74da0fc3bd87f61a70fd Mon Sep 17 00:00:00 2001
+From: Arnaud Ferraris
+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, >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;
++
+
