From dcd7907f2351eef83e32af9232bc50210e596228 Mon Sep 17 00:00:00 2001 From: travankor Date: Sat, 30 Jan 2021 20:59:00 -0700 Subject: [PATCH 1/5] wayfire: update to 0.7.0. --- srcpkgs/wayfire/patches/fix_switcher.patch | 30 ---------------------- srcpkgs/wayfire/template | 9 ++++--- 2 files changed, 5 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/wayfire/patches/fix_switcher.patch diff --git a/srcpkgs/wayfire/patches/fix_switcher.patch b/srcpkgs/wayfire/patches/fix_switcher.patch deleted file mode 100644 index a09e43d12e6..00000000000 --- a/srcpkgs/wayfire/patches/fix_switcher.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- plugins/single_plugins/switcher.cpp 2020-11-18 15:30:44.970379825 +0100 -+++ plugins/single_plugins/switcher.cpp 2020-11-18 15:30:31.068223026 +0100 -@@ -201,7 +201,8 @@ class WayfireSwitcher : public wf::plugi - active = true; - - // grabs shouldn't fail if we could successfully activate plugin -- assert(grab_interface->grab()); -+ auto grab = grab_interface->grab(); -+ assert(grab); - - focus_next(dir); - arrange(); ---- src/view/layer-shell.cpp 2020-11-18 15:30:44.970379825 +0100 -+++ src/view/layer-shell.cpp 2020-11-18 15:30:40.404328323 +0100 -@@ -1,5 +1,6 @@ - #include - #include -+#include - - #include "xdg-shell.hpp" - #include "wayfire/core.hpp" -@@ -69,7 +70,7 @@ wf::workspace_manager::anchored_edge anc - return wf::workspace_manager::ANCHORED_EDGE_RIGHT; - } - -- assert(false); -+ abort(); - } - - struct wf_layer_shell_manager diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template index 22c5494af07..fb3b85aef2c 100644 --- a/srcpkgs/wayfire/template +++ b/srcpkgs/wayfire/template @@ -1,7 +1,7 @@ # Template file for 'wayfire' pkgname=wayfire -version=0.6.0 -revision=2 +version=0.7.0 +revision=1 _utils_commit=f45641beef46babdc8f1b8d18a924e72beaf8ee6 _touch_commit=b1075c54a280f913edc26b9757262f4f9d6b62b0 build_style=meson @@ -13,10 +13,10 @@ short_desc="3D wayland compositor" maintainer="Érico Nogueira " license="MIT" homepage="https://wayfire.org" -distfiles="https://github.com/WayfireWM/wayfire/archive/${version}.tar.gz +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="9c2bf92e6aecc9b800b87e4c086ff7a275393f7315501b8c39196baf9d245b33 +checksum="b1a94ad2843db19e78cbd361ceebaade4507647ad893d5b5117a9fc7724ce41c d172f8c21e0bac01e4116cd957fb0159c5cb39ddfdce897beb0d9c753796d5f1 2b22e03d3a522baeff5798f630ffe5aa95899fd3233b291527503af5fd3e30be" @@ -47,6 +47,7 @@ wayfire-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" vmove "usr/lib/*.so" } } From bd1db58a05d298492b55b1eb18ef835723f73bde Mon Sep 17 00:00:00 2001 From: travankor Date: Sat, 30 Jan 2021 20:59:05 -0700 Subject: [PATCH 2/5] wf-config: update to 0.7.0. --- srcpkgs/wf-config/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template index bc6a2c8b870..5cbf2c847e0 100644 --- a/srcpkgs/wf-config/template +++ b/srcpkgs/wf-config/template @@ -1,6 +1,6 @@ # Template file for 'wf-config' pkgname=wf-config -version=0.6.0 +version=0.7.0 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -9,8 +9,8 @@ short_desc="Wayfire library for managing configuration files" maintainer="Young Jin Park " license="MIT" homepage="https://wayfire.org" -distfiles="https://github.com/WayfireWM/wf-config/archive/${version}.tar.gz" -checksum=73af6d803044d4e5907974ece019ae0d1b4020a057f6c27be0594fb70d86653b +distfiles="https://github.com/WayfireWM/wf-config/archive/v${version}.tar.gz" +checksum=a8712d6a10d74b2bdba3dac9e01448945a0470ce8b1cd6d5caa2a8194f889b04 post_install() { vlicense LICENSE From d60136c825a8a5d0f88d876d563a857878da57c4 Mon Sep 17 00:00:00 2001 From: travankor Date: Sat, 30 Jan 2021 20:59:11 -0700 Subject: [PATCH 3/5] wf-shell: update to 0.7.0. --- srcpkgs/wf-shell/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template index 47f0a42376b..9c8accbe6ae 100644 --- a/srcpkgs/wf-shell/template +++ b/srcpkgs/wf-shell/template @@ -1,6 +1,6 @@ # Template file for 'wf-shell' pkgname=wf-shell -version=0.6.1 +version=0.7.0 revision=1 build_style=meson build_helper="gir" @@ -13,7 +13,7 @@ maintainer="Young Jin Park " license="MIT" homepage="https://wayfire.org" distfiles="https://github.com/WayfireWM/wf-shell/releases/download/v${version}/wf-shell-${version}.tar.xz" -checksum=da8e5a16dde8f44966d41449452bcc7bc2466d5945324aca714ecc82827c884a +checksum=7495c690a1c021e0c82ba304513b3e7870cb329f7f0bf88df3bc5f46535d5ec7 post_install() { vlicense LICENSE From ddc8f55edfb7cb4ba1a1c616d176ec8537da9747 Mon Sep 17 00:00:00 2001 From: travankor Date: Sat, 30 Jan 2021 20:59:19 -0700 Subject: [PATCH 4/5] wcm: update to 0.7.0. --- srcpkgs/wcm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wcm/template b/srcpkgs/wcm/template index b32e76ccff1..91f4b820597 100644 --- a/srcpkgs/wcm/template +++ b/srcpkgs/wcm/template @@ -1,6 +1,6 @@ # Template file for 'wcm' pkgname=wcm -version=0.6.0 +version=0.7.0 revision=1 build_style=meson hostmakedepends="pkg-config wayland-devel" @@ -10,7 +10,7 @@ maintainer="Érico Nogueira " license="MIT" homepage="https://wayfire.org/" distfiles="https://github.com/WayfireWM/wcm/archive/v${version}.tar.gz" -checksum=bfead0b617f46306ad3bc15b8e9c7e8f13996de6b5bdd3f2d18f066a9033740f +checksum=930792b9567183aa4939ce880c294d38b56fcd1b9b64760bb33126067010166f post_install() { vlicense LICENSE From ee5f7ffeacd8007e3629fd07f3beaf81ca5487ff Mon Sep 17 00:00:00 2001 From: travankor Date: Sat, 30 Jan 2021 20:59:28 -0700 Subject: [PATCH 5/5] wayfire-plugins-extra: update to 0.7.0. --- srcpkgs/wayfire-plugins-extra/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template index ff0e06c655c..60fd9784e78 100644 --- a/srcpkgs/wayfire-plugins-extra/template +++ b/srcpkgs/wayfire-plugins-extra/template @@ -1,6 +1,6 @@ # Template file for 'wayfire-plugins-extra' pkgname=wayfire-plugins-extra -version=0.6.0 +version=0.7.0 revision=1 build_style=meson hostmakedepends="pkg-config wayland-devel" @@ -10,8 +10,8 @@ short_desc="Additional plugins for Wayfire" maintainer="Érico Nogueira " license="MIT" homepage="https://wayfire.org/" -distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/${version}.tar.gz" -checksum=d1ac42c0b2d212a7523f2aeb63285ab8b95ffb6efd564bf27877310eeab1ab0e +distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/v${version}.tar.gz" +checksum=e6377e7f2cd6b0a19fe0a256c819f801ee1d963524ed4e4930b702474bc04287 post_install() { vlicense LICENSE