From 2ec5841a1c157b88a2056d0d90142bf9d36ec217 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 30 Jan 2021 20:59:00 -0700
Subject: [PATCH] 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 a09e43d12e..0000000000
--- 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 <algorithm>
- #include <cstring>
-+#include <cstdlib>
- 
- #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 22c5494af0..fb3b85aef2 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 <ericonr@disroot.org>"
 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"
 	}
 }