From fa02305f71df7809918e00ae456c2b5b6bac0f56 Mon Sep 17 00:00:00 2001
From: Tim Biermann <tbier@posteo.de>
Date: Fri, 12 Jan 2024 23:38:20 +0100
Subject: [PATCH] spdlog: 1.12.0 -> 1.13.0

---
 spdlog/.footprint                             |  6 ++---
 spdlog/.signature                             | 10 ++++-----
 spdlog/Pkgfile                                | 11 +++-------
 ...3a660601a406a1e1aa07380b5b1c5781c190.patch | 22 -------------------
 spdlog/spdlog_fmt_external.patch              | 11 ----------
 5 files changed, 10 insertions(+), 50 deletions(-)
 delete mode 100644 spdlog/d8d23a660601a406a1e1aa07380b5b1c5781c190.patch
 delete mode 100644 spdlog/spdlog_fmt_external.patch

diff --git a/spdlog/.footprint b/spdlog/.footprint
index 399ebb66e..9c8ff9010 100644
--- a/spdlog/.footprint
+++ b/spdlog/.footprint
@@ -101,8 +101,8 @@ drwxr-xr-x	root/root	usr/lib/cmake/spdlog/
 -rw-r--r--	root/root	usr/lib/cmake/spdlog/spdlogConfigTargets-release.cmake
 -rw-r--r--	root/root	usr/lib/cmake/spdlog/spdlogConfigTargets.cmake
 -rw-r--r--	root/root	usr/lib/cmake/spdlog/spdlogConfigVersion.cmake
-lrwxrwxrwx	root/root	usr/lib/libspdlog.so -> libspdlog.so.1.12
-lrwxrwxrwx	root/root	usr/lib/libspdlog.so.1.12 -> libspdlog.so.1.12.0
--rwxr-xr-x	root/root	usr/lib/libspdlog.so.1.12.0
+lrwxrwxrwx	root/root	usr/lib/libspdlog.so -> libspdlog.so.1.13
+lrwxrwxrwx	root/root	usr/lib/libspdlog.so.1.13 -> libspdlog.so.1.13.0
+-rwxr-xr-x	root/root	usr/lib/libspdlog.so.1.13.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/spdlog.pc
diff --git a/spdlog/.signature b/spdlog/.signature
index 4fb3b08f5..0d3be028e 100644
--- a/spdlog/.signature
+++ b/spdlog/.signature
@@ -1,7 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF33uafkgUcDPME/q3py3BZw7GS2YgVB3sxhrydXjylfQrDMr7K0aFcrdz9nip8kSzvIQcLpfi9NtFDDTJb4afAQw=
-SHA256 (Pkgfile) = e7eb01ca6d971eba3cb4c27b3a80e2580711f1b25f98dee03318c16d59c152fd
-SHA256 (.footprint) = 7fbb17d3d7fbda8347ba5505c64f855e027eba533ee74b9ad34f7809f734db7e
-SHA256 (spdlog-1.12.0.tar.gz) = 4dccf2d10f410c1e2feaff89966bfc49a1abb29ef6f08246335b110e001e09a9
-SHA256 (d8d23a660601a406a1e1aa07380b5b1c5781c190.patch) = edfaa7406e609908c6cf1d09132506fcaaa585034be7093403eb78275ecfff5e
-SHA256 (spdlog_fmt_external.patch) = a0eb34b7c6920f0db2587460071f53372663c191cdfe34bf5ea2704c309c745f
+RWSagIOpLGJF3/1TdaxtXLPwxvN9/qnimTFbX6cvrA4IYbs/bGKwp40pEVuEKUv9w8ioZoRLOobcYTu+xp+EU5E5fJ92LjALWwo=
+SHA256 (Pkgfile) = f19f1ec25c8a87bca0d1569f32907529b958d6d0f45e40eb8f7fdd9da962d7b7
+SHA256 (.footprint) = bb2172027260d1c4acab6bfacc31c9aaad5f6bd9c0318020f7cfe1ce9eb57ad5
+SHA256 (spdlog-1.13.0.tar.gz) = 534f2ee1a4dcbeb22249856edfb2be76a1cf4f708a20b0ac2ed090ee24cfdbc9
diff --git a/spdlog/Pkgfile b/spdlog/Pkgfile
index 6c291ca49..c73656783 100644
--- a/spdlog/Pkgfile
+++ b/spdlog/Pkgfile
@@ -4,16 +4,11 @@
 # Depends on: fmt
 
 name=spdlog
-version=1.12.0
-release=2
-source=(https://github.com/gabime/spdlog/archive/v$version/$name-$version.tar.gz
-  d8d23a660601a406a1e1aa07380b5b1c5781c190.patch
-  spdlog_fmt_external.patch)
+version=1.13.0
+release=1
+source=(https://github.com/gabime/spdlog/archive/v$version/$name-$version.tar.gz)
 
 build() {
-  patch -Np1 -d $name-$version -i $SRC/spdlog_fmt_external.patch
-  patch -Np1 -d $name-$version -i $SRC/d8d23a660601a406a1e1aa07380b5b1c5781c190.patch
-
   rm -rf $name-$version/include/spdlog/fmt/bundled
 
   cmake -S $name-$version -B build -G Ninja \
diff --git a/spdlog/d8d23a660601a406a1e1aa07380b5b1c5781c190.patch b/spdlog/d8d23a660601a406a1e1aa07380b5b1c5781c190.patch
deleted file mode 100644
index c20be000d..000000000
--- a/spdlog/d8d23a660601a406a1e1aa07380b5b1c5781c190.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From d8d23a660601a406a1e1aa07380b5b1c5781c190 Mon Sep 17 00:00:00 2001
-From: Gabi Melman <gmelman1@gmail.com>
-Date: Fri, 21 Jul 2023 00:37:03 +0300
-Subject: [PATCH] Fix #2820
-
----
- include/spdlog/details/circular_q.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/spdlog/details/circular_q.h b/include/spdlog/details/circular_q.h
-index e4fd5fd4a..d40e14189 100644
---- a/include/spdlog/details/circular_q.h
-+++ b/include/spdlog/details/circular_q.h
-@@ -82,7 +82,7 @@ class circular_q
-         }
-         else
-         {
--            return max_items_ - (head_ - tail_);
-+            return max_items_ - 1 - (head_ - tail_);
-         }
-     }
- 
diff --git a/spdlog/spdlog_fmt_external.patch b/spdlog/spdlog_fmt_external.patch
deleted file mode 100644
index aac0a9cf7..000000000
--- a/spdlog/spdlog_fmt_external.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/include/spdlog/tweakme.h	2023-01-02 09:57:15.667781832 -0800
-+++ b/include/spdlog/tweakme.h	2023-01-02 09:57:17.761105926 -0800
-@@ -78,7 +78,7 @@
- // In this case spdlog will try to include <fmt/format.h> so set your -I flag
- // accordingly.
- //
--// #define SPDLOG_FMT_EXTERNAL
-+#define SPDLOG_FMT_EXTERNAL
- ///////////////////////////////////////////////////////////////////////////////
- 
- ///////////////////////////////////////////////////////////////////////////////