* [PR PATCH] fmt: update to 9.0.0.
@ 2022-08-26 5:00 skmpz
2022-08-26 10:18 ` [PR REVIEW] " atweiden
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: skmpz @ 2022-08-26 5:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 973 bytes --]
There is a new pull request by skmpz against master on the void-packages repository
https://github.com/skmpz/void-packages fmt-9.0
https://github.com/void-linux/void-packages/pull/38916
fmt: update to 9.0.0.
[ci skip]
Packages bumped and status:
- [x] 0ad: revbumped, built for all archs
- [x] Bear: update to 3.0.20, built for all archs
- [x] cherrytree: revbumped, built for all archs
- [x] coeurl: revbumped, built for all archs
- [ ] cryfs: update to 0.11.2, patches modified (needs boost > 1.75.0)
- [x] easyeffects: revbumped, built for all archs
- [ ] gerbera FAIL (patch exists in fedora https://src.fedoraproject.org/rpms/gerbera/c/a8da0bc1cc4c68b0601594aef95e50aaf818add3?branch=rawhide)
- [ ] gnuradio (works with patch)
- [ ] kodi
- [ ] MangoHud
- [ ] mkvtoolnix
- [ ] mpd
- [ ] mtxclient
- [ ] nheko
- [ ] spdlog
- [ ] Waybar (works with patch)
A patch file from https://github.com/void-linux/void-packages/pull/38916.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-9.0-38916.patch --]
[-- Type: text/x-diff, Size: 32594 bytes --]
From 9f25fc3a51b1fa1af45a8eadecd49a54237d34df Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 01/17] 0ad: revbump for fmt 9.0
---
srcpkgs/0ad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 552d2728a7a0..b9f0751c4836 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.25b
-revision=3
+revision=4
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
wrksrc="${pkgname}-${version}-alpha"
hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
From 5711e3983a479adb8fca51af375e2e75ccdeae16 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 02/17] Bear: update to 3.0.20.
---
srcpkgs/Bear/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index fce6309ca6fa..c6c1fb6e9c38 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
-version=3.0.19
-revision=2
+version=3.0.20
+revision=1
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later"
homepage="https://github.com/rizsotto/Bear"
distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=2fcfe2c6e029182cfc54ed26b3505c0ef12b0f43df03fb587f335afdc2ca9431
+checksum=45cfcdab07f824f6c06c9776701156f7a04b23eadd25ecbc88c188789a447cc7
conflicts="interception-tools>=0" # /usr/bin/intercept
if [ -z "$XBPS_CHECK_PKGS" ]; then
From 76429fe05886c7c2e1fd4da85a441df55369265d Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 03/17] cherrytree: revbump for fmt 9.0
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 55512e3b5ef7..e52a677a47b5 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=0.99.39
-revision=2
+revision=3
wrksrc="${pkgname}_${version}"
build_style=cmake
hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
From eeb0d50ca1594cea59be0892ab717a7c6d4601f3 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 04/17] coeurl: revbump for fmt 9.0
---
srcpkgs/coeurl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index d0dbcbc60ba0..a9f2dfbbc123 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,7 +1,7 @@
# Template file for 'coeurl'
pkgname=coeurl
version=0.1.1
-revision=1
+revision=2
wrksrc=coeurl-v${version}
build_style=meson
hostmakedepends="pkg-config"
From 543779e5494cf9254684a94a752886f54e12f3ae Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 05/17] cryfs: update to 0.11.2, update patches
---
.../cryfs/patches/allow-build-type-none.patch | 33 -----
srcpkgs/cryfs/patches/de-vendor.patch | 134 +++++++-----------
srcpkgs/cryfs/patches/fix-test.patch | 22 ---
srcpkgs/cryfs/patches/fmt-9-fix.patch | 54 +++++++
.../rename-simple-to-basic-filesink.patch | 21 ---
srcpkgs/cryfs/patches/spdlog-include.patch | 33 -----
srcpkgs/cryfs/template | 13 +-
7 files changed, 109 insertions(+), 201 deletions(-)
delete mode 100644 srcpkgs/cryfs/patches/allow-build-type-none.patch
delete mode 100644 srcpkgs/cryfs/patches/fix-test.patch
create mode 100644 srcpkgs/cryfs/patches/fmt-9-fix.patch
delete mode 100644 srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
delete mode 100644 srcpkgs/cryfs/patches/spdlog-include.patch
diff --git a/srcpkgs/cryfs/patches/allow-build-type-none.patch b/srcpkgs/cryfs/patches/allow-build-type-none.patch
deleted file mode 100644
index e591974c05f4..000000000000
--- a/srcpkgs/cryfs/patches/allow-build-type-none.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: cryfs-0.10.2/doc/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/doc/CMakeLists.txt
-+++ cryfs-0.10.2/doc/CMakeLists.txt
-@@ -15,6 +15,5 @@ ELSE (WIN32)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cryfs.1.gz
- DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
-- CONFIGURATIONS Release
- )
- ENDIF(WIN32)
-Index: cryfs-0.10.2/src/cryfs-cli/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-cli/CMakeLists.txt
-+++ cryfs-0.10.2/src/cryfs-cli/CMakeLists.txt
-@@ -27,6 +27,5 @@ target_enable_style_warnings(${PROJECT_N
- target_activate_cpp14(${PROJECT_NAME}_bin)
-
- install(TARGETS ${PROJECT_NAME}_bin
-- CONFIGURATIONS Debug Release RelWithDebInfo
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
-Index: cryfs-0.10.2/src/cryfs-unmount/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-unmount/CMakeLists.txt
-+++ cryfs-0.10.2/src/cryfs-unmount/CMakeLists.txt
-@@ -19,6 +19,5 @@ target_enable_style_warnings(${PROJECT_N
- target_activate_cpp14(${PROJECT_NAME}_bin)
-
- install(TARGETS ${PROJECT_NAME}_bin
-- CONFIGURATIONS Debug Release RelWithDebInfo
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
diff --git a/srcpkgs/cryfs/patches/de-vendor.patch b/srcpkgs/cryfs/patches/de-vendor.patch
index 4909cad7b84a..09e51f0aa7fc 100644
--- a/srcpkgs/cryfs/patches/de-vendor.patch
+++ b/srcpkgs/cryfs/patches/de-vendor.patch
@@ -1,32 +1,14 @@
-Index: cryfs-0.10.2/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-+++ cryfs-0.10.2/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-@@ -1,6 +1,6 @@
- #include "cpp-utils/crypto/cryptopp_byte.h"
+--- a/src/blockstore/implementations/compressing/compressors/Gzip.cpp 2022-08-25 22:14:05.481898162 +0400
++++ b/src/blockstore/implementations/compressing/compressors/Gzip.cpp 2022-08-25 22:17:49.606653292 +0400
+@@ -1,5 +1,5 @@
#include "Gzip.h"
-#include <vendor_cryptopp/gzip.h>
+#include <cryptopp/gzip.h>
using cpputils::Data;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/cryptopp_byte.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/cryptopp_byte.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/cryptopp_byte.h
-@@ -2,7 +2,7 @@
- #ifndef _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
- #define _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
-
--#include <vendor_cryptopp/cryptlib.h>
-+#include <cryptopp/cryptlib.h>
-
- // If we're running an older CryptoPP version, CryptoPP::byte isn't defined yet.
- // Define it. Refer to "byte" type in the global namespace (placed by CryptoPP).
-Index: cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/hash/Hash.cpp
-+++ cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
+--- a/src/cpp-utils/crypto/hash/Hash.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/hash/Hash.cpp 2022-08-25 22:18:07.131800277 +0400
@@ -1,6 +1,6 @@
#include "Hash.h"
#include <cpp-utils/random/Random.h>
@@ -35,10 +17,8 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
using cpputils::Random;
using CryptoPP::SHA512;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/kdf/Scrypt.cpp
-+++ cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
+--- a/src/cpp-utils/crypto/kdf/Scrypt.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/kdf/Scrypt.cpp 2022-08-25 22:18:17.754889373 +0400
@@ -1,5 +1,5 @@
#include "Scrypt.h"
-#include <vendor_cryptopp/scrypt.h>
@@ -46,11 +26,9 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
using std::string;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-@@ -7,7 +7,7 @@
+--- a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h 2022-08-25 22:18:28.524979704 +0400
+@@ -6,7 +6,7 @@
#include "../../data/Data.h"
#include "../../random/Random.h"
#include <boost/optional.hpp>
@@ -59,24 +37,9 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
#include "Cipher.h"
#include "EncryptionKey.h"
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-@@ -6,7 +6,7 @@
- #include "../../data/FixedSizeData.h"
- #include "../../data/Data.h"
- #include "../../random/Random.h"
--#include <vendor_cryptopp/gcm.h>
-+#include <cryptopp/gcm.h>
- #include "Cipher.h"
- #include "EncryptionKey.h"
-
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/ciphers.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-@@ -2,11 +2,11 @@
+--- a/src/cpp-utils/crypto/symmetric/ciphers.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/ciphers.h 2022-08-25 22:18:52.181178110 +0400
+@@ -2,12 +2,12 @@
#ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
#define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
@@ -85,30 +48,39 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-#include <vendor_cryptopp/serpent.h>
-#include <vendor_cryptopp/cast.h>
-#include <vendor_cryptopp/mars.h>
+-#include <vendor_cryptopp/chachapoly.h>
+#include <cryptopp/aes.h>
+#include <cryptopp/twofish.h>
+#include <cryptopp/serpent.h>
+#include <cryptopp/cast.h>
+#include <cryptopp/mars.h>
++#include <cryptopp/chachapoly.h>
#include "GCM_Cipher.h"
#include "CFB_Cipher.h"
-Index: cryfs-0.10.2/src/cpp-utils/data/Data.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/data/Data.cpp
-+++ cryfs-0.10.2/src/cpp-utils/data/Data.cpp
+--- a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h 2022-08-25 22:18:38.836066183 +0400
+@@ -3,7 +3,7 @@
+ #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_GCMCIPHER_H_
+
+ #include "AEAD_Cipher.h"
+-#include <vendor_cryptopp/gcm.h>
++#include <cryptopp/gcm.h>
+
+ namespace cpputils {
+
+--- a/src/cpp-utils/data/Data.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/data/Data.cpp 2022-08-25 22:19:09.349322106 +0400
@@ -1,6 +1,6 @@
#include "Data.h"
#include <stdexcept>
-#include <vendor_cryptopp/hex.h>
+#include <cryptopp/hex.h>
- #include <cpp-utils/crypto/cryptopp_byte.h>
using std::istream;
-Index: cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/data/FixedSizeData.h
-+++ cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
+ using std::ofstream;
+--- a/src/cpp-utils/data/FixedSizeData.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/data/FixedSizeData.h 2022-08-25 22:19:19.103403916 +0400
@@ -2,7 +2,7 @@
#ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
#define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
@@ -116,25 +88,21 @@ Index: cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
-#include <vendor_cryptopp/hex.h>
+#include <cryptopp/hex.h>
#include <string>
+ #include <array>
#include <cstring>
- #include "../assert/assert.h"
-Index: cryfs-0.10.2/src/cpp-utils/random/OSRandomGenerator.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/random/OSRandomGenerator.h
-+++ cryfs-0.10.2/src/cpp-utils/random/OSRandomGenerator.h
-@@ -4,7 +4,7 @@
+--- a/src/cpp-utils/random/OSRandomGenerator.h 2022-08-25 22:14:05.483898156 +0400
++++ b/src/cpp-utils/random/OSRandomGenerator.h 2022-08-25 22:19:29.602491973 +0400
+@@ -3,7 +3,7 @@
+ #define MESSMER_CPPUTILS_RANDOM_OSRANDOMGENERATOR_H
- #include "cpp-utils/crypto/cryptopp_byte.h"
#include "RandomGenerator.h"
-#include <vendor_cryptopp/osrng.h>
+#include <cryptopp/osrng.h>
namespace cpputils {
class OSRandomGenerator final : public RandomGenerator {
-Index: cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/random/RandomGeneratorThread.h
-+++ cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
+--- a/src/cpp-utils/random/RandomGeneratorThread.h 2022-08-25 22:14:05.484898153 +0400
++++ b/src/cpp-utils/random/RandomGeneratorThread.h 2022-08-25 22:19:36.713551613 +0400
@@ -4,7 +4,7 @@
#include "../thread/LoopThread.h"
@@ -144,10 +112,9 @@ Index: cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
namespace cpputils {
//TODO Test
-Index: cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs/localstate/BasedirMetadata.cpp
-+++ cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
+diff -Naurp0 -U3 cryfs-0.11.2/src/cryfs/impl/localstate/BasedirMetadata.cpp cryfs-0.11.2-mine/src/cryfs/impl/localstate/BasedirMetadata.cpp
+--- a/src/cryfs/impl/localstate/BasedirMetadata.cpp 2022-08-25 22:14:05.487898144 +0400
++++ b/src/cryfs/impl/localstate/BasedirMetadata.cpp 2022-08-25 22:19:46.722635560 +0400
@@ -1,7 +1,7 @@
#include "BasedirMetadata.h"
#include <boost/property_tree/ptree.hpp>
@@ -157,11 +124,9 @@ Index: cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
#include <boost/filesystem/operations.hpp>
#include "LocalStateDir.h"
#include <cpp-utils/logging/logging.h>
-Index: cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
-===================================================================
---- cryfs-0.10.2.orig/test/cryfs/config/CompatibilityTest.cpp
-+++ cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
-@@ -3,7 +3,7 @@
+--- a/test/cryfs/impl/config/CompatibilityTest.cpp 2022-08-25 22:14:05.493898126 +0400
++++ b/test/cryfs/impl/config/CompatibilityTest.cpp 2022-08-25 22:19:54.589701542 +0400
+@@ -2,7 +2,7 @@
#include <vector>
#include <boost/filesystem.hpp>
#include <cpp-utils/data/Data.h>
@@ -169,12 +134,9 @@ Index: cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
+#include <cryptopp/hex.h>
#include <cpp-utils/crypto/symmetric/ciphers.h>
#include <cpp-utils/tempfile/TempFile.h>
- #include <cryfs/config/CryConfigFile.h>
-Index: cryfs-0.10.2/vendor/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/vendor/CMakeLists.txt
-+++ cryfs-0.10.2/vendor/CMakeLists.txt
-@@ -1,3 +1 @@
+ #include <cryfs/impl/config/CryConfigFile.h>
+--- a/vendor/CMakeLists.txt 2022-08-25 22:14:05.497898115 +0400
++++ b/vendor/CMakeLists.txt 2022-08-25 22:20:11.176840657 +0400
+@@ -1,2 +1 @@
add_subdirectory(googletest)
--add_subdirectory(spdlog)
-add_subdirectory(cryptopp)
diff --git a/srcpkgs/cryfs/patches/fix-test.patch b/srcpkgs/cryfs/patches/fix-test.patch
deleted file mode 100644
index d3a5847b1a3c..000000000000
--- a/srcpkgs/cryfs/patches/fix-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: cryfs-0.10.2/test/cpp-utils/logging/testutils/LoggingTest.h
-===================================================================
---- cryfs-0.10.2.orig/test/cpp-utils/logging/testutils/LoggingTest.h
-+++ cryfs-0.10.2/test/cpp-utils/logging/testutils/LoggingTest.h
-@@ -11,8 +11,7 @@ class MockLogger final {
- public:
- MockLogger():
- _capturedLogData(),
-- _sink(std::make_shared<spdlog::sinks::ostream_sink<std::mutex>>(_capturedLogData, true)),
-- _logger(spdlog::create("MockLogger", {_sink})) {
-+ _logger(spdlog::create<spdlog::sinks::ostream_sink_mt>("MockLogger", _capturedLogData, true)) {
- }
-
- ~MockLogger() {
-@@ -28,7 +27,6 @@ public:
- }
- private:
- std::ostringstream _capturedLogData;
-- std::shared_ptr<spdlog::sinks::ostream_sink<std::mutex>> _sink;
- std::shared_ptr<spdlog::logger> _logger;
- };
-
diff --git a/srcpkgs/cryfs/patches/fmt-9-fix.patch b/srcpkgs/cryfs/patches/fmt-9-fix.patch
new file mode 100644
index 000000000000..6fe97eaeafa4
--- /dev/null
+++ b/srcpkgs/cryfs/patches/fmt-9-fix.patch
@@ -0,0 +1,54 @@
+From 27515e0116fd7cb034bd4e9763d1f3bfdc855a5f Mon Sep 17 00:00:00 2001
+From: Bernhard Rosenkraenzer <bero@lindev.ch>
+Date: Fri, 22 Jul 2022 14:13:38 +0200
+Subject: [PATCH] Fix build with fmt 9.0 (#433)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Fix build with fmt 9.0
+
+Co-authored-by: Sebastian Meßmer <smessmer@users.noreply.github.com>
+---
+ ChangeLog.txt | 4 ++++
+ src/fspp/fuse/Fuse.cpp | 8 ++++----
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/fspp/fuse/Fuse.cpp b/src/fspp/fuse/Fuse.cpp
+index 4e9dbd7f..4b881815 100644
+--- a/src/fspp/fuse/Fuse.cpp
++++ b/src/fspp/fuse/Fuse.cpp
+@@ -603,21 +603,21 @@ int Fuse::mknod(const bf::path &path, ::mode_t mode, dev_t rdev) {
+ UNUSED(mode);
+ UNUSED(path);
+ ThreadNameForDebugging _threadName("mknod");
+- LOG(WARN, "Called non-implemented mknod({}, {}, _)", path, mode);
++ LOG(WARN, "Called non-implemented mknod({}, {}, _)", path.string(), mode);
+ return ENOSYS;
+ }
+
+ int Fuse::mkdir(const bf::path &path, ::mode_t mode) {
+ ThreadNameForDebugging _threadName("mkdir");
+ #ifdef FSPP_LOG
+- LOG(DEBUG, "mkdir({}, {})", path, mode);
++ LOG(DEBUG, "mkdir({}, {})", path.string(), mode);
+ #endif
+ try {
+ ASSERT(is_valid_fspp_path(path), "has to be an absolute path");
+ // DokanY seems to call mkdir("/"). Ignore that
+ if ("/" == path) {
+ #ifdef FSPP_LOG
+- LOG(DEBUG, "mkdir({}, {}): ignored", path, mode);
++ LOG(DEBUG, "mkdir({}, {}): ignored", path.string(), mode);
+ #endif
+ return 0;
+ }
+@@ -766,7 +766,7 @@ int Fuse::rename(const bf::path &from, const bf::path &to) {
+ //TODO
+ int Fuse::link(const bf::path &from, const bf::path &to) {
+ ThreadNameForDebugging _threadName("link");
+- LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from, to);
++ LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from.string(), to.string());
+ //auto real_from = _impl->RootDir() / from;
+ //auto real_to = _impl->RootDir() / to;
+ //int retstat = ::link(real_from.string().c_str(), real_to.string().c_str());
diff --git a/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch b/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
deleted file mode 100644
index 08513cb4d0ca..000000000000
--- a/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: cryfs-0.10.2/src/cryfs-cli/Cli.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-cli/Cli.cpp
-+++ cryfs-0.10.2/src/cryfs-cli/Cli.cpp
-@@ -27,6 +27,7 @@
- #include "Environment.h"
- #include <cryfs/CryfsException.h>
- #include <cpp-utils/thread/debugging.h>
-+#include <spdlog/sinks/basic_file_sink.h>
-
- //TODO Many functions accessing the ProgramOptions object. Factor out into class that stores it as a member.
- //TODO Factor out class handling askPassword
-@@ -310,7 +311,7 @@ namespace cryfs_cli {
- //TODO Test that --logfile parameter works. Should be: file if specified, otherwise stderr if foreground, else syslog.
- if (options.logFile() != none) {
- cpputils::logging::setLogger(
-- spdlog::create<spdlog::sinks::simple_file_sink<std::mutex>>("cryfs", options.logFile()->string()));
-+ spdlog::create<spdlog::sinks::basic_file_sink<std::mutex>>("cryfs", options.logFile()->string()));
- } else if (options.foreground()) {
- cpputils::logging::setLogger(spdlog::stderr_logger_mt("cryfs"));
- } else {
diff --git a/srcpkgs/cryfs/patches/spdlog-include.patch b/srcpkgs/cryfs/patches/spdlog-include.patch
deleted file mode 100644
index 2c1c5a926cf3..000000000000
--- a/srcpkgs/cryfs/patches/spdlog-include.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: cryfs-0.10.2/src/cpp-utils/logging/Logger.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/logging/Logger.h
-+++ cryfs-0.10.2/src/cpp-utils/logging/Logger.h
-@@ -7,6 +7,7 @@
- #endif
-
- #include <spdlog/spdlog.h>
-+#include <spdlog/sinks/stdout_sinks.h>
- #include "../macros.h"
-
- namespace cpputils {
-Index: cryfs-0.10.2/src/cpp-utils/logging/logging.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/logging/logging.h
-+++ cryfs-0.10.2/src/cpp-utils/logging/logging.h
-@@ -5,6 +5,7 @@
- #include "Logger.h"
- #include <stdexcept>
- #include <spdlog/fmt/ostr.h>
-+#include <spdlog/sinks/syslog_sink.h>
-
- #if defined(_MSC_VER)
- #include <spdlog/sinks/msvc_sink.h>
-@@ -75,7 +76,7 @@ namespace cpputils {
- #if defined(_MSC_VER)
- return spdlog::create<spdlog::sinks::msvc_sink_mt>(name);
- #else
-- return spdlog::syslog_logger(name, name, LOG_PID);
-+ return spdlog::syslog_logger_mt(name, name, LOG_PID);
- #endif
- }
- }
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 495c2b318a3b..9bc119867ce7 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,14 +1,15 @@
# Template file for 'cryfs'
pkgname=cryfs
-version=0.10.2
-revision=5
+version=0.11.2
+revision=1
create_wrksrc=yes
build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off
- -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
+configure_args="-DCRYFS_UPDATE_CHECKS=off -DBoost_USE_STATIC_LIBS=OFF
+ -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt
+ -DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
hostmakedepends="pkg-config python3"
makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
- spdlog"
+ spdlog range-v3"
depends="fuse"
short_desc="Cryptographic filesystem for the cloud"
maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
@@ -16,7 +17,7 @@ license="LGPL-3.0-only"
homepage="https://www.cryfs.org"
changelog="https://github.com/cryfs/cryfs/raw/master/ChangeLog.txt"
distfiles="https://github.com/cryfs/cryfs/releases/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=004c7fdf537062e197aaa0bcdafd2682904a279802441bb6063cb72c1fba52d2
+checksum=a89ab8fea2d494b496867107ec0a3772fe606ebd71ef12152fcd233f463a2c00
if [ "${XBPS_CHECK_PKGS}" ]; then
configure_args+=" -DBUILD_TESTING=on"
From 85d4da3b688b4d3107b7a1f01d8794f3c53d5de5 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 06/17] easyeffects: revbump for fmt 9.0
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index ac84ce15b068..0ddfb1b5833d 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=6.2.4
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel"
makedepends="gtkmm4-devel pipewire-devel zita-convolver-devel lilv-devel
From 8a4e23cdf9e6ef707c986b2cf52f6cece9dace37 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 07/17] gerbera: revbump for fmt 9.0
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 35136708b3e5..100b94a7acbe 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.11.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From af04d86acc4ebdd33f01a3874f4f59f492f9ce96 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 08/17] gnuradio: revbump for fmt 9.0
---
srcpkgs/gnuradio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 43ae4e1cb1ba..973339f92921 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.10.3.0
-revision=1
+revision=2
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
From 34ab502b87e95a694ff7c972a391310d30bf34e6 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 09/17] kodi: revbump for fmt 9.0
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index d3e9a13afdd5..4b6c9e1ade0c 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=19.4
-revision=3
+revision=4
_codename="Matrix"
wrksrc="xbmc-${version}-${_codename}"
build_style=cmake
From 01e3c364f8a8454b79e7c891cb6e4f5b1b401c25 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 10/17] MangoHud: revbump for fmt 9.0
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index a9973bcad30a..fb0e18c1a1f4 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -2,7 +2,7 @@
pkgname=MangoHud
version=0.6.7.1
_version="${version%.*}-${version##*.}"
-revision=2
+revision=3
wrksrc="MangoHud-v${_version}"
build_style=meson
configure_args="-Duse_system_vulkan=enabled -Dwith_xnvctrl=disabled
From d4cabb68abda4d28ecf8f69ff9c235edd0648540 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 11/17] mkvtoolnix: revbump for fmt 9.0
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index a1d2adbc4b3f..d98022773c0a 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=70.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From 8a7034b556e0f090ee829957c3d9ca634d1f984b Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 12/17] mpd: revbump for fmt 9.0
---
srcpkgs/mpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 98195b80a38d..b43c83fbb0f7 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
# Template file for 'mpd'
pkgname=mpd
version=0.23.8
-revision=1
+revision=2
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
-Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
From 6b1912fe31060879d8892ab748bc5bea94081e48 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 13/17] mtxclient: revbump for fmt 9.0
---
srcpkgs/mtxclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 4ec895656749..12fea54d3fd5 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.8.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From f1571672707f639c2ae8adfb26f6a6aa8a7c0fed Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 14/17] nheko: revbump for fmt 9.0
---
srcpkgs/nheko/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index f35fd3942116..8e41e9e1f2f0 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.10.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
From dc70aae5412c13495adbdc7c97fbd35fc71fee5c Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 15/17] spdlog: revbump for fmt 9.0
---
srcpkgs/spdlog/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 187ec0d0eb6e..ef1ee76ffcca 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
# Template file for 'spdlog'
pkgname=spdlog
version=1.10.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
-DSPDLOG_BUILD_SHARED=ON"
From 3f4e78b3fe220ab92d2acb004130997f09efeda5 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 16/17] Waybar: revbump for fmt 9.0
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 8ac3d4290b39..e40288e00b75 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.9.13
-revision=1
+revision=2
_date_version=3.0.0
build_style=meson
configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
From bd30a428a77b5695f81ca58546a0c183fb9d4474 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 20:49:38 +0400
Subject: [PATCH 17/17] fmt: update to 9.0.0.
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 61405afcb04b..3f7803a6b492 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3533,7 +3533,7 @@ libcotp.so.12 libcotp-1.2.1_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.8 fmt-8.0.1_1
+libfmt.so.9 fmt-9.0.0_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.25 libtls-3.5.2_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 35a914c75eab..6fa037dfbaab 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=8.1.1
+version=9.0.0
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,7 +10,7 @@ license="BSD-2-Clause"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=3d794d3cf67633b34b2771eb9f073bde87e846e0d395d254df7b211ef1ec7346
+checksum=9a1e0e9e843a356d65c7604e2c8bf9402b50fe294c355de0095ebd42fb9bd2c5
post_install() {
vlicense LICENSE.rst LICENSE
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR REVIEW] fmt: update to 9.0.0.
2022-08-26 5:00 [PR PATCH] fmt: update to 9.0.0 skmpz
@ 2022-08-26 10:18 ` atweiden
2022-08-26 10:21 ` atweiden
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: atweiden @ 2022-08-26 10:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 346 bytes --]
New review comment by atweiden on void-packages repository
https://github.com/void-linux/void-packages/pull/38916#discussion_r955895913
Comment:
IIRC range-v3 can be in `hostmakedepends`, because it’s only used for code generation.
See: https://github.com/JamiKettunen/void-packages/pull/1/commits/ffb2da4ad9046b31af3d4b599173287351b8cc3f
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR REVIEW] fmt: update to 9.0.0.
2022-08-26 5:00 [PR PATCH] fmt: update to 9.0.0 skmpz
2022-08-26 10:18 ` [PR REVIEW] " atweiden
@ 2022-08-26 10:21 ` atweiden
2022-08-26 10:33 ` atweiden
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: atweiden @ 2022-08-26 10:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 262 bytes --]
New review comment by atweiden on void-packages repository
https://github.com/void-linux/void-packages/pull/38916#discussion_r955898249
Comment:
IIRC, `-DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt` isn’t needed here unless you remove `fmt-devel` from `makedepends`.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR REVIEW] fmt: update to 9.0.0.
2022-08-26 5:00 [PR PATCH] fmt: update to 9.0.0 skmpz
2022-08-26 10:18 ` [PR REVIEW] " atweiden
2022-08-26 10:21 ` atweiden
@ 2022-08-26 10:33 ` atweiden
2022-08-26 10:42 ` atweiden
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: atweiden @ 2022-08-26 10:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 323 bytes --]
New review comment by atweiden on void-packages repository
https://github.com/void-linux/void-packages/pull/38916#discussion_r955907250
Comment:
I notice the cryfs template doesn’t have `fmt-devel` in `makedepends` presently. It probably should (see: https://github.com/cryfs/cryfs/issues/432#issuecomment-1183670141).
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR REVIEW] fmt: update to 9.0.0.
2022-08-26 5:00 [PR PATCH] fmt: update to 9.0.0 skmpz
` (2 preceding siblings ...)
2022-08-26 10:33 ` atweiden
@ 2022-08-26 10:42 ` atweiden
2022-08-26 16:26 ` [PR PATCH] [Updated] " skmpz
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: atweiden @ 2022-08-26 10:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
New review comment by atweiden on void-packages repository
https://github.com/void-linux/void-packages/pull/38916#discussion_r955913776
Comment:
I recall builds failing without `CXX_FLAGS="-pthread"` [here](https://github.com/JamiKettunen/void-packages/pull/1/commits/ffb2da4ad9046b31af3d4b599173287351b8cc3f#diff-bca5da9ef6beabdb4b700bca6f48e8bc58ebe29fb8c5a6ac5d02978daa7de000R22).
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] fmt: update to 9.0.0.
2022-08-26 5:00 [PR PATCH] fmt: update to 9.0.0 skmpz
` (3 preceding siblings ...)
2022-08-26 10:42 ` atweiden
@ 2022-08-26 16:26 ` skmpz
2022-09-01 1:36 ` [PR REVIEW] " sgn
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: skmpz @ 2022-08-26 16:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 827 bytes --]
There is an updated pull request by skmpz against master on the void-packages repository
https://github.com/skmpz/void-packages fmt-9.0
https://github.com/void-linux/void-packages/pull/38916
fmt: update to 9.0.0.
[ci skip]
Packages bumped and status:
- [x] 0ad: revbumped, built for all archs
- [x] Bear: update to 3.0.20, built for all archs
- [x] cherrytree: revbumped, built for all archs
- [x] coeurl: revbumped, built for all archs
- [ ] cryfs: update to 0.11.2, patches modified (needs boost > 1.75.0)
- [x] easyeffects: revbumped, built for all archs
- [ ] gerbera
- [ ] gnuradio (works with patch)
- [ ] kodi
- [ ] MangoHud
- [ ] mkvtoolnix
- [ ] mpd
- [ ] mtxclient
- [ ] nheko
- [ ] spdlog
- [ ] Waybar
A patch file from https://github.com/void-linux/void-packages/pull/38916.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-9.0-38916.patch --]
[-- Type: text/x-diff, Size: 34330 bytes --]
From 9c2237d50acfc53543e05d2a295b5c89cb1a6d1e Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 01/17] 0ad: revbump for fmt 9.0
---
srcpkgs/0ad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 552d2728a7a0..b9f0751c4836 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.25b
-revision=3
+revision=4
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
wrksrc="${pkgname}-${version}-alpha"
hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
From 9fd4376a253febcd4f4451f121f872b1911915ff Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 02/17] Bear: update to 3.0.20.
---
srcpkgs/Bear/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index fce6309ca6fa..c6c1fb6e9c38 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
-version=3.0.19
-revision=2
+version=3.0.20
+revision=1
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later"
homepage="https://github.com/rizsotto/Bear"
distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=2fcfe2c6e029182cfc54ed26b3505c0ef12b0f43df03fb587f335afdc2ca9431
+checksum=45cfcdab07f824f6c06c9776701156f7a04b23eadd25ecbc88c188789a447cc7
conflicts="interception-tools>=0" # /usr/bin/intercept
if [ -z "$XBPS_CHECK_PKGS" ]; then
From 943af7564cf770039ff816f8fa34672d61d1313a Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 03/17] cherrytree: revbump for fmt 9.0
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 55512e3b5ef7..e52a677a47b5 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=0.99.39
-revision=2
+revision=3
wrksrc="${pkgname}_${version}"
build_style=cmake
hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
From d97f4ddec7308928571d3599c058b91f74b14740 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 04/17] coeurl: revbump for fmt 9.0
---
srcpkgs/coeurl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index d0dbcbc60ba0..a9f2dfbbc123 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,7 +1,7 @@
# Template file for 'coeurl'
pkgname=coeurl
version=0.1.1
-revision=1
+revision=2
wrksrc=coeurl-v${version}
build_style=meson
hostmakedepends="pkg-config"
From ac22ec5ca9c0bcf59e293cba6c100813f3ea93ad Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 05/17] cryfs: update to 0.11.2, update patches
---
.../cryfs/patches/allow-build-type-none.patch | 33 -----
srcpkgs/cryfs/patches/de-vendor.patch | 134 +++++++-----------
srcpkgs/cryfs/patches/fix-test.patch | 22 ---
srcpkgs/cryfs/patches/fmt-9-fix.patch | 54 +++++++
.../rename-simple-to-basic-filesink.patch | 21 ---
srcpkgs/cryfs/patches/spdlog-include.patch | 33 -----
srcpkgs/cryfs/template | 13 +-
7 files changed, 109 insertions(+), 201 deletions(-)
delete mode 100644 srcpkgs/cryfs/patches/allow-build-type-none.patch
delete mode 100644 srcpkgs/cryfs/patches/fix-test.patch
create mode 100644 srcpkgs/cryfs/patches/fmt-9-fix.patch
delete mode 100644 srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
delete mode 100644 srcpkgs/cryfs/patches/spdlog-include.patch
diff --git a/srcpkgs/cryfs/patches/allow-build-type-none.patch b/srcpkgs/cryfs/patches/allow-build-type-none.patch
deleted file mode 100644
index e591974c05f4..000000000000
--- a/srcpkgs/cryfs/patches/allow-build-type-none.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: cryfs-0.10.2/doc/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/doc/CMakeLists.txt
-+++ cryfs-0.10.2/doc/CMakeLists.txt
-@@ -15,6 +15,5 @@ ELSE (WIN32)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cryfs.1.gz
- DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
-- CONFIGURATIONS Release
- )
- ENDIF(WIN32)
-Index: cryfs-0.10.2/src/cryfs-cli/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-cli/CMakeLists.txt
-+++ cryfs-0.10.2/src/cryfs-cli/CMakeLists.txt
-@@ -27,6 +27,5 @@ target_enable_style_warnings(${PROJECT_N
- target_activate_cpp14(${PROJECT_NAME}_bin)
-
- install(TARGETS ${PROJECT_NAME}_bin
-- CONFIGURATIONS Debug Release RelWithDebInfo
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
-Index: cryfs-0.10.2/src/cryfs-unmount/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-unmount/CMakeLists.txt
-+++ cryfs-0.10.2/src/cryfs-unmount/CMakeLists.txt
-@@ -19,6 +19,5 @@ target_enable_style_warnings(${PROJECT_N
- target_activate_cpp14(${PROJECT_NAME}_bin)
-
- install(TARGETS ${PROJECT_NAME}_bin
-- CONFIGURATIONS Debug Release RelWithDebInfo
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
diff --git a/srcpkgs/cryfs/patches/de-vendor.patch b/srcpkgs/cryfs/patches/de-vendor.patch
index 4909cad7b84a..09e51f0aa7fc 100644
--- a/srcpkgs/cryfs/patches/de-vendor.patch
+++ b/srcpkgs/cryfs/patches/de-vendor.patch
@@ -1,32 +1,14 @@
-Index: cryfs-0.10.2/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-+++ cryfs-0.10.2/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-@@ -1,6 +1,6 @@
- #include "cpp-utils/crypto/cryptopp_byte.h"
+--- a/src/blockstore/implementations/compressing/compressors/Gzip.cpp 2022-08-25 22:14:05.481898162 +0400
++++ b/src/blockstore/implementations/compressing/compressors/Gzip.cpp 2022-08-25 22:17:49.606653292 +0400
+@@ -1,5 +1,5 @@
#include "Gzip.h"
-#include <vendor_cryptopp/gzip.h>
+#include <cryptopp/gzip.h>
using cpputils::Data;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/cryptopp_byte.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/cryptopp_byte.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/cryptopp_byte.h
-@@ -2,7 +2,7 @@
- #ifndef _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
- #define _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
-
--#include <vendor_cryptopp/cryptlib.h>
-+#include <cryptopp/cryptlib.h>
-
- // If we're running an older CryptoPP version, CryptoPP::byte isn't defined yet.
- // Define it. Refer to "byte" type in the global namespace (placed by CryptoPP).
-Index: cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/hash/Hash.cpp
-+++ cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
+--- a/src/cpp-utils/crypto/hash/Hash.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/hash/Hash.cpp 2022-08-25 22:18:07.131800277 +0400
@@ -1,6 +1,6 @@
#include "Hash.h"
#include <cpp-utils/random/Random.h>
@@ -35,10 +17,8 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
using cpputils::Random;
using CryptoPP::SHA512;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/kdf/Scrypt.cpp
-+++ cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
+--- a/src/cpp-utils/crypto/kdf/Scrypt.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/kdf/Scrypt.cpp 2022-08-25 22:18:17.754889373 +0400
@@ -1,5 +1,5 @@
#include "Scrypt.h"
-#include <vendor_cryptopp/scrypt.h>
@@ -46,11 +26,9 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
using std::string;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-@@ -7,7 +7,7 @@
+--- a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h 2022-08-25 22:18:28.524979704 +0400
+@@ -6,7 +6,7 @@
#include "../../data/Data.h"
#include "../../random/Random.h"
#include <boost/optional.hpp>
@@ -59,24 +37,9 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
#include "Cipher.h"
#include "EncryptionKey.h"
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-@@ -6,7 +6,7 @@
- #include "../../data/FixedSizeData.h"
- #include "../../data/Data.h"
- #include "../../random/Random.h"
--#include <vendor_cryptopp/gcm.h>
-+#include <cryptopp/gcm.h>
- #include "Cipher.h"
- #include "EncryptionKey.h"
-
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/ciphers.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-@@ -2,11 +2,11 @@
+--- a/src/cpp-utils/crypto/symmetric/ciphers.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/ciphers.h 2022-08-25 22:18:52.181178110 +0400
+@@ -2,12 +2,12 @@
#ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
#define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
@@ -85,30 +48,39 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-#include <vendor_cryptopp/serpent.h>
-#include <vendor_cryptopp/cast.h>
-#include <vendor_cryptopp/mars.h>
+-#include <vendor_cryptopp/chachapoly.h>
+#include <cryptopp/aes.h>
+#include <cryptopp/twofish.h>
+#include <cryptopp/serpent.h>
+#include <cryptopp/cast.h>
+#include <cryptopp/mars.h>
++#include <cryptopp/chachapoly.h>
#include "GCM_Cipher.h"
#include "CFB_Cipher.h"
-Index: cryfs-0.10.2/src/cpp-utils/data/Data.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/data/Data.cpp
-+++ cryfs-0.10.2/src/cpp-utils/data/Data.cpp
+--- a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h 2022-08-25 22:18:38.836066183 +0400
+@@ -3,7 +3,7 @@
+ #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_GCMCIPHER_H_
+
+ #include "AEAD_Cipher.h"
+-#include <vendor_cryptopp/gcm.h>
++#include <cryptopp/gcm.h>
+
+ namespace cpputils {
+
+--- a/src/cpp-utils/data/Data.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/data/Data.cpp 2022-08-25 22:19:09.349322106 +0400
@@ -1,6 +1,6 @@
#include "Data.h"
#include <stdexcept>
-#include <vendor_cryptopp/hex.h>
+#include <cryptopp/hex.h>
- #include <cpp-utils/crypto/cryptopp_byte.h>
using std::istream;
-Index: cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/data/FixedSizeData.h
-+++ cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
+ using std::ofstream;
+--- a/src/cpp-utils/data/FixedSizeData.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/data/FixedSizeData.h 2022-08-25 22:19:19.103403916 +0400
@@ -2,7 +2,7 @@
#ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
#define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
@@ -116,25 +88,21 @@ Index: cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
-#include <vendor_cryptopp/hex.h>
+#include <cryptopp/hex.h>
#include <string>
+ #include <array>
#include <cstring>
- #include "../assert/assert.h"
-Index: cryfs-0.10.2/src/cpp-utils/random/OSRandomGenerator.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/random/OSRandomGenerator.h
-+++ cryfs-0.10.2/src/cpp-utils/random/OSRandomGenerator.h
-@@ -4,7 +4,7 @@
+--- a/src/cpp-utils/random/OSRandomGenerator.h 2022-08-25 22:14:05.483898156 +0400
++++ b/src/cpp-utils/random/OSRandomGenerator.h 2022-08-25 22:19:29.602491973 +0400
+@@ -3,7 +3,7 @@
+ #define MESSMER_CPPUTILS_RANDOM_OSRANDOMGENERATOR_H
- #include "cpp-utils/crypto/cryptopp_byte.h"
#include "RandomGenerator.h"
-#include <vendor_cryptopp/osrng.h>
+#include <cryptopp/osrng.h>
namespace cpputils {
class OSRandomGenerator final : public RandomGenerator {
-Index: cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/random/RandomGeneratorThread.h
-+++ cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
+--- a/src/cpp-utils/random/RandomGeneratorThread.h 2022-08-25 22:14:05.484898153 +0400
++++ b/src/cpp-utils/random/RandomGeneratorThread.h 2022-08-25 22:19:36.713551613 +0400
@@ -4,7 +4,7 @@
#include "../thread/LoopThread.h"
@@ -144,10 +112,9 @@ Index: cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
namespace cpputils {
//TODO Test
-Index: cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs/localstate/BasedirMetadata.cpp
-+++ cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
+diff -Naurp0 -U3 cryfs-0.11.2/src/cryfs/impl/localstate/BasedirMetadata.cpp cryfs-0.11.2-mine/src/cryfs/impl/localstate/BasedirMetadata.cpp
+--- a/src/cryfs/impl/localstate/BasedirMetadata.cpp 2022-08-25 22:14:05.487898144 +0400
++++ b/src/cryfs/impl/localstate/BasedirMetadata.cpp 2022-08-25 22:19:46.722635560 +0400
@@ -1,7 +1,7 @@
#include "BasedirMetadata.h"
#include <boost/property_tree/ptree.hpp>
@@ -157,11 +124,9 @@ Index: cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
#include <boost/filesystem/operations.hpp>
#include "LocalStateDir.h"
#include <cpp-utils/logging/logging.h>
-Index: cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
-===================================================================
---- cryfs-0.10.2.orig/test/cryfs/config/CompatibilityTest.cpp
-+++ cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
-@@ -3,7 +3,7 @@
+--- a/test/cryfs/impl/config/CompatibilityTest.cpp 2022-08-25 22:14:05.493898126 +0400
++++ b/test/cryfs/impl/config/CompatibilityTest.cpp 2022-08-25 22:19:54.589701542 +0400
+@@ -2,7 +2,7 @@
#include <vector>
#include <boost/filesystem.hpp>
#include <cpp-utils/data/Data.h>
@@ -169,12 +134,9 @@ Index: cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
+#include <cryptopp/hex.h>
#include <cpp-utils/crypto/symmetric/ciphers.h>
#include <cpp-utils/tempfile/TempFile.h>
- #include <cryfs/config/CryConfigFile.h>
-Index: cryfs-0.10.2/vendor/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/vendor/CMakeLists.txt
-+++ cryfs-0.10.2/vendor/CMakeLists.txt
-@@ -1,3 +1 @@
+ #include <cryfs/impl/config/CryConfigFile.h>
+--- a/vendor/CMakeLists.txt 2022-08-25 22:14:05.497898115 +0400
++++ b/vendor/CMakeLists.txt 2022-08-25 22:20:11.176840657 +0400
+@@ -1,2 +1 @@
add_subdirectory(googletest)
--add_subdirectory(spdlog)
-add_subdirectory(cryptopp)
diff --git a/srcpkgs/cryfs/patches/fix-test.patch b/srcpkgs/cryfs/patches/fix-test.patch
deleted file mode 100644
index d3a5847b1a3c..000000000000
--- a/srcpkgs/cryfs/patches/fix-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: cryfs-0.10.2/test/cpp-utils/logging/testutils/LoggingTest.h
-===================================================================
---- cryfs-0.10.2.orig/test/cpp-utils/logging/testutils/LoggingTest.h
-+++ cryfs-0.10.2/test/cpp-utils/logging/testutils/LoggingTest.h
-@@ -11,8 +11,7 @@ class MockLogger final {
- public:
- MockLogger():
- _capturedLogData(),
-- _sink(std::make_shared<spdlog::sinks::ostream_sink<std::mutex>>(_capturedLogData, true)),
-- _logger(spdlog::create("MockLogger", {_sink})) {
-+ _logger(spdlog::create<spdlog::sinks::ostream_sink_mt>("MockLogger", _capturedLogData, true)) {
- }
-
- ~MockLogger() {
-@@ -28,7 +27,6 @@ public:
- }
- private:
- std::ostringstream _capturedLogData;
-- std::shared_ptr<spdlog::sinks::ostream_sink<std::mutex>> _sink;
- std::shared_ptr<spdlog::logger> _logger;
- };
-
diff --git a/srcpkgs/cryfs/patches/fmt-9-fix.patch b/srcpkgs/cryfs/patches/fmt-9-fix.patch
new file mode 100644
index 000000000000..6fe97eaeafa4
--- /dev/null
+++ b/srcpkgs/cryfs/patches/fmt-9-fix.patch
@@ -0,0 +1,54 @@
+From 27515e0116fd7cb034bd4e9763d1f3bfdc855a5f Mon Sep 17 00:00:00 2001
+From: Bernhard Rosenkraenzer <bero@lindev.ch>
+Date: Fri, 22 Jul 2022 14:13:38 +0200
+Subject: [PATCH] Fix build with fmt 9.0 (#433)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Fix build with fmt 9.0
+
+Co-authored-by: Sebastian Meßmer <smessmer@users.noreply.github.com>
+---
+ ChangeLog.txt | 4 ++++
+ src/fspp/fuse/Fuse.cpp | 8 ++++----
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/fspp/fuse/Fuse.cpp b/src/fspp/fuse/Fuse.cpp
+index 4e9dbd7f..4b881815 100644
+--- a/src/fspp/fuse/Fuse.cpp
++++ b/src/fspp/fuse/Fuse.cpp
+@@ -603,21 +603,21 @@ int Fuse::mknod(const bf::path &path, ::mode_t mode, dev_t rdev) {
+ UNUSED(mode);
+ UNUSED(path);
+ ThreadNameForDebugging _threadName("mknod");
+- LOG(WARN, "Called non-implemented mknod({}, {}, _)", path, mode);
++ LOG(WARN, "Called non-implemented mknod({}, {}, _)", path.string(), mode);
+ return ENOSYS;
+ }
+
+ int Fuse::mkdir(const bf::path &path, ::mode_t mode) {
+ ThreadNameForDebugging _threadName("mkdir");
+ #ifdef FSPP_LOG
+- LOG(DEBUG, "mkdir({}, {})", path, mode);
++ LOG(DEBUG, "mkdir({}, {})", path.string(), mode);
+ #endif
+ try {
+ ASSERT(is_valid_fspp_path(path), "has to be an absolute path");
+ // DokanY seems to call mkdir("/"). Ignore that
+ if ("/" == path) {
+ #ifdef FSPP_LOG
+- LOG(DEBUG, "mkdir({}, {}): ignored", path, mode);
++ LOG(DEBUG, "mkdir({}, {}): ignored", path.string(), mode);
+ #endif
+ return 0;
+ }
+@@ -766,7 +766,7 @@ int Fuse::rename(const bf::path &from, const bf::path &to) {
+ //TODO
+ int Fuse::link(const bf::path &from, const bf::path &to) {
+ ThreadNameForDebugging _threadName("link");
+- LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from, to);
++ LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from.string(), to.string());
+ //auto real_from = _impl->RootDir() / from;
+ //auto real_to = _impl->RootDir() / to;
+ //int retstat = ::link(real_from.string().c_str(), real_to.string().c_str());
diff --git a/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch b/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
deleted file mode 100644
index 08513cb4d0ca..000000000000
--- a/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: cryfs-0.10.2/src/cryfs-cli/Cli.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-cli/Cli.cpp
-+++ cryfs-0.10.2/src/cryfs-cli/Cli.cpp
-@@ -27,6 +27,7 @@
- #include "Environment.h"
- #include <cryfs/CryfsException.h>
- #include <cpp-utils/thread/debugging.h>
-+#include <spdlog/sinks/basic_file_sink.h>
-
- //TODO Many functions accessing the ProgramOptions object. Factor out into class that stores it as a member.
- //TODO Factor out class handling askPassword
-@@ -310,7 +311,7 @@ namespace cryfs_cli {
- //TODO Test that --logfile parameter works. Should be: file if specified, otherwise stderr if foreground, else syslog.
- if (options.logFile() != none) {
- cpputils::logging::setLogger(
-- spdlog::create<spdlog::sinks::simple_file_sink<std::mutex>>("cryfs", options.logFile()->string()));
-+ spdlog::create<spdlog::sinks::basic_file_sink<std::mutex>>("cryfs", options.logFile()->string()));
- } else if (options.foreground()) {
- cpputils::logging::setLogger(spdlog::stderr_logger_mt("cryfs"));
- } else {
diff --git a/srcpkgs/cryfs/patches/spdlog-include.patch b/srcpkgs/cryfs/patches/spdlog-include.patch
deleted file mode 100644
index 2c1c5a926cf3..000000000000
--- a/srcpkgs/cryfs/patches/spdlog-include.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: cryfs-0.10.2/src/cpp-utils/logging/Logger.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/logging/Logger.h
-+++ cryfs-0.10.2/src/cpp-utils/logging/Logger.h
-@@ -7,6 +7,7 @@
- #endif
-
- #include <spdlog/spdlog.h>
-+#include <spdlog/sinks/stdout_sinks.h>
- #include "../macros.h"
-
- namespace cpputils {
-Index: cryfs-0.10.2/src/cpp-utils/logging/logging.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/logging/logging.h
-+++ cryfs-0.10.2/src/cpp-utils/logging/logging.h
-@@ -5,6 +5,7 @@
- #include "Logger.h"
- #include <stdexcept>
- #include <spdlog/fmt/ostr.h>
-+#include <spdlog/sinks/syslog_sink.h>
-
- #if defined(_MSC_VER)
- #include <spdlog/sinks/msvc_sink.h>
-@@ -75,7 +76,7 @@ namespace cpputils {
- #if defined(_MSC_VER)
- return spdlog::create<spdlog::sinks::msvc_sink_mt>(name);
- #else
-- return spdlog::syslog_logger(name, name, LOG_PID);
-+ return spdlog::syslog_logger_mt(name, name, LOG_PID);
- #endif
- }
- }
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 495c2b318a3b..9bc119867ce7 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,14 +1,15 @@
# Template file for 'cryfs'
pkgname=cryfs
-version=0.10.2
-revision=5
+version=0.11.2
+revision=1
create_wrksrc=yes
build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off
- -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
+configure_args="-DCRYFS_UPDATE_CHECKS=off -DBoost_USE_STATIC_LIBS=OFF
+ -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt
+ -DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
hostmakedepends="pkg-config python3"
makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
- spdlog"
+ spdlog range-v3"
depends="fuse"
short_desc="Cryptographic filesystem for the cloud"
maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
@@ -16,7 +17,7 @@ license="LGPL-3.0-only"
homepage="https://www.cryfs.org"
changelog="https://github.com/cryfs/cryfs/raw/master/ChangeLog.txt"
distfiles="https://github.com/cryfs/cryfs/releases/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=004c7fdf537062e197aaa0bcdafd2682904a279802441bb6063cb72c1fba52d2
+checksum=a89ab8fea2d494b496867107ec0a3772fe606ebd71ef12152fcd233f463a2c00
if [ "${XBPS_CHECK_PKGS}" ]; then
configure_args+=" -DBUILD_TESTING=on"
From d848fc6553e058fc6848b2806d5e416edfaffbbb Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 06/17] easyeffects: revbump for fmt 9.0
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index ac84ce15b068..0ddfb1b5833d 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=6.2.4
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel"
makedepends="gtkmm4-devel pipewire-devel zita-convolver-devel lilv-devel
From a7cbb37c0a4acb0db4f74973aa6c16a9c90c7724 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 07/17] gerbera: revbump for fmt 9.0, add patch
---
srcpkgs/gerbera/patches/fmt-9-fix.patch | 32 +++++++++++++++++++++++++
srcpkgs/gerbera/template | 2 +-
2 files changed, 33 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gerbera/patches/fmt-9-fix.patch
diff --git a/srcpkgs/gerbera/patches/fmt-9-fix.patch b/srcpkgs/gerbera/patches/fmt-9-fix.patch
new file mode 100644
index 000000000000..7adedf9005db
--- /dev/null
+++ b/srcpkgs/gerbera/patches/fmt-9-fix.patch
@@ -0,0 +1,32 @@
+From d7b8fafbc94405c20753fed569abd8878cccde89 Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars@archlinux.org>
+Date: Fri, 19 Aug 2022 15:22:10 +0300
+Subject: [PATCH] Fix build with fmt 9.0
+
+Fixes #2681
+---
+ src/database/sql_format.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/database/sql_format.h b/src/database/sql_format.h
+index 32dc00efa..e4e1909a8 100644
+--- a/src/database/sql_format.h
++++ b/src/database/sql_format.h
+@@ -42,7 +42,7 @@ struct SQLIdentifier {
+ template <>
+ struct fmt::formatter<SQLIdentifier> : formatter<std::string_view> {
+ template <typename FormatContext>
+- auto format(const SQLIdentifier& tn, FormatContext& ctx) -> decltype(ctx.out())
++ auto format(const SQLIdentifier& tn, FormatContext& ctx) const -> decltype(ctx.out())
+ {
+ return format_to(ctx.out(), "{}{}{}", tn.quote_begin, tn.name, tn.quote_end);
+ }
+@@ -61,7 +61,7 @@ struct ColumnUpdate {
+ template <>
+ struct fmt::formatter<ColumnUpdate> : formatter<std::string_view> {
+ template <typename FormatContext>
+- auto format(const ColumnUpdate& a, FormatContext& ctx) -> decltype(ctx.out())
++ auto format(const ColumnUpdate& a, FormatContext& ctx) const -> decltype(ctx.out())
+ {
+ return format_to(ctx.out(), "{} = {}", a.column, a.value);
+ }
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 35136708b3e5..100b94a7acbe 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.11.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From e67cf4e844491f7a43465bc0e9074745ad82a975 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 08/17] gnuradio: revbump for fmt 9.0
---
srcpkgs/gnuradio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 43ae4e1cb1ba..973339f92921 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.10.3.0
-revision=1
+revision=2
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
From 2ca2b2e0eb252725acbca56381c368fec388e56e Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 09/17] kodi: revbump for fmt 9.0
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index d3e9a13afdd5..4b6c9e1ade0c 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=19.4
-revision=3
+revision=4
_codename="Matrix"
wrksrc="xbmc-${version}-${_codename}"
build_style=cmake
From 87035a6e5da57c07e042f895fda3115f0702cdb6 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 10/17] MangoHud: revbump for fmt 9.0
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index a9973bcad30a..fb0e18c1a1f4 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -2,7 +2,7 @@
pkgname=MangoHud
version=0.6.7.1
_version="${version%.*}-${version##*.}"
-revision=2
+revision=3
wrksrc="MangoHud-v${_version}"
build_style=meson
configure_args="-Duse_system_vulkan=enabled -Dwith_xnvctrl=disabled
From b7724339d81d3531b6b816e800a665998c85e5c7 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 11/17] mkvtoolnix: revbump for fmt 9.0
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index a1d2adbc4b3f..d98022773c0a 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=70.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From ffa7e597102bcfce62a0c38a36fe714d7e7a1a4e Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 12/17] mpd: revbump for fmt 9.0
---
srcpkgs/mpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 98195b80a38d..b43c83fbb0f7 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
# Template file for 'mpd'
pkgname=mpd
version=0.23.8
-revision=1
+revision=2
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
-Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
From 87093dd357354c7fdd85f54914ba77e3fa0e2b69 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 13/17] mtxclient: revbump for fmt 9.0
---
srcpkgs/mtxclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 4ec895656749..12fea54d3fd5 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.8.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 53824d536961607a52b584479af6d0f2eee736d1 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 14/17] nheko: revbump for fmt 9.0
---
srcpkgs/nheko/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index f35fd3942116..8e41e9e1f2f0 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.10.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
From 98258d049356a0acfe9ac29b9c0a127a7c036afd Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 15/17] spdlog: revbump for fmt 9.0
---
srcpkgs/spdlog/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 187ec0d0eb6e..ef1ee76ffcca 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
# Template file for 'spdlog'
pkgname=spdlog
version=1.10.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
-DSPDLOG_BUILD_SHARED=ON"
From f3fd118d744baae89ee728c8eb981e22a0ab5b6d Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 16/17] Waybar: revbump for fmt 9.0
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 8ac3d4290b39..e40288e00b75 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.9.13
-revision=1
+revision=2
_date_version=3.0.0
build_style=meson
configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
From 1f191aa9f4d25aeeeddd941218d8dc6d92595422 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 20:49:38 +0400
Subject: [PATCH 17/17] fmt: update to 9.0.0.
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e7a52cffc36c..f540c1857d89 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3529,7 +3529,7 @@ libcotp.so.12 libcotp-1.2.1_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.8 fmt-8.0.1_1
+libfmt.so.9 fmt-9.0.0_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.25 libtls-3.5.2_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 35a914c75eab..6fa037dfbaab 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=8.1.1
+version=9.0.0
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,7 +10,7 @@ license="BSD-2-Clause"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=3d794d3cf67633b34b2771eb9f073bde87e846e0d395d254df7b211ef1ec7346
+checksum=9a1e0e9e843a356d65c7604e2c8bf9402b50fe294c355de0095ebd42fb9bd2c5
post_install() {
vlicense LICENSE.rst LICENSE
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR REVIEW] fmt: update to 9.0.0.
2022-08-26 5:00 [PR PATCH] fmt: update to 9.0.0 skmpz
` (4 preceding siblings ...)
2022-08-26 16:26 ` [PR PATCH] [Updated] " skmpz
@ 2022-09-01 1:36 ` sgn
2022-09-01 1:37 ` [PR PATCH] [Closed]: " sgn
2022-09-01 1:37 ` [PR PATCH] [Updated] " sgn
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2022-09-01 1:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 147 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/38916#discussion_r960146950
Comment:
Nope
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Closed]: fmt: update to 9.0.0.
2022-08-26 5:00 [PR PATCH] fmt: update to 9.0.0 skmpz
` (5 preceding siblings ...)
2022-09-01 1:36 ` [PR REVIEW] " sgn
@ 2022-09-01 1:37 ` sgn
2022-09-01 1:37 ` [PR PATCH] [Updated] " sgn
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2022-09-01 1:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 720 bytes --]
There's a closed pull request on the void-packages repository
fmt: update to 9.0.0.
https://github.com/void-linux/void-packages/pull/38916
Description:
[ci skip]
Packages bumped and status:
- [x] 0ad: revbumped, built for all archs
- [x] Bear: update to 3.0.20, built for all archs
- [x] cherrytree: revbumped, built for all archs
- [x] coeurl: revbumped, built for all archs
- [ ] cryfs: update to 0.11.2, patches modified (needs boost > 1.75.0)
- [x] easyeffects: revbumped, built for all archs
- [x] gerbera: revbumped, added patch, built for all archs
- [ ] gnuradio (works with patch)
- [ ] kodi
- [ ] MangoHud
- [ ] mkvtoolnix
- [ ] mpd
- [ ] mtxclient
- [ ] nheko
- [ ] spdlog
- [ ] Waybar
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] fmt: update to 9.0.0.
2022-08-26 5:00 [PR PATCH] fmt: update to 9.0.0 skmpz
` (6 preceding siblings ...)
2022-09-01 1:37 ` [PR PATCH] [Closed]: " sgn
@ 2022-09-01 1:37 ` sgn
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2022-09-01 1:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 870 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/skmpz/void-packages fmt-9.0
https://github.com/void-linux/void-packages/pull/38916
fmt: update to 9.0.0.
[ci skip]
Packages bumped and status:
- [x] 0ad: revbumped, built for all archs
- [x] Bear: update to 3.0.20, built for all archs
- [x] cherrytree: revbumped, built for all archs
- [x] coeurl: revbumped, built for all archs
- [ ] cryfs: update to 0.11.2, patches modified (needs boost > 1.75.0)
- [x] easyeffects: revbumped, built for all archs
- [x] gerbera: revbumped, added patch, built for all archs
- [ ] gnuradio (works with patch)
- [ ] kodi
- [ ] MangoHud
- [ ] mkvtoolnix
- [ ] mpd
- [ ] mtxclient
- [ ] nheko
- [ ] spdlog
- [ ] Waybar
A patch file from https://github.com/void-linux/void-packages/pull/38916.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-9.0-38916.patch --]
[-- Type: text/x-diff, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-09-01 1:37 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-26 5:00 [PR PATCH] fmt: update to 9.0.0 skmpz
2022-08-26 10:18 ` [PR REVIEW] " atweiden
2022-08-26 10:21 ` atweiden
2022-08-26 10:33 ` atweiden
2022-08-26 10:42 ` atweiden
2022-08-26 16:26 ` [PR PATCH] [Updated] " skmpz
2022-09-01 1:36 ` [PR REVIEW] " sgn
2022-09-01 1:37 ` [PR PATCH] [Closed]: " sgn
2022-09-01 1:37 ` [PR PATCH] [Updated] " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).