[packages/wayfire] up to 0.9.0

[atler]

commit 38ae56a80ea2f056a164fa0907ada3677178adf9
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Oct 11 13:50:35 2024 +0200

    up to 0.9.0

 glm.patch    | 21 +++++++++++++--------
 wayfire.spec | 19 ++++++++++---------
 2 files changed, 23 insertions(+), 17 deletions(-)
---
diff --git a/wayfire.spec b/wayfire.spec
index 6961245..620831c 100644
--- a/wayfire.spec
+++ b/wayfire.spec
@@ -5,13 +5,13 @@
 Summary:	A modular and extensible wayland compositor
 Summary(pl.UTF-8):	Modularny i rozszerzalny kompozytor Wayland
 Name:		wayfire
-Version:	0.8.1
+Version:	0.9.0
 Release:	1
 License:	MIT
 Group:		Applications
 #Source0Download: https://github.com/WayfireWM/wayfire/releases
 Source0:	https://github.com/WayfireWM/wayfire/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	ec2652b11a5a8d03f96a38e8ca426246
+# Source0-md5:	94b7f9f03de7913c8b29ef251301f9cc
 Patch0:		glm.patch
 URL:		https://wayfire.org/
 BuildRequires:	EGL-devel
@@ -21,6 +21,7 @@ BuildRequires:	cairo-devel
 BuildRequires:	cmake
 BuildRequires:	libdrm-devel
 BuildRequires:	libevdev-devel
+BuildRequires:	libgomp-devel
 BuildRequires:	libinput-devel >= 1.7.0
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
@@ -28,7 +29,7 @@ BuildRequires:	libstdc++-devel >= 6:9
 BuildRequires:	libxcb-devel
 BuildRequires:	meson >= 0.63.0
 BuildRequires:	ninja
-BuildRequires:	nlohmann-json-devel
+BuildRequires:	nlohmann-json-devel >= 3.11.2
 BuildRequires:	pango-devel
 BuildRequires:	pixman-devel
 BuildRequires:	pkgconfig
@@ -36,16 +37,16 @@ BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	wayland-devel
 BuildRequires:	wayland-protocols >= 1.12
-BuildRequires:	wf-config-devel < 0.9.0
-BuildRequires:	wf-config-devel >= 0.8.0
+BuildRequires:	wf-config-devel < 0.10.0
+BuildRequires:	wf-config-devel >= 0.9.0
 BuildRequires:	wlroots-devel < 0.18.0
 BuildRequires:	wlroots-devel >= 0.17.0
 BuildRequires:	xorg-lib-libxkbcommon-devel
 BuildRequires:	xz
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	libinput >= 1.7.0
-Requires:	wf-config < 0.9.0
-Requires:	wf-config >= 0.8.0
+Requires:	wf-config < 0.10.0
+Requires:	wf-config >= 0.9.0
 Requires:	wlroots < 0.18.0
 Requires:	wlroots >= 0.17.0
 Suggests:	alacritty
@@ -91,8 +92,8 @@ Requires:	libstdc++-devel >= 6:9
 Requires:	pango-devel
 Requires:	pixman-devel
 Requires:	wayland-devel
-Requires:	wf-config-devel < 0.9.0
-Requires:	wf-config-devel >= 0.8.0
+Requires:	wf-config-devel < 0.10.0
+Requires:	wf-config-devel >= 0.9.0
 Requires:	wlroots-devel < 0.18.0
 Requires:	wlroots-devel >= 0.17.0
 
diff --git a/glm.patch b/glm.patch
index 368d6c0..15b1483 100644
--- a/glm.patch
+++ b/glm.patch
@@ -6,21 +6,26 @@
  glesv2         = dependency('glesv2')
 +glm = dependency('glm', modules: ['glm::glm-header-only'], required: false)
 +if not glm.found()
- glm            = dependency('glm')
+ glm            = dependency('glm', required: false)
 +endif
  libinput       = dependency('libinput', version: '>=1.7.0')
  pixman         = dependency('pixman-1')
- threads        = dependency('threads')
---- wayfire-0.8.0/subprojects/wf-touch/meson.build.orig	2021-03-19 15:56:39.000000000 +0100
-+++ wayfire-0.8.0/subprojects/wf-touch/meson.build	2024-06-29 00:16:24.536784735 +0200
-@@ -3,7 +3,10 @@
+ xkbcommon      = dependency('xkbcommon')
+--- wayfire-0.9.0/subprojects/wf-touch/meson.build.orig	2024-04-01 14:15:12.000000000 +0200
++++ wayfire-0.9.0/subprojects/wf-touch/meson.build	2024-10-11 13:19:24.416967488 +0200
+@@ -3,9 +3,12 @@
  		    meson_version: '>=0.47.0',
  		    default_options : ['cpp_std=c++17'])
  
+-glm = dependency('glm', required: false)
+-if not glm.found() and not meson.get_compiler('cpp').check_header('glm/glm.hpp')
+-  error('GLM not found, and directly using the header \'glm/glm.hpp\' is not possible.')
 +glm = dependency('glm', modules: ['glm::glm-header-only'], required: false)
 +if not glm.found()
- glm = dependency('glm')
-+endif
++  glm = dependency('glm', required: false)
++  if not glm.found() and not meson.get_compiler('cpp').check_header('glm/glm.hpp')
++    error('GLM not found, and directly using the header \'glm/glm.hpp\' is not possible.')
++  endif
+ endif
  
  wf_touch_inc_dirs = include_directories('.')
- install_headers([
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wayfire.git/commitdiff/38ae56a80ea2f056a164fa0907ada3677178adf9