[gentoo-commits] repo/gentoo:master commit in: gui-libs/wf-config/files/, gui-libs/wf-config/

[gentoo-commits] repo/gentoo:master commit in: gui-libs/wf-config/files/, gui-libs/wf-config/

[Ben Kohler]

commit:     b1e59a56bd5f2d82a62f66650d21723e14ceee0d
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Thu Dec 21 13:20:38 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Jan 19 13:55:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1e59a56

gui-libs/wf-config: add gcc-14 fix

Closes: https://bugs.gentoo.org/916995
Thanks-to: Kostadin Shishmanov <kocelfc <AT> tutanota.com>
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 .../wf-config/files/wf-config-0.8.0-gcc14.patch    | 31 ++++++++++++++++++++++
 gui-libs/wf-config/wf-config-0.8.0.ebuild          |  4 +++
 2 files changed, 35 insertions(+)

diff --git a/gui-libs/wf-config/files/wf-config-0.8.0-gcc14.patch b/gui-libs/wf-config/files/wf-config-0.8.0-gcc14.patch
new file mode 100644
index 000000000000..4fad0e5a8e2d
--- /dev/null
+++ b/gui-libs/wf-config/files/wf-config-0.8.0-gcc14.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/916995
+https://github.com/WayfireWM/wf-config/pull/64
+https://github.com/WayfireWM/wf-config/commit/af1bddc9d7191b9902edcb4c74572eac65577806
+
+From af1bddc9d7191b9902edcb4c74572eac65577806 Mon Sep 17 00:00:00 2001
+From: Kostadin <kocelfc@tutanota.com>
+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 <kocelfc@tutanota.com>
+--- 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/gui-libs/wf-config/wf-config-0.8.0.ebuild b/gui-libs/wf-config/wf-config-0.8.0.ebuild
index 4e970b7ae0aa..1af2fe782930 100644
--- a/gui-libs/wf-config/wf-config-0.8.0.ebuild
+++ b/gui-libs/wf-config/wf-config-0.8.0.ebuild
@@ -34,6 +34,10 @@ BDEPEND="
 	test? ( dev-cpp/doctest )
 "
 
+PATCHES=(
+	"${FILESDIR}/wf-config-0.8.0-gcc14.patch"
+)
+
 src_configure() {
 	local emesonargs=(
 		$(meson_feature test tests)

[gentoo-commits] repo/gentoo:master commit in: gui-libs/wf-config/files/, gui-libs/wf-config/

[Viorel Munteanu]

commit:     b7f2650e0405b5425ff78d5c57df839766badf64
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  1 09:38:25 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Nov  1 09:45:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7f2650e

gui-libs/wf-config: drop 0.8.0

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 gui-libs/wf-config/Manifest                        |  1 -
 .../wf-config/files/wf-config-0.8.0-gcc14.patch    | 31 --------------
 gui-libs/wf-config/wf-config-0.8.0.ebuild          | 48 ----------------------
 3 files changed, 80 deletions(-)

diff --git a/gui-libs/wf-config/Manifest b/gui-libs/wf-config/Manifest
index 46036984214c..5f81b41fa159 100644
--- a/gui-libs/wf-config/Manifest
+++ b/gui-libs/wf-config/Manifest
@@ -1,2 +1 @@
-DIST wf-config-0.8.0.tar.xz 41200 BLAKE2B d56cd04c18c2cd8c0bac86493ad662244bde0e9cce1caf81d0fff34d9f2df2470c1aa8c95fead9e91dd5793d570b01dc6ef99b1986b8658b06ef93156a1526f8 SHA512 79cca2429a39ee81f853043698c57fc08025634926773253cff73fc564dcf203335b4b861d82b60a769bbab7b07be6a7e181c9ea29ad98ce930de20f9723893f
 DIST wf-config-0.9.0.tar.xz 42612 BLAKE2B 5f3b529f829f6fc6bdfe974633467707bba501eddca1a9d32f62c1d4ea6398e74ae9bc6f970de821e81fe7fbc4a26b77611587c637ab1961898084571b073ead SHA512 ac2ca69b7d96b9b145a4789f004705a2d7b323e6724e429a1e5a4544cd56828165a01f48a9863ceb92004c51c8f05729468f4a32c37545716f8d537d39e3236b

diff --git a/gui-libs/wf-config/files/wf-config-0.8.0-gcc14.patch b/gui-libs/wf-config/files/wf-config-0.8.0-gcc14.patch
deleted file mode 100644
index 4fad0e5a8e2d..000000000000
--- a/gui-libs/wf-config/files/wf-config-0.8.0-gcc14.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bugs.gentoo.org/916995
-https://github.com/WayfireWM/wf-config/pull/64
-https://github.com/WayfireWM/wf-config/commit/af1bddc9d7191b9902edcb4c74572eac65577806
-
-From af1bddc9d7191b9902edcb4c74572eac65577806 Mon Sep 17 00:00:00 2001
-From: Kostadin <kocelfc@tutanota.com>
-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 <kocelfc@tutanota.com>
---- 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/gui-libs/wf-config/wf-config-0.8.0.ebuild b/gui-libs/wf-config/wf-config-0.8.0.ebuild
deleted file mode 100644
index 18fc511a6c83..000000000000
--- a/gui-libs/wf-config/wf-config-0.8.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="library for managing wayfire configuration files"
-HOMEPAGE="https://github.com/WayfireWM/wf-config"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/WayfireWM/wf-config.git"
-	SLOT="0/9999"
-else
-	SRC_URI="https://github.com/WayfireWM/wf-config/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-	SLOT="0/$(ver_cut 1-2)"
-fi
-
-LICENSE="MIT"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/libevdev
-	dev-libs/libxml2
-	media-libs/glm
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/wayland-protocols
-	virtual/pkgconfig
-	test? ( dev-cpp/doctest )
-"
-
-PATCHES=(
-	"${FILESDIR}/wf-config-0.8.0-gcc14.patch"
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature test tests)
-		-Dlocale_test=false # requires de_DE locale to be installed
-	)
-
-	meson_src_configure
-}