From 2b2f431a0021b4787ca3c028cefb30ad81347778 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Jan 2024 20:08:27 +0000 Subject: gentoo auto-resync : 19:01:2024 - 20:08:27 --- gui-libs/wf-config/Manifest | 5 ++-- .../wf-config/files/wf-config-0.8.0-gcc14.patch | 31 ++++++++++++++++++++++ gui-libs/wf-config/wf-config-0.8.0.ebuild | 6 ++++- gui-libs/wf-config/wf-config-9999.ebuild | 2 +- 4 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 gui-libs/wf-config/files/wf-config-0.8.0-gcc14.patch (limited to 'gui-libs/wf-config') diff --git a/gui-libs/wf-config/Manifest b/gui-libs/wf-config/Manifest index 92a34d88249c..0fb15f879d5c 100644 --- a/gui-libs/wf-config/Manifest +++ b/gui-libs/wf-config/Manifest @@ -1,6 +1,7 @@ +AUX wf-config-0.8.0-gcc14.patch 1384 BLAKE2B f613694071da0b61a9044987b011becbb020f2ad1fe5aab3c91d5622619b050cc961b53f8b3250ee8bdb89ab0d0c504f0050f50ad485d9a1feccd8bfee8f00b2 SHA512 5ce79a063246d3ba38ff1ff6ac23810415a57189b17320cce89874fc1e59c1d1edb852d06fec99a191018687516a1928ed1144b78e99642d8ed8f3d9f31490a5 DIST wf-config-0.7.1.tar.xz 39120 BLAKE2B b18048334df12b002391fe4a74529cb61df76a0678c9052f8ac91d777e8a48dae46b87680fb44630ebfb9a350dbac36b15bc81850341fa4cd6299c12f6fa057d SHA512 d535a09a3465a54a607df7b8764ee6818ab8b83536d68c85167b282b95a176636e4bf5cda6c0d1638c07721a1f4208203e9d41b83675038fb590a535314df719 DIST wf-config-0.8.0.tar.xz 41200 BLAKE2B d56cd04c18c2cd8c0bac86493ad662244bde0e9cce1caf81d0fff34d9f2df2470c1aa8c95fead9e91dd5793d570b01dc6ef99b1986b8658b06ef93156a1526f8 SHA512 79cca2429a39ee81f853043698c57fc08025634926773253cff73fc564dcf203335b4b861d82b60a769bbab7b07be6a7e181c9ea29ad98ce930de20f9723893f EBUILD wf-config-0.7.1-r1.ebuild 809 BLAKE2B 9f67605ea19118594c5a1d4a7e908787b9731234efa01ed4dcf5957d4a8c7e2f2dab90983e3b45a9a760ac2a0bbc7873ef09cc04c1247e326f0cf5a19e51de46 SHA512 0c48c0fc68edb3aab37eec47058db82434b3ce970b473927067aa94d274360faa5a871857466d4df54aaec138a7e13d371c54ef59af2e598498e8a15dccb317f -EBUILD wf-config-0.8.0.ebuild 903 BLAKE2B 14d1bfd040fcd566c009f24321aa5a2d143a795852ce7812c087b94d6c7c970a8755b89fb489f73d42b46728d497172d3b7ea421391a59b46311bf265387e8e7 SHA512 82be0c1a9e66fa71a5bb37396dfa4a2da0e515a657993f48c57360f2cee7c3261b7db4e0d5bbe995e35f9e2c84ccc155a1752872aaad5e716d389f8f0ff00d80 -EBUILD wf-config-9999.ebuild 903 BLAKE2B 14d1bfd040fcd566c009f24321aa5a2d143a795852ce7812c087b94d6c7c970a8755b89fb489f73d42b46728d497172d3b7ea421391a59b46311bf265387e8e7 SHA512 82be0c1a9e66fa71a5bb37396dfa4a2da0e515a657993f48c57360f2cee7c3261b7db4e0d5bbe995e35f9e2c84ccc155a1752872aaad5e716d389f8f0ff00d80 +EBUILD wf-config-0.8.0.ebuild 959 BLAKE2B 35328df5e86e32130eda748052cc06a4657067fd3ebf4d06b75f777b328397ffd0889ddf428de1e2ae7334013c6ebd3141368a53158cb4535f7bb8ac2acec242 SHA512 5782de87780a663783420163950e40adb1ba29e1ba96bc7d57eee951f6787b65c63c6b19d6c1972022eff18d14b46bafa76c2d9517acdf6612a9087e535592ec +EBUILD wf-config-9999.ebuild 903 BLAKE2B c4612bc2f5a3e3715855c5a50d81935e887b0bf5c6b54f86b1ab3081b78e1de12955bc65322e49cad9ffcabc78e2acfa24166b0eada426f2c44885cfa65d5662 SHA512 fbfd146303c215107751ea179a425c5be25c5810c237d610b12a9ae037ad27417ab601c2072b006f1bba82db60d14accf7405ce2182c70e7d03e8fa301a058d2 MISC metadata.xml 507 BLAKE2B 503103e40f0527b6593821f4170bf58d7077d6d32096cb71d125ed88ac768c341b089a6d7c173797aa4604e6450f9c9716fb4122d8d499b67f1067f75d3c60a0 SHA512 122c9699e3a22be6d91680ac303d09b9614313345f11a9a3a344c4064fecede8107f3b891c9e04bb19479aeed846beb18355803dc41b2052a81fb6c016c25f5f 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 +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 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 +--- a/src/file.cpp ++++ b/src/file.cpp +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + + #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..7b926700d33b 100644 --- a/gui-libs/wf-config/wf-config-0.8.0.ebuild +++ b/gui-libs/wf-config/wf-config-0.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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) diff --git a/gui-libs/wf-config/wf-config-9999.ebuild b/gui-libs/wf-config/wf-config-9999.ebuild index 4e970b7ae0aa..45a7d00fb05c 100644 --- a/gui-libs/wf-config/wf-config-9999.ebuild +++ b/gui-libs/wf-config/wf-config-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -- cgit v1.2.3