From bc1a2add7e18bfa05b1439a5fd02a0e7d8990fe7 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Wed, 7 Apr 2021 22:02:02 +0200 Subject: [PATCH 1/3] wlroots: update to 0.13.0. --- common/shlibs | 2 +- srcpkgs/wlroots/template | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/common/shlibs b/common/shlibs index 8d3c87b4d34e..fc74a72fe1b7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3467,7 +3467,7 @@ libcodecore.so.0 libio.elementary.code-3.0_1 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1 libpantheon-files-core.so.4 libio.elementary.files-4.1.4_1 libpantheon-files-widgets.so.4 libio.elementary.files-4.1.4_1 -libwlroots.so.7 wlroots-0.12.0_1 +libwlroots.so.8 wlroots-0.13.0_1 libbaseencode.so.1 libbaseencode-1.0.9_1 libcotp.so.12 libcotp-1.2.1_1 libunarr.so.1 libunarr-1.0.1_1 diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template index c4d3bad99c6b..fd3a4b0b5aae 100644 --- a/srcpkgs/wlroots/template +++ b/srcpkgs/wlroots/template @@ -1,25 +1,25 @@ # Template file for 'wlroots' pkgname=wlroots -version=0.12.0 -revision=2 +version=0.13.0 +revision=1 build_style=meson -# enable assertions - upstream uses them only for unreachable situations -configure_args="-Dlogind=disabled -Dlibseat=enabled - -Dxcb-errors=enabled -Dxcb-icccm=enabled -Dxwayland=enabled - -Dx11-backend=enabled -Dexamples=false -Dwerror=false -Db_ndebug=false" +# Follow upstream packaging recommendations: +# https://github.com/swaywm/wlroots/wiki/Packaging-recommendations +configure_args="--auto-features=enabled -Dlogind=disabled + -Dexamples=false -Dwerror=false -Db_ndebug=false" hostmakedepends="pkg-config wayland-devel" _devel_depends="MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols - xcb-util-errors-devel xcb-util-wm-devel" + xcb-util-errors-devel xcb-util-wm-devel xcb-util-renderutil-devel" makedepends="${_devel_depends} libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel - xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-xrm-devel" + xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland" short_desc="Modular Wayland compositor library" maintainer="Isaac Freund " license="MIT" homepage="https://github.com/swaywm/wlroots" distfiles="https://github.com/swaywm/wlroots/archive/${version}.tar.gz" -checksum=c9e9f4f6d2f526d0b2886daf3ec37e64831773059aa669fb98a88522a1626bdb +checksum=f6bea37fd4a6f5e5f552b83d61adae8c73e64b0bcb9ae0ab464ebcd9309d3cf3 post_install() { vlicense LICENSE From 276e01022079e9544e4e5a10eaa132cb760a9667 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Wed, 7 Apr 2021 22:42:06 +0200 Subject: [PATCH 2/3] sway: update to 1.6. --- srcpkgs/sway/patches/6046.patch | 133 -------------------------------- srcpkgs/sway/template | 12 +-- 2 files changed, 4 insertions(+), 141 deletions(-) delete mode 100644 srcpkgs/sway/patches/6046.patch diff --git a/srcpkgs/sway/patches/6046.patch b/srcpkgs/sway/patches/6046.patch deleted file mode 100644 index 34845cd99b59..000000000000 --- a/srcpkgs/sway/patches/6046.patch +++ /dev/null @@ -1,133 +0,0 @@ -Upstream: yes -Source: https://github.com/swaywm/sway/pull/6046 -Reason: Popup menu flickers on Firefox -(https://bugzilla.mozilla.org/show_bug.cgi?id=1696662) - -From cf03185561e919f1c337f087194fec150425eef5 Mon Sep 17 00:00:00 2001 -From: Kenny Levinsen -Date: Fri, 19 Feb 2021 18:39:54 +0100 -Subject: [PATCH 1/3] view: Recursively check mapped of view_child tree - -A subsurface may be set to mapped without its parent. ---- - sway/tree/view.c | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/sway/tree/view.c b/sway/tree/view.c -index ad79b2294..c8a4ea6b6 100644 ---- a/sway/tree/view.c -+++ b/sway/tree/view.c -@@ -982,8 +982,18 @@ static void view_child_subsurface_create(struct sway_view_child *child, - view_child_damage(&subsurface->child, true); - } - -+static bool view_child_is_mapped(struct sway_view_child *child) { -+ while (child) { -+ if (!child->mapped) { -+ return false; -+ } -+ child = child->parent; -+ } -+ return true; -+} -+ - static void view_child_damage(struct sway_view_child *child, bool whole) { -- if (!child || !child->mapped || !child->view || !child->view->container) { -+ if (!child || !view_child_is_mapped(child) || !child->view || !child->view->container) { - return; - } - int sx, sy; -@@ -1082,7 +1092,7 @@ void view_child_init(struct sway_view_child *child, - } - - void view_child_destroy(struct sway_view_child *child) { -- if (child->mapped && child->view->container != NULL) { -+ if (view_child_is_mapped(child) && child->view->container != NULL) { - view_child_damage(child, true); - } - - -From e2ec65d0a32797edd0846758bc24cf685e2d19d5 Mon Sep 17 00:00:00 2001 -From: Kenny Levinsen -Date: Fri, 19 Feb 2021 18:41:04 +0100 -Subject: [PATCH 2/3] view: Mark subchildren as unmapped in view_child_destroy - -The subchildren lose their parent association at this point, so they -will not be able to see that the parent is unmapped. - -Instead, just set the subchildren to be unmapped directly. ---- - sway/tree/view.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/sway/tree/view.c b/sway/tree/view.c -index c8a4ea6b6..978271c24 100644 ---- a/sway/tree/view.c -+++ b/sway/tree/view.c -@@ -1105,6 +1105,9 @@ void view_child_destroy(struct sway_view_child *child) { - wl_list_for_each_safe(subchild, tmpchild, &child->children, link) { - wl_list_remove(&subchild->link); - subchild->parent = NULL; -+ // The subchild lost its parent link, so it cannot see that the parent -+ // is unmapped. Unmap it directly. -+ subchild->mapped = false; - } - - wl_list_remove(&child->surface_commit.link); - -From c06a926e0d89e952e5a3892b63f07d5b802b34ef Mon Sep 17 00:00:00 2001 -From: Kenny Levinsen -Date: Fri, 19 Feb 2021 18:33:20 +0100 -Subject: [PATCH 3/3] view: Set parent for view_child subsurfaces on init - -view_child_init was calling view_init_subsurfaces, which did not set the -parent attribute for the subchildren. This lead to the subchildren -acting as standalone children. If the parent was an xdg_popup, this -would make the subchild unaware of the popup position. - -Introduce view_child_init_subsurfaces for view_child_init to use -instead. - -Closes: https://github.com/swaywm/sway/issues/6038 ---- - sway/tree/view.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/sway/tree/view.c b/sway/tree/view.c -index 978271c24..8a2a8178d 100644 ---- a/sway/tree/view.c -+++ b/sway/tree/view.c -@@ -465,6 +465,9 @@ static void view_subsurface_create(struct sway_view *view, - static void view_init_subsurfaces(struct sway_view *view, - struct wlr_surface *surface); - -+static void view_child_init_subsurfaces(struct sway_view_child *view_child, -+ struct wlr_surface *surface); -+ - static void view_handle_surface_new_subsurface(struct wl_listener *listener, - void *data) { - struct sway_view *view = -@@ -1033,6 +1036,14 @@ static void view_init_subsurfaces(struct sway_view *view, - } - } - -+static void view_child_init_subsurfaces(struct sway_view_child *view_child, -+ struct wlr_surface *surface) { -+ struct wlr_subsurface *subsurface; -+ wl_list_for_each(subsurface, &surface->subsurfaces, parent_link) { -+ view_child_subsurface_create(view_child, subsurface); -+ } -+} -+ - static void view_child_handle_surface_map(struct wl_listener *listener, - void *data) { - struct sway_view_child *child = -@@ -1088,7 +1099,7 @@ void view_child_init(struct sway_view_child *child, - wlr_surface_send_enter(child->surface, workspace->output->wlr_output); - } - -- view_init_subsurfaces(child->view, surface); -+ view_child_init_subsurfaces(child, surface); - } - - void view_child_destroy(struct sway_view_child *child) { diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template index 2858c7026b56..3297f668adf4 100644 --- a/srcpkgs/sway/template +++ b/srcpkgs/sway/template @@ -1,8 +1,9 @@ # Template file for 'sway' pkgname=sway -version=1.5.1 -revision=2 +version=1.6 +revision=1 build_style=meson +configure_args="-Dwerror=false -Db_ndebug=false" conf_files="/etc/sway/config" hostmakedepends="pkg-config wayland-devel scdoc git" makedepends="wlroots-devel pcre-devel json-c-devel pango-devel cairo-devel @@ -13,12 +14,7 @@ maintainer="Olaf Mersmann " license="MIT" homepage="https://swaywm.org" distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz" -checksum=095f983c9a5f80d761bc2fb19df8166839b9290124ccd47f3e74119a1335490f -patch_args="-Np1" - -post_patch() { - vsed -e 's/werror=true/werror=false/g' -i meson.build -} +checksum=9ecfd2f38239f7e90922a13cd348fc95fc059e8fa0e4b75b8ffcc7b61685a5fb post_install() { vlicense LICENSE From b0e32ad546652665750586474a596600411f7610 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Sat, 10 Apr 2021 19:46:49 +0200 Subject: [PATCH 3/3] hikari: update to 2.3.0. --- srcpkgs/hikari/template | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template index 093d55610b0b..598a87de6179 100644 --- a/srcpkgs/hikari/template +++ b/srcpkgs/hikari/template @@ -1,6 +1,6 @@ # Template file for 'hikari' pkgname=hikari -version=2.2.3 +version=2.3.0 revision=1 build_style=gnu-makefile make_cmd=bmake @@ -16,7 +16,7 @@ license="BSD-2-Clause" homepage="https://hikari.acmelabs.space" changelog="https://hub.darcs.net/raichoo/hikari/browse/CHANGELOG.md" distfiles="${homepage}/releases/${pkgname}-${version}.tar.gz" -checksum=0727d8652e6debea52a9d975bd656cb573556e0e14184b069925c40f2f1b02b4 +checksum=8577ea568d2a41b0dc7b2fae784446778e3ddd5b9563576c9756dfbf7b9435d2 conf_files="/etc/pam.d/hikari-unlocker /etc/hikari/hikari.conf" pre_build() { @@ -25,13 +25,19 @@ pre_build() { # command line (i.e., when make_use_env is undefined), but it ignores # the values in the environment when make_use_env=yes. The _EXTRA # variables provided in the Makefile allow us to force the right flags. - export CFLAGS_EXTRA="${CFLAGS}" + export CFLAGS_EXTRA="${CFLAGS} -Wno-error" export LDFLAGS_EXTRA="${LDFLAGS}" # bmake tends to ignore CC in the environment make_build_args+=" CC=$CC" } +# bmake's -q flag seems to differ in behavior from gnu make which causes the +# build style's handling of the check target not existing to fail. +do_check() { + : +} + post_install() { vlicense LICENSE }