[packages/wf-config] make it explicit that header only GLM is needed
atler
atler at pld-linux.org
Thu May 30 20:12:12 CEST 2024
commit 091439c0fd765c0dff6b026d8c4e3d04a182ded0
Author: Jan Palus <atler at pld-linux.org>
Date: Thu May 30 19:52:33 2024 +0200
make it explicit that header only GLM is needed
otherwise libglm.so lands in linker arguments although nothing actually
requires GLM package that ships it
glm.patch | 15 +++++++++++++++
wf-config.spec | 2 ++
2 files changed, 17 insertions(+)
---
diff --git a/wf-config.spec b/wf-config.spec
index 22dbeac..be692cd 100644
--- a/wf-config.spec
+++ b/wf-config.spec
@@ -13,6 +13,7 @@ Group: Libraries
Source0: https://github.com/WayfireWM/wf-config/releases/download/v%{version}/%{name}-%{version}.tar.xz
# Source0-md5: 633cd902c2c889ae02c6ffeef8b44357
Patch0: gcc14.patch
+Patch1: glm.patch
URL: https://wayfire.org/
BuildRequires: GLM-devel >= 0.9.9.9
BuildRequires: cmake
@@ -65,6 +66,7 @@ Biblioteka statyczna wf-config.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%meson build \
diff --git a/glm.patch b/glm.patch
new file mode 100644
index 0000000..705b36d
--- /dev/null
+++ b/glm.patch
@@ -0,0 +1,15 @@
+--- wf-config-0.8.0/meson.build.orig 2023-08-08 17:16:59.000000000 +0200
++++ wf-config-0.8.0/meson.build 2024-05-30 19:46:15.443026569 +0200
+@@ -13,7 +13,11 @@
+
+ add_project_arguments(['-Wno-deprecated-declarations'], language: ['cpp'])
+
+-glm = dependency('glm')
++glm = dependency('glm', modules: ['glm::glm-header-only'], required: false)
++if not glm.found()
++ glm = dependency('glm')
++endif
++
+ evdev = dependency('libevdev')
+ libxml2 = dependency('libxml-2.0')
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wf-config.git/commitdiff/091439c0fd765c0dff6b026d8c4e3d04a182ded0
More information about the pld-cvs-commit
mailing list