From ebf2e011e09a72eea8aa7b3fc77a1c992caff77c Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Wed, 23 Jun 2021 14:40:10 +0200 Subject: [PATCH 1/6] wlroots: update to 0.14.0. --- common/shlibs | 2 +- srcpkgs/wlroots/template | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index 71d099465be5..8a7eef8df8c3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3507,7 +3507,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.8 wlroots-0.13.0_1 +libwlroots.so.9 wlroots-0.14.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 fd3a4b0b5aae..23323fe65eaf 100644 --- a/srcpkgs/wlroots/template +++ b/srcpkgs/wlroots/template @@ -1,12 +1,11 @@ # Template file for 'wlroots' pkgname=wlroots -version=0.13.0 +version=0.14.0 revision=1 build_style=meson # 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" +configure_args="--auto-features=enabled -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 @@ -19,7 +18,7 @@ maintainer="Isaac Freund " license="MIT" homepage="https://github.com/swaywm/wlroots" distfiles="https://github.com/swaywm/wlroots/archive/${version}.tar.gz" -checksum=f6bea37fd4a6f5e5f552b83d61adae8c73e64b0bcb9ae0ab464ebcd9309d3cf3 +checksum=2a8435bf63681868699c4e3975df31cb111ad2d3f35740179036083f87382ac7 post_install() { vlicense LICENSE From 1e21aaf781462987ad17a5ac78efddee45879570 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Sat, 26 Jun 2021 13:42:18 +0200 Subject: [PATCH 2/6] sway: update to 1.6.1. --- srcpkgs/sway/patches/primary_selection.diff | 25 --------------------- srcpkgs/sway/template | 6 ++--- 2 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 srcpkgs/sway/patches/primary_selection.diff diff --git a/srcpkgs/sway/patches/primary_selection.diff b/srcpkgs/sway/patches/primary_selection.diff deleted file mode 100644 index 5ca2b0e14d6e..000000000000 --- a/srcpkgs/sway/patches/primary_selection.diff +++ /dev/null @@ -1,25 +0,0 @@ -Sway 1.6 removed support for gtk-primary-selection, but some -programs (e.g. Firefox ESR 78) still rely on it. -Since wlroots will drop it in version 0.14, we can restore -this feature on sway. -https://github.com/swaywm/sway/pull/5788 -https://github.com/swaywm/wlroots/issues/2421 -https://github.com/swaywm/wlroots/pull/2460 ---- a/sway/server.c -+++ b/sway/server.c -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -75,6 +76,7 @@ bool server_init(struct sway_server *server) { - wlr_data_device_manager_create(server->wl_display); - - wlr_gamma_control_manager_v1_create(server->wl_display); -+ wlr_gtk_primary_selection_device_manager_create(server->wl_display); - - server->new_output.notify = handle_new_output; - wl_signal_add(&server->backend->events.new_output, &server->new_output); diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template index 4a77658518e8..aa29ee172a4f 100644 --- a/srcpkgs/sway/template +++ b/srcpkgs/sway/template @@ -1,7 +1,7 @@ # Template file for 'sway' pkgname=sway -version=1.6 -revision=2 +version=1.6.1 +revision=1 build_style=meson configure_args="-Dwerror=false -Db_ndebug=false" conf_files="/etc/sway/config" @@ -14,7 +14,7 @@ maintainer="Olaf Mersmann " license="MIT" homepage="https://swaywm.org" distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz" -checksum=9ecfd2f38239f7e90922a13cd348fc95fc059e8fa0e4b75b8ffcc7b61685a5fb +checksum=8b138867cd83217de07138144b1279fe58e0421eb10c91122aa33c8770fe7391 post_install() { vlicense LICENSE From 3456de9ad698c9c6cd3da89760d7ca69cc750ce5 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Sat, 26 Jun 2021 13:45:53 +0200 Subject: [PATCH 3/6] cage: update to 0.1.4. --- srcpkgs/cage/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template index 1b447bcf2ba1..6b6c6044d945 100644 --- a/srcpkgs/cage/template +++ b/srcpkgs/cage/template @@ -1,6 +1,6 @@ # Template file for 'cage' pkgname=cage -version=0.1.3 +version=0.1.4 revision=1 build_style=meson configure_args="$(vopt_bool xwayland xwayland)" @@ -12,7 +12,7 @@ maintainer="Illia Shestakov " license="MIT" homepage="https://www.hjdskes.nl/projects/cage/" distfiles="https://github.com/Hjdskes/cage/archive/v${version}.tar.gz" -checksum=c28aa8230f937c89b564967748451c1eb15d8633a71a1ed6e22d532afa15462e +checksum=dfe27fb0c7d43db72d6c82f01e2736580a0791a23ba69d7b56285d08af98ad90 build_options="xwayland" build_options_default="xwayland" From ca53b00e1341273eb52e478f739cf64c1133824c Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Sat, 26 Jun 2021 13:29:45 +0200 Subject: [PATCH 4/6] wayfire: update to 0.7.2. --- srcpkgs/wayfire/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template index c0fbbfd07089..0480204ed5c4 100644 --- a/srcpkgs/wayfire/template +++ b/srcpkgs/wayfire/template @@ -1,9 +1,9 @@ # Template file for 'wayfire' pkgname=wayfire -version=0.7.1 +version=0.7.2 revision=1 -_utils_commit=f45641beef46babdc8f1b8d18a924e72beaf8ee6 -_touch_commit=b1075c54a280f913edc26b9757262f4f9d6b62b0 +_utils_commit=889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac +_touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403 build_style=meson configure_args="-Dprint_trace=false" hostmakedepends="pkg-config wayland-devel" @@ -17,9 +17,9 @@ homepage="https://wayfire.org" distfiles="https://github.com/WayfireWM/wayfire/archive/v${version}.tar.gz https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz https://github.com/WayfireWM/wf-touch/archive/${_touch_commit}.tar.gz" -checksum="96cb7820cddbae962ca456fd1989cdaa00cd880b109bf8e9d667b9264a20c257 - d172f8c21e0bac01e4116cd957fb0159c5cb39ddfdce897beb0d9c753796d5f1 - 2b22e03d3a522baeff5798f630ffe5aa95899fd3233b291527503af5fd3e30be" +checksum="e45fddcc22b7149d793fea08763c5b3dc0edf7c0be9d094575a32cf847560fd4 + bbde37e1a8b5ecb322096b32891593c14264800291be8773f7f0708fc110ed2f + 09061c8a4d3d964e8dcfd1a7b97f7dc43d0fc30743b0993585439c6923ce422f" # Optimization for nested STL calls CXXFLAGS="-O3" From 5607c32bb447a5ec66a0a4ff7bdf0e2a75ed60d6 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Sat, 26 Jun 2021 13:55:56 +0200 Subject: [PATCH 5/6] wayfire-plugins-extra: revbump for wlroots 0.14.0 --- srcpkgs/wayfire-plugins-extra/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template index 71e8bddcf947..d364e01ce2a8 100644 --- a/srcpkgs/wayfire-plugins-extra/template +++ b/srcpkgs/wayfire-plugins-extra/template @@ -1,7 +1,7 @@ # Template file for 'wayfire-plugins-extra' pkgname=wayfire-plugins-extra version=0.7.0 -revision=3 +revision=4 build_style=meson hostmakedepends="pkg-config wayland-devel" makedepends="wayfire-devel glibmm-devel" From 480a7cb8d8d5ef4eb6d43740a092ad7550a5541b Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Sun, 27 Jun 2021 00:49:39 +0200 Subject: [PATCH 6/6] hikari: update to 2.3.1. --- srcpkgs/hikari/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template index 4d189cf0ae3e..15f5cc3d444d 100644 --- a/srcpkgs/hikari/template +++ b/srcpkgs/hikari/template @@ -1,6 +1,6 @@ # Template file for 'hikari' pkgname=hikari -version=2.3.0 +version=2.3.1 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=8577ea568d2a41b0dc7b2fae784446778e3ddd5b9563576c9756dfbf7b9435d2 +checksum=345b2a732dcc7499d3b967811698009b2bc1ad36dab08e46084b3f6a8ec2aeb9 conf_files="/etc/pam.d/hikari-unlocker /etc/hikari/hikari.conf" # 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.