commit 22d57a59318db49473007cd8d31504818b49f1a9
Author: Jan Palus <[email protected]>
Date: Fri Oct 11 13:49:55 2024 +0200
up to 0.9.0
gcc14.patch | 33 ---------------------------------
glm.patch | 21 ++++++++++++---------
wf-config.spec | 10 ++++------
3 files changed, 16 insertions(+), 48 deletions(-)
---
diff --git a/wf-config.spec b/wf-config.spec
index be692cd..1a14538 100644
--- a/wf-config.spec
+++ b/wf-config.spec
@@ -5,15 +5,14 @@
Summary: A library for managing configuration files, written for wayfire
Summary(pl.UTF-8): Napisana dla wayfire biblioteka do zarządzania plikami
konfiguracyjnymi
Name: wf-config
-Version: 0.8.0
-Release: 3
+Version: 0.9.0
+Release: 1
License: MIT
Group: Libraries
#Source0Download: https://github.com/WayfireWM/wf-config/releases
Source0:
https://github.com/WayfireWM/wf-config/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 633cd902c2c889ae02c6ffeef8b44357
-Patch0: gcc14.patch
-Patch1: glm.patch
+# Source0-md5: 8710cf36c1d55958fbb5eb7bfa942c18
+Patch0: glm.patch
URL: https://wayfire.org/
BuildRequires: GLM-devel >= 0.9.9.9
BuildRequires: cmake
@@ -66,7 +65,6 @@ Biblioteka statyczna wf-config.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%meson build \
diff --git a/gcc14.patch b/gcc14.patch
deleted file mode 100644
index be8d95d..0000000
--- a/gcc14.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From af1bddc9d7191b9902edcb4c74572eac65577806 Mon Sep 17 00:00:00 2001
-From: Kostadin <[email protected]>
-Date: Tue, 7 Nov 2023 16:41:55 +0200
-Subject: [PATCH] Fix build with gcc 14 (#64)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix building with gcc 14 by adding #include <algorithm> to src/file.cpp
-
-FAILED: libwf-config.so.0.9.0.p/src_file.cpp.o
-ccache c++ -Ilibwf-config.so.0.9.0.p -I. -I.. -Iinclude -I../include
-I/usr/include/libevdev-1.0 -I/usr/include/libxml2 -fdiagnostics-color=always
-D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c++17 -O0 -g
-Wno-deprecated-declarations -fPIC -MD -MQ
libwf-config.so.0.9.0.p/src_file.cpp.o -MF
libwf-config.so.0.9.0.p/src_file.cpp.o.d -o
libwf-config.so.0.9.0.p/src_file.cpp.o -c ../src/file.cpp ../src/file.cpp: In
lambda function:
-../src/file.cpp:419:25: error: ‘any_of’ is not a member of ‘std’
- 419 | return std::any_of(
- | ^~~~~~
-
-Signed-off-by: Kostadin Shishmanov <[email protected]>
----
- src/file.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/file.cpp b/src/file.cpp
-index c974738..704b600 100644
---- a/src/file.cpp
-+++ b/src/file.cpp
-@@ -7,6 +7,7 @@
- #include <fstream>
- #include <cassert>
- #include <set>
-+#include <algorithm>
-
- #include "option-impl.hpp"
-
diff --git a/glm.patch b/glm.patch
index 705b36d..2340246 100644
--- a/glm.patch
+++ b/glm.patch
@@ -1,15 +1,18 @@
---- 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 @@
+--- wf-config-0.9.0/meson.build.orig 2024-06-19 09:15:48.000000000 +0200
++++ wf-config-0.9.0/meson.build 2024-10-11 12:39:28.437734730 +0200
+@@ -13,9 +13,12 @@
add_project_arguments(['-Wno-deprecated-declarations'], language: ['cpp'])
--glm = dependency('glm')
+-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
-+
- evdev = dependency('libevdev')
- libxml2 = dependency('libxml-2.0')
++ 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
+ evdev = dependency('libevdev')
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wf-config.git/commitdiff/22d57a59318db49473007cd8d31504818b49f1a9
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
