[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/
commit: 1fe2422a68d8e0f22fa997181e1de92039339d8c Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Sun Feb 4 07:01:55 2024 + Commit: Anna Vyalkova sysrq in> CommitDate: Sun Feb 4 19:11:00 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1fe2422a x11-wm/phoc: add 0.36.0, drop 0.33.0 Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> x11-wm/phoc/Manifest | 2 +- x11-wm/phoc/{phoc-0.33.0.ebuild => phoc-0.36.0.ebuild} | 17 + 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/x11-wm/phoc/Manifest b/x11-wm/phoc/Manifest index fd75171bab..7d1927efb3 100644 --- a/x11-wm/phoc/Manifest +++ b/x11-wm/phoc/Manifest @@ -1,2 +1,2 @@ -DIST phoc-0.33.0.tar.xz 646148 BLAKE2B 74e6ac8eec5a37a9dd255d48b1bca65f992399eeb9dc19b22bb84e746f7cae95306c0a487aae828d939be2a0736408476aba6b947c1f44d825340bfcb1873d49 SHA512 7907c116b426383843b6782bafe5f416e7cb8b4039c9ee81ace35476df3b4d0ef92a968f57edef91094cd28387ceff03f1cdd802de65e0e9e3840eab03a78ac9 DIST phoc-0.35.0.tar.xz 677432 BLAKE2B 722a3669b1d76015612b5f4020d0e21c47faa8f6fb19887b2b79d4f6b79e30f45e0332ae2e2771fb9169214002508bdcff61ee0e7f874930e03a7cf952c44e7c SHA512 ec4b382ef11b257afe3b13ebf1e588353c785279afde4b1a8ee80790cb6a299fd94098a5170b30a2114061d86bdf388bb1c99f8ce1bd5173deb886d11015681e +DIST phoc-0.36.0.tar.xz 681384 BLAKE2B 6c27c785dd01f9e44cb0940c5a4f73d5ce75cad85808d0b6c801360401ff001cca839abd27bc8442702c5241bac043c6d7015e6f1c5a5ec30cfcb6779adf973b SHA512 a47851a3e222958ad55c05ed86a068b30f6e00ed5d7e957aab99e7f4103b95fee4db6b177f2de8d0c9ce11306c68ef74d78e38ea0bdb6c47e66f9ef9bf0e9f66 diff --git a/x11-wm/phoc/phoc-0.33.0.ebuild b/x11-wm/phoc/phoc-0.36.0.ebuild similarity index 81% rename from x11-wm/phoc/phoc-0.33.0.ebuild rename to x11-wm/phoc/phoc-0.36.0.ebuild index 24ca3424d6..6b3b29f93f 100644 --- a/x11-wm/phoc/phoc-0.33.0.ebuild +++ b/x11-wm/phoc/phoc-0.36.0.ebuild @@ -13,21 +13,26 @@ LICENSE="|| ( GPL-3+ MIT ) GPL-3+ LGPL-2.1+ MIT" SLOT="0" KEYWORDS="~amd64 ~arm64" IUSE="+X gtk-doc man test" +REQUIRED_USE="test? ( X )" RESTRICT="!test? ( test )" DEPEND=" - >=dev-libs/glib-2.70:2 + >=dev-libs/glib-2.74:2 dev-libs/json-glib dev-libs/libinput:= dev-libs/wayland >=gnome-base/gnome-desktop-3.26:3 gnome-base/gsettings-desktop-schemas - >=gui-libs/wlroots-0.16.0:=[X?] - =gui-libs/wlroots-0.17.1:=[X?] +
[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/
commit: 460179c94fb35b36968e02dba9896618ba3768b5 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Wed Jan 10 22:56:17 2024 + Commit: Anna Vyalkova sysrq in> CommitDate: Wed Jan 10 22:56:17 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=460179c9 x11-wm/phoc: require x11 backend for tests Closes: https://bugs.gentoo.org/921666 Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> x11-wm/phoc/phoc-0.35.0.ebuild | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x11-wm/phoc/phoc-0.35.0.ebuild b/x11-wm/phoc/phoc-0.35.0.ebuild index ef278fdd21..6b3b29f93f 100644 --- a/x11-wm/phoc/phoc-0.35.0.ebuild +++ b/x11-wm/phoc/phoc-0.35.0.ebuild @@ -29,6 +29,10 @@ DEPEND=" x11-libs/libdrm x11-libs/pixman x11-libs/libxkbcommon[X?,wayland] + test? ( + gui-libs/wlroots[x11-backend] + x11-wm/mutter + ) " RDEPEND="${DEPEND}" BDEPEND=" @@ -38,7 +42,6 @@ BDEPEND=" sys-devel/gettext gtk-doc? ( dev-util/gi-docgen ) man? ( dev-python/docutils ) - test? ( x11-wm/mutter ) " src_configure() {
[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/
commit: 304cc70b3e17f5adcd0b72b2e2ec684c29aab368 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Tue Jan 9 09:00:27 2024 + Commit: Anna Vyalkova sysrq in> CommitDate: Tue Jan 9 09:06:02 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=304cc70b x11-wm/phoc: require xwayland for tests Closes: https://bugs.gentoo.org/921631 Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> x11-wm/phoc/phoc-0.35.0.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/x11-wm/phoc/phoc-0.35.0.ebuild b/x11-wm/phoc/phoc-0.35.0.ebuild index cad47eda53..ef278fdd21 100644 --- a/x11-wm/phoc/phoc-0.35.0.ebuild +++ b/x11-wm/phoc/phoc-0.35.0.ebuild @@ -13,6 +13,7 @@ LICENSE="|| ( GPL-3+ MIT ) GPL-3+ LGPL-2.1+ MIT" SLOT="0" KEYWORDS="~amd64 ~arm64" IUSE="+X gtk-doc man test" +REQUIRED_USE="test? ( X )" RESTRICT="!test? ( test )" DEPEND="
[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/
commit: 9d4252b052f26e66bb95dc3b53a43c5086e09774 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Tue Jan 9 08:59:39 2024 + Commit: Anna Vyalkova sysrq in> CommitDate: Tue Jan 9 09:06:02 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9d4252b0 x11-wm/phoc: fix gtk-doc install Closes: https://bugs.gentoo.org/921633 Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> x11-wm/phoc/phoc-0.35.0.ebuild | 5 + 1 file changed, 5 insertions(+) diff --git a/x11-wm/phoc/phoc-0.35.0.ebuild b/x11-wm/phoc/phoc-0.35.0.ebuild index ff9004696c..cad47eda53 100644 --- a/x11-wm/phoc/phoc-0.35.0.ebuild +++ b/x11-wm/phoc/phoc-0.35.0.ebuild @@ -61,6 +61,11 @@ src_test() { src_install() { meson_src_install + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die + mv "${ED}"/usr/share/doc/${PN}-${SLOT} "${ED}"/usr/share/gtk-doc/html/ || die + fi + newbin helpers/auto-maximize phoc-auto-maximize newbin helpers/scale-to-fit phoc-scale-to-fit }
[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/
commit: b7c7436cc88a782948bf6ad96b506aaff3c2c462 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Sun Jan 7 20:18:33 2024 + Commit: Anna Vyalkova sysrq in> CommitDate: Sun Jan 7 20:18:33 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b7c7436c x11-wm/phoc: add 0.35.0 Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> x11-wm/phoc/Manifest | 1 + x11-wm/phoc/phoc-0.35.0.ebuild | 76 ++ 2 files changed, 77 insertions(+) diff --git a/x11-wm/phoc/Manifest b/x11-wm/phoc/Manifest index 06e04b7557..fd75171bab 100644 --- a/x11-wm/phoc/Manifest +++ b/x11-wm/phoc/Manifest @@ -1 +1,2 @@ DIST phoc-0.33.0.tar.xz 646148 BLAKE2B 74e6ac8eec5a37a9dd255d48b1bca65f992399eeb9dc19b22bb84e746f7cae95306c0a487aae828d939be2a0736408476aba6b947c1f44d825340bfcb1873d49 SHA512 7907c116b426383843b6782bafe5f416e7cb8b4039c9ee81ace35476df3b4d0ef92a968f57edef91094cd28387ceff03f1cdd802de65e0e9e3840eab03a78ac9 +DIST phoc-0.35.0.tar.xz 677432 BLAKE2B 722a3669b1d76015612b5f4020d0e21c47faa8f6fb19887b2b79d4f6b79e30f45e0332ae2e2771fb9169214002508bdcff61ee0e7f874930e03a7cf952c44e7c SHA512 ec4b382ef11b257afe3b13ebf1e588353c785279afde4b1a8ee80790cb6a299fd94098a5170b30a2114061d86bdf388bb1c99f8ce1bd5173deb886d11015681e diff --git a/x11-wm/phoc/phoc-0.35.0.ebuild b/x11-wm/phoc/phoc-0.35.0.ebuild new file mode 100644 index 00..ff9004696c --- /dev/null +++ b/x11-wm/phoc/phoc-0.35.0.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome2-utils meson virtualx xdg + +DESCRIPTION="Wayland compositor for mobile phones" +HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phoc"; +SRC_URI="https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz"; + +LICENSE="|| ( GPL-3+ MIT ) GPL-3+ LGPL-2.1+ MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="+X gtk-doc man test" +RESTRICT="!test? ( test )" + +DEPEND=" + >=dev-libs/glib-2.74:2 + dev-libs/json-glib + dev-libs/libinput:= + dev-libs/wayland + >=gnome-base/gnome-desktop-3.26:3 + gnome-base/gsettings-desktop-schemas + >=gui-libs/wlroots-0.17.1:=[X?] +
[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/
commit: 9fa8a1d3db50339e3c7a9045235b815c88fde615 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Sun Jan 7 20:09:32 2024 + Commit: Anna Vyalkova sysrq in> CommitDate: Sun Jan 7 20:09:32 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9fa8a1d3 x11-wm/phoc: drop 0.13.1 Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> x11-wm/phoc/Manifest | 2 - x11-wm/phoc/phoc-0.13.1.ebuild | 83 -- 2 files changed, 85 deletions(-) diff --git a/x11-wm/phoc/Manifest b/x11-wm/phoc/Manifest index 04d7dbd67d..06e04b7557 100644 --- a/x11-wm/phoc/Manifest +++ b/x11-wm/phoc/Manifest @@ -1,3 +1 @@ DIST phoc-0.33.0.tar.xz 646148 BLAKE2B 74e6ac8eec5a37a9dd255d48b1bca65f992399eeb9dc19b22bb84e746f7cae95306c0a487aae828d939be2a0736408476aba6b947c1f44d825340bfcb1873d49 SHA512 7907c116b426383843b6782bafe5f416e7cb8b4039c9ee81ace35476df3b4d0ef92a968f57edef91094cd28387ceff03f1cdd802de65e0e9e3840eab03a78ac9 -DIST phoc-v0.13.1.tar.gz 166867 BLAKE2B 6606855efe7099d12c8be3ee16c401bbcc618aaed2f264abe982cc4a49ccbc0e65fac1b7d8da62de4261bdf3a322f4313a15723c7b7cb7a9ce279957dbf89c78 SHA512 0da68ac4d0601e91ed5f59eeb0beea64180b546f58b300631495084d366fe515c26fe9d58d0ca20687032f6824ae98dcc82edd8a6c80caa95178d24d27ee2650 -DIST wlroots-c9cd3502ba6113070020de50e41f0af72e0f5031.tar.gz 506612 BLAKE2B 70589e63cf223aa5b3634e057cc8c9d1f52d0f6c0fd3bbf66739bc1c934036bab0e8fc8337f51b1d4bb0d73c008b16421c354194cf215741e84ad88345465870 SHA512 af610233ec2343a3baefbb30db4b9a3f30dac4f8656293849be603fbcad0cdd65e91d80702c35e4aaf47437e8c301229c4933b7c8b5df3a7128979c94bcfcddc diff --git a/x11-wm/phoc/phoc-0.13.1.ebuild b/x11-wm/phoc/phoc-0.13.1.ebuild deleted file mode 100644 index 5186898e1f..00 --- a/x11-wm/phoc/phoc-0.13.1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson xdg gnome2-utils - -MY_PV="v${PV}" -MY_P="${PN}-${MY_PV}" - -WL_COMMIT="c9cd3502ba6113070020de50e41f0af72e0f5031" -WL_P="wlroots-${WL_COMMIT}" - -DESCRIPTION="Wlroots based Phone compositor" -HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phoc"; - -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 -" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="+introspection +systemd test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/glib - dev-libs/gobject-introspection - dev-libs/libinput - dev-libs/wayland - dev-libs/wayland-protocols - gnome-base/gnome-desktop - systemd? ( - !sys-apps/openrc - sys-apps/systemd - ) - x11-libs/libdrm - x11-libs/pixman - x11-libs/xcb-util - x11-libs/xcb-util-wm - x11-wm/mutter - sys-auth/seatd - !gui-libs/wlroots -" - -BDEPEND=" - dev-util/ctags - dev-util/meson - virtual/pkgconfig - x11-base/xorg-server -" - -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" -} - -src_configure() { - local emesonargs=( - -Ddefault_library=shared - -Dtests=false - ) - meson_src_configure -} - -src_install() { - DESTDIR="${D}" meson_src_install - dobin "${S}"/helpers/scale-to-fit -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm -}
[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/
commit: eb445c15f0d50701420484b3a566c2dd04a086bb Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Mon Jan 1 23:59:28 2024 + Commit: Anna Vyalkova sysrq in> CommitDate: Mon Jan 1 23:59:28 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=eb445c15 x11-wm/phoc: add 0.33.0 Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> x11-wm/phoc/Manifest | 1 + x11-wm/phoc/phoc-0.33.0.ebuild | 76 ++ 2 files changed, 77 insertions(+) diff --git a/x11-wm/phoc/Manifest b/x11-wm/phoc/Manifest index a33a4d1f50..04d7dbd67d 100644 --- a/x11-wm/phoc/Manifest +++ b/x11-wm/phoc/Manifest @@ -1,2 +1,3 @@ +DIST phoc-0.33.0.tar.xz 646148 BLAKE2B 74e6ac8eec5a37a9dd255d48b1bca65f992399eeb9dc19b22bb84e746f7cae95306c0a487aae828d939be2a0736408476aba6b947c1f44d825340bfcb1873d49 SHA512 7907c116b426383843b6782bafe5f416e7cb8b4039c9ee81ace35476df3b4d0ef92a968f57edef91094cd28387ceff03f1cdd802de65e0e9e3840eab03a78ac9 DIST phoc-v0.13.1.tar.gz 166867 BLAKE2B 6606855efe7099d12c8be3ee16c401bbcc618aaed2f264abe982cc4a49ccbc0e65fac1b7d8da62de4261bdf3a322f4313a15723c7b7cb7a9ce279957dbf89c78 SHA512 0da68ac4d0601e91ed5f59eeb0beea64180b546f58b300631495084d366fe515c26fe9d58d0ca20687032f6824ae98dcc82edd8a6c80caa95178d24d27ee2650 DIST wlroots-c9cd3502ba6113070020de50e41f0af72e0f5031.tar.gz 506612 BLAKE2B 70589e63cf223aa5b3634e057cc8c9d1f52d0f6c0fd3bbf66739bc1c934036bab0e8fc8337f51b1d4bb0d73c008b16421c354194cf215741e84ad88345465870 SHA512 af610233ec2343a3baefbb30db4b9a3f30dac4f8656293849be603fbcad0cdd65e91d80702c35e4aaf47437e8c301229c4933b7c8b5df3a7128979c94bcfcddc diff --git a/x11-wm/phoc/phoc-0.33.0.ebuild b/x11-wm/phoc/phoc-0.33.0.ebuild new file mode 100644 index 00..24ca3424d6 --- /dev/null +++ b/x11-wm/phoc/phoc-0.33.0.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome2-utils meson virtualx xdg + +DESCRIPTION="Wayland compositor for mobile phones" +HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phoc"; +SRC_URI="https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz"; + +LICENSE="|| ( GPL-3+ MIT ) GPL-3+ LGPL-2.1+ MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="+X gtk-doc man test" +RESTRICT="!test? ( test )" + +DEPEND=" + >=dev-libs/glib-2.70:2 + dev-libs/json-glib + dev-libs/libinput:= + dev-libs/wayland + >=gnome-base/gnome-desktop-3.26:3 + gnome-base/gsettings-desktop-schemas + >=gui-libs/wlroots-0.16.0:=[X?] +
[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/
commit: 7f95347bd90d97e665d47a949daca6dfe1bf0b34 Author: Gerben Jan Dijkman gjdwebserver nl> AuthorDate: Mon Apr 4 12:34:15 2022 + Commit: Gerben Jan Dijkman gjdwebserver nl> CommitDate: Mon Apr 4 12:34:15 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7f95347b x11-wm/phoc: Version Bump Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Gerben Jan Dijkman gjdwebserver.nl> x11-wm/phoc/Manifest | 5 +- x11-wm/phoc/phoc-0.11.0.ebuild | 85 -- .../{phoc-0.12.0.ebuild => phoc-0.13.1.ebuild} | 4 +- 3 files changed, 4 insertions(+), 90 deletions(-) diff --git a/x11-wm/phoc/Manifest b/x11-wm/phoc/Manifest index fb3617b8c..a33a4d1f5 100644 --- a/x11-wm/phoc/Manifest +++ b/x11-wm/phoc/Manifest @@ -1,3 +1,2 @@ -DIST phoc-v0.11.0.tar.gz 161198 BLAKE2B 1121dead62dc1088043843e3816d11b9ee0231566eccd78add1ed6e75a2d158e8bc844dd4831a05b0a3ff1c5a3d8181c46c3163ba105285a0833b246e50dc386 SHA512 0ed455a9216ec1fb8100cf8422d771c56e37067f8c1a809b1cde0e424d48622780fd0ffd6b164e1217218c56a016e448a23d7acb03559c5b7058d6b359e56e14 -DIST phoc-v0.12.0.tar.gz 164086 BLAKE2B 64db3b0ee6994e53e0270cd721fc89452f85c7852e92e97e087dd584dd9c1bb8b6449b14c2cb738e5cfb1917829d2b823a4e3568b5ecd8d1fd0e46c64e2e017e SHA512 4eea728f576da1b4e70ac4b697a685077b8053045f5bb5dced0a327ee59dfca7df9c94f68f1a2dd4de852e9787a64a045e04edd814293820a623c910a75ed630 -DIST wlroots-2fce64d30d378d7009a5770b2472231a0e535ada.tar.gz 506577 BLAKE2B 4ea1bfa90e6b6e00c68ab29c04519876c5fefc229d3affde035cfb4b7355f7119cf2bca3d5337aca297741e4795a22739b3a8d627ffe5fbc37bcf24fa91bc3d2 SHA512 cecf7427bdcb231516d665e47cd2508fabda0ba03b2e0f8f3279197c0403c9d8f07f7a00906179e80e53fe9e0a1a226bda99f94d398ba278803b98b76574a2b4 +DIST phoc-v0.13.1.tar.gz 166867 BLAKE2B 6606855efe7099d12c8be3ee16c401bbcc618aaed2f264abe982cc4a49ccbc0e65fac1b7d8da62de4261bdf3a322f4313a15723c7b7cb7a9ce279957dbf89c78 SHA512 0da68ac4d0601e91ed5f59eeb0beea64180b546f58b300631495084d366fe515c26fe9d58d0ca20687032f6824ae98dcc82edd8a6c80caa95178d24d27ee2650 +DIST wlroots-c9cd3502ba6113070020de50e41f0af72e0f5031.tar.gz 506612 BLAKE2B 70589e63cf223aa5b3634e057cc8c9d1f52d0f6c0fd3bbf66739bc1c934036bab0e8fc8337f51b1d4bb0d73c008b16421c354194cf215741e84ad88345465870 SHA512 af610233ec2343a3baefbb30db4b9a3f30dac4f8656293849be603fbcad0cdd65e91d80702c35e4aaf47437e8c301229c4933b7c8b5df3a7128979c94bcfcddc diff --git a/x11-wm/phoc/phoc-0.11.0.ebuild b/x11-wm/phoc/phoc-0.11.0.ebuild deleted file mode 100644 index bad337bad..0 --- a/x11-wm/phoc/phoc-0.11.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson vala xdg gnome2-utils - -MY_PV="v${PV}" -MY_P="${PN}-${MY_PV}" - -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 -" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="+introspection +systemd test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/glib - dev-libs/gobject-introspection - dev-libs/libinput - dev-libs/wayland - dev-libs/wayland-protocols - gnome-base/gnome-desktop - systemd? ( - !sys-apps/openrc - sys-apps/systemd - ) - x11-libs/libdrm - x11-libs/pixman - x11-libs/xcb-util - x11-libs/xcb-util-wm - x11-wm/mutter - sys-auth/seatd - !gui-libs/wlroots -" - -BDEPEND=" - dev-util/ctags - dev-util/meson - virtual/pkgconfig - x11-base/xorg-server -" - -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" -} - -src_configure() { - local emesonargs=( - -Ddefault_library=shared - -Dtests=false - ) - meson_src_configure -} - -src_install() { - DESTDIR="${D}" meson_src_install - dobin "${S}"/helpers/scale-to-fit -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/x11-wm/phoc/phoc-0.12.0.ebuild b/x11-wm/phoc/phoc-0.13.1.ebuild similarity index 94% rename from x11-wm/phoc/phoc-0.12.0.ebuild rename to x11-wm/phoc/phoc-0.13.1.ebuild index 1b8747b84..5186898e1 100644 --- a/x11-wm/phoc/phoc-0.12.0.ebuild +++ b/x11-wm/phoc/phoc-0.13.1.ebu
[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/, x11-wm/phoc/files/
commit: d584f029c14ca30307268a3c800301ddd99df03d Author: Gerben Jan Dijkman gjdwebserver nl> AuthorDate: Wed Jan 26 01:43:04 2022 + Commit: Gerben Jan Dijkman gjdwebserver nl> CommitDate: Wed Jan 26 01:43:04 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d584f029 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 gjdwebserver.nl> x11-wm/phoc/Manifest | 3 +- .../0001-seat-Don-t-notify-on-key-release.patch| 28 -- ...t-touch-events-when-in-power-save-mode-or.patch | 112 - ...shell-error-on-0-dimension-without-anchors.diff | 42 ...sor-fix-false-positive-stringop-truncation.diff | 21 x11-wm/phoc/metadata.xml | 1 - .../phoc/{phoc-0.9.0.ebuild => phoc-0.12.0.ebuild} | 12 +-- 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 c701b1f9384d86d381719320303f9baaa0cabaed6d81d359a2f72f0c067da965ba57659c63b65aee32604b2bec65a4e6c8a59c3bbd8433ef3231a139bf3c 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..0 --- 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 -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..0 --- 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 -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) { -@
[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/
commit: ba78e8b912c4e92bdacefe73b69ac2bdecede5f5 Author: Gerben Jan Dijkman gjdwebserver nl> AuthorDate: Tue Jan 4 14:24:59 2022 + Commit: Gerben Jan Dijkman gjdwebserver nl> CommitDate: Tue Jan 4 14:24:59 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ba78e8b9 x11-wm/phoc: Corrected Copyright Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Gerben Jan Dijkman gjdwebserver.nl> x11-wm/phoc/phoc-0.9.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-wm/phoc/phoc-0.9.0.ebuild b/x11-wm/phoc/phoc-0.9.0.ebuild index a5de2747b..853cddc45 100644 --- a/x11-wm/phoc/phoc-0.9.0.ebuild +++ b/x11-wm/phoc/phoc-0.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7
[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/
commit: 2fb9f55fbe4fd4e859b796b84e56f7b933cb6d10 Author: Gerben Jan Dijkman gjdwebserver nl> AuthorDate: Tue Jan 4 14:24:22 2022 + Commit: Gerben Jan Dijkman gjdwebserver nl> CommitDate: Tue Jan 4 14:24:22 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2fb9f55f x11-wm/phoc: Version Bump Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Gerben Jan Dijkman gjdwebserver.nl> x11-wm/phoc/Manifest | 2 + x11-wm/phoc/phoc-0.11.0.ebuild | 85 ++ 2 files changed, 87 insertions(+) diff --git a/x11-wm/phoc/Manifest b/x11-wm/phoc/Manifest index 5c4d37dd2..a8df586db 100644 --- a/x11-wm/phoc/Manifest +++ b/x11-wm/phoc/Manifest @@ -1,2 +1,4 @@ +DIST phoc-v0.11.0.tar.gz 161198 BLAKE2B 1121dead62dc1088043843e3816d11b9ee0231566eccd78add1ed6e75a2d158e8bc844dd4831a05b0a3ff1c5a3d8181c46c3163ba105285a0833b246e50dc386 SHA512 0ed455a9216ec1fb8100cf8422d771c56e37067f8c1a809b1cde0e424d48622780fd0ffd6b164e1217218c56a016e448a23d7acb03559c5b7058d6b359e56e14 DIST phoc-v0.9.0.tar.gz 154836 BLAKE2B c701b1f9384d86d381719320303f9baaa0cabaed6d81d359a2f72f0c067da965ba57659c63b65aee32604b2bec65a4e6c8a59c3bbd8433ef3231a139bf3c SHA512 1146bd689a1a2fac60f2b4ea5893bd49c6cb4628cc4a6422a053e3210fed238ab572c28144f262ed5cc2992ebd3870e587a051e2b62f39e2fc146218387a5d89 +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/phoc-0.11.0.ebuild b/x11-wm/phoc/phoc-0.11.0.ebuild new file mode 100644 index 0..bad337bad --- /dev/null +++ b/x11-wm/phoc/phoc-0.11.0.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson vala xdg gnome2-utils + +MY_PV="v${PV}" +MY_P="${PN}-${MY_PV}" + +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 +" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="+introspection +systemd test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/glib + dev-libs/gobject-introspection + dev-libs/libinput + dev-libs/wayland + dev-libs/wayland-protocols + gnome-base/gnome-desktop + systemd? ( + !sys-apps/openrc + sys-apps/systemd + ) + x11-libs/libdrm + x11-libs/pixman + x11-libs/xcb-util + x11-libs/xcb-util-wm + x11-wm/mutter + sys-auth/seatd + !gui-libs/wlroots +" + +BDEPEND=" + dev-util/ctags + dev-util/meson + virtual/pkgconfig + x11-base/xorg-server +" + +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" +} + +src_configure() { + local emesonargs=( + -Ddefault_library=shared + -Dtests=false + ) + meson_src_configure +} + +src_install() { + DESTDIR="${D}" meson_src_install + dobin "${S}"/helpers/scale-to-fit +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm +}
[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/
commit: 1fa60f96165e2a4c2abdf2bc85f4aea78bc94ca4 Author: Gerben Jan Dijkman gjdwebserver nl> AuthorDate: Sat Oct 30 21:21:26 2021 + Commit: Gerben Jan Dijkman gjdwebserver nl> CommitDate: Sat Oct 30 21:21:26 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1fa60f96 x11-wm/phoc: Correct Manifest Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Gerben Jan Dijkman gjdwebserver.nl> x11-wm/phoc/Manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-wm/phoc/Manifest b/x11-wm/phoc/Manifest index 36e847a10..72e811c18 100644 --- a/x11-wm/phoc/Manifest +++ b/x11-wm/phoc/Manifest @@ -1,2 +1,2 @@ -DIST phoc-v0.9.0.tar.gz 56137 BLAKE2B 1c0d17283c0852e029314f4386133b182fb58588f2541eaebc67fc8b7542f0172d6bea13b04b68e2efdce5cbb3ee03c08b0f961e8f934c688aac46bc683dc3c9 SHA512 8d656b5a5c747924207271912b24bdfbfbba65e2a8146096c5f7fa28e5d942411c84df84c131a695c0fdd1934f295737ce842ef541eb884bf1b808de6be9c45e +DIST phoc-v0.9.0.tar.gz 154836 BLAKE2B c701b1f9384d86d381719320303f9baaa0cabaed6d81d359a2f72f0c067da965ba57659c63b65aee32604b2bec65a4e6c8a59c3bbd8433ef3231a139bf3c SHA512 1146bd689a1a2fac60f2b4ea5893bd49c6cb4628cc4a6422a053e3210fed238ab572c28144f262ed5cc2992ebd3870e587a051e2b62f39e2fc146218387a5d89 DIST wlroots-0.12.0.tar.gz 476936 BLAKE2B 4129c87a148085f95f4cee6973308d79ab3f8b024247287a68dadd6729da8a5f8cc1e4ada63c15477a2c8e8258032440afe4a21a26f947143d17c87b0ca8a1a4 SHA512 560eae30932b777c1f07fb44592d5601c5d10ef74b31b6b9e4166a14caadab2bfa88d39282f159785d4c7f22f78d204f9bb7fab65d58afaf14b72a8486f9b415
[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/
commit: 8ad5945f331bfe97f1285c575ac16b1be1f15a11 Author: Gerben Jan Dijkman gjdwebserver nl> AuthorDate: Sat Oct 30 21:13:57 2021 + Commit: Gerben Jan Dijkman gjdwebserver nl> CommitDate: Sat Oct 30 21:13:57 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8ad5945f x11-wm/phoc: Updated URI to currect source Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Gerben Jan Dijkman gjdwebserver.nl> x11-wm/phoc/phoc-0.9.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-wm/phoc/phoc-0.9.0.ebuild b/x11-wm/phoc/phoc-0.9.0.ebuild index 2780e023a..a60acea7a 100644 --- a/x11-wm/phoc/phoc-0.9.0.ebuild +++ b/x11-wm/phoc/phoc-0.9.0.ebuild @@ -17,7 +17,7 @@ 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://source.puri.sm/World/Phosh/phoc/-/archive/${MY_PV}/${MY_P}.tar.gz + 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 "
[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/
commit: 626a0119ede237193a94b4af18e0fbb9d7dbc861 Author: Gerben Jan Dijkman gjdwebserver nl> AuthorDate: Sat Oct 30 21:00:27 2021 + Commit: Gerben Jan Dijkman gjdwebserver nl> CommitDate: Sat Oct 30 21:00:27 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=626a0119 x11-wm/phoc: Version Bump Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Gerben Jan Dijkman gjdwebserver.nl> x11-wm/phoc/Manifest | 2 +- x11-wm/phoc/{phoc-0.8.0.ebuild => phoc-0.9.0.ebuild} | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/x11-wm/phoc/Manifest b/x11-wm/phoc/Manifest index 90083ee14..36e847a10 100644 --- a/x11-wm/phoc/Manifest +++ b/x11-wm/phoc/Manifest @@ -1,2 +1,2 @@ -DIST phoc-v0.8.0.tar.gz 144611 BLAKE2B f5ad96a3917ccd849f73e427077e08a19ce4109b639519239fbecb7183d19579e791ecc7628b22fd8632f6f47a55279860d3c6af3eb25d42115b7343c89611cb SHA512 b2cc687852385d4010c22e01ea65870dcc71f4a6a53782a615df11641ce5cc4b29add7afefd5560b95d03fe045b6ffa7387b68dfe114828cd62bdae9424e692d +DIST phoc-v0.9.0.tar.gz 56137 BLAKE2B 1c0d17283c0852e029314f4386133b182fb58588f2541eaebc67fc8b7542f0172d6bea13b04b68e2efdce5cbb3ee03c08b0f961e8f934c688aac46bc683dc3c9 SHA512 8d656b5a5c747924207271912b24bdfbfbba65e2a8146096c5f7fa28e5d942411c84df84c131a695c0fdd1934f295737ce842ef541eb884bf1b808de6be9c45e DIST wlroots-0.12.0.tar.gz 476936 BLAKE2B 4129c87a148085f95f4cee6973308d79ab3f8b024247287a68dadd6729da8a5f8cc1e4ada63c15477a2c8e8258032440afe4a21a26f947143d17c87b0ca8a1a4 SHA512 560eae30932b777c1f07fb44592d5601c5d10ef74b31b6b9e4166a14caadab2bfa88d39282f159785d4c7f22f78d204f9bb7fab65d58afaf14b72a8486f9b415 diff --git a/x11-wm/phoc/phoc-0.8.0.ebuild b/x11-wm/phoc/phoc-0.9.0.ebuild similarity index 95% rename from x11-wm/phoc/phoc-0.8.0.ebuild rename to x11-wm/phoc/phoc-0.9.0.ebuild index 0b27e0c08..2780e023a 100644 --- a/x11-wm/phoc/phoc-0.8.0.ebuild +++ b/x11-wm/phoc/phoc-0.9.0.ebuild @@ -17,7 +17,7 @@ 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://source.puri.sm/Librem5/phoc/-/archive/${MY_PV}/${MY_P}.tar.gz + https://source.puri.sm/World/Phosh/phoc/-/archive/${MY_PV}/${MY_P}.tar.gz https://github.com/swaywm/wlroots/releases/download/${WL_PV}/${WL_P}.tar.gz " @@ -43,6 +43,7 @@ RDEPEND=" x11-libs/xcb-util x11-libs/xcb-util-wm x11-wm/mutter + sys-auth/seatd " BDEPEND="
[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/
commit: 6e9fbc1ff226cc6ca4f0b21a278187f422c488ce Author: Andrew Ammerlaan gentoo org> AuthorDate: Tue Aug 24 19:23:38 2021 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Tue Aug 24 19:23:38 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6e9fbc1f x11-wm/phoc: drop RedundantLongDescription Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan gentoo.org> x11-wm/phoc/metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/x11-wm/phoc/metadata.xml b/x11-wm/phoc/metadata.xml index d495e34d9..52a95ab63 100644 --- a/x11-wm/phoc/metadata.xml +++ b/x11-wm/phoc/metadata.xml @@ -5,9 +5,6 @@ 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
[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 installa
[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/
commit: 025de0e8a6aab92956bf8326fcfb06de30d67935 Author: Marco Scardovi scardovi com> AuthorDate: Sun Jul 11 16:06:07 2021 + Commit: Marco Scardovi scardovi com> CommitDate: Sun Jul 11 16:06:07 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=025de0e8 x11-wm/phoc: bump to 0.8.0 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Marco Scardovi scardovi.com> x11-wm/phoc/Manifest | 2 +- x11-wm/phoc/{phoc-0.7.1.ebuild => phoc-0.8.0.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-wm/phoc/Manifest b/x11-wm/phoc/Manifest index 6019f26ab..90083ee14 100644 --- a/x11-wm/phoc/Manifest +++ b/x11-wm/phoc/Manifest @@ -1,2 +1,2 @@ -DIST phoc-v0.7.1.tar.gz 143801 BLAKE2B 4db2fb40d2b85ee27d53a71b0dc158b3b37b47f9517bf5133958bc2328892aa8a54c679b5293efc4b3d84ccee04866471c729c4d77d9e903136bed3fe9e35030 SHA512 80869036c36837c2e260a8662aee975f86797c0a68a0a513d2d52b904d1ca44bcd93e8bee850c08a9b3b3395727e4e28085860750acd1b092349c7da6410c820 +DIST phoc-v0.8.0.tar.gz 144611 BLAKE2B f5ad96a3917ccd849f73e427077e08a19ce4109b639519239fbecb7183d19579e791ecc7628b22fd8632f6f47a55279860d3c6af3eb25d42115b7343c89611cb SHA512 b2cc687852385d4010c22e01ea65870dcc71f4a6a53782a615df11641ce5cc4b29add7afefd5560b95d03fe045b6ffa7387b68dfe114828cd62bdae9424e692d DIST wlroots-0.12.0.tar.gz 476936 BLAKE2B 4129c87a148085f95f4cee6973308d79ab3f8b024247287a68dadd6729da8a5f8cc1e4ada63c15477a2c8e8258032440afe4a21a26f947143d17c87b0ca8a1a4 SHA512 560eae30932b777c1f07fb44592d5601c5d10ef74b31b6b9e4166a14caadab2bfa88d39282f159785d4c7f22f78d204f9bb7fab65d58afaf14b72a8486f9b415 diff --git a/x11-wm/phoc/phoc-0.7.1.ebuild b/x11-wm/phoc/phoc-0.8.0.ebuild similarity index 100% rename from x11-wm/phoc/phoc-0.7.1.ebuild rename to x11-wm/phoc/phoc-0.8.0.ebuild
[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/
commit: 14140750e36a8698d8864878f442db965bf6b32f Author: Marco Scardovi scardovi com> AuthorDate: Sun Jun 27 08:13:16 2021 + Commit: Marco Scardovi scardovi com> CommitDate: Sun Jun 27 08:13:36 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=14140750 x11-wm/phoc: remove the gnome2-utils Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Marco Scardovi scardovi.com> x11-wm/phoc/phoc-0.7.1.ebuild | 28 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/x11-wm/phoc/phoc-0.7.1.ebuild b/x11-wm/phoc/phoc-0.7.1.ebuild index 1c0e78a69..cda542c9d 100644 --- a/x11-wm/phoc/phoc-0.7.1.ebuild +++ b/x11-wm/phoc/phoc-0.7.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit vala meson gnome2-utils xdg +inherit meson vala xdg MY_PV="v${PV}" MY_P="${PN}-${MY_PV}" @@ -24,20 +24,27 @@ SRC_URI=" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~arm64" -IUSE="+introspection" +IUSE="+introspection +systemd test" +RESTRICT="!test? ( test )" -DEPEND=" +RDEPEND=" dev-libs/glib dev-libs/gobject-introspection dev-libs/libinput + dev-libs/wayland dev-libs/wayland-protocols gnome-base/gnome-desktop - !gui-libs/wlroots + systemd? ( + !sys-apps/openrc + sys-apps/systemd + ) + x11-libs/libdrm + x11-libs/pixman x11-libs/xcb-util x11-libs/xcb-util-wm x11-wm/mutter " -RDEPEND="${DEPEND}" + BDEPEND=" dev-util/ctags dev-util/meson @@ -54,9 +61,8 @@ S="${WORKDIR}/${MY_P}" src_prepare() { default - eapply_user - rm -r "${S}"/subprojects/wlroots || die - mv "${WORKDIR}/${WL_P}" "${S}"/subprojects/wlroots || die + 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" } src_configure() { @@ -70,16 +76,14 @@ src_configure() { } src_install() { - meson_src_install - dobin "${S}"/helpers/scale-to-fit + DESTDIR="${D}" 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 }
[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/
commit: 746c2a856da253197a3ddb8b9d729c9500117eb8 Author: Marco Scardovi scardovi com> AuthorDate: Fri Jun 25 21:13:05 2021 + Commit: Marco Scardovi scardovi com> CommitDate: Fri Jun 25 21:13:22 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=746c2a85 x11-wm/phoc: added missing package Closes: https://bugs.gentoo.org/798501 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Marco Scardovi scardovi.com> x11-wm/phoc/phoc-0.7.1.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/x11-wm/phoc/phoc-0.7.1.ebuild b/x11-wm/phoc/phoc-0.7.1.ebuild index 4d5eaea51..1c0e78a69 100644 --- a/x11-wm/phoc/phoc-0.7.1.ebuild +++ b/x11-wm/phoc/phoc-0.7.1.ebuild @@ -30,6 +30,7 @@ DEPEND=" dev-libs/glib dev-libs/gobject-introspection dev-libs/libinput + dev-libs/wayland-protocols gnome-base/gnome-desktop !gui-libs/wlroots x11-libs/xcb-util
[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, &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_o