From 693f35a9d7348953eff0d8a3a567a29f2a7e2d44 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sun, 1 Sep 2024 21:14:44 +0200 Subject: [PATCH] frozen: 1.1.1 -> 1.2.0 --- frozen/.footprint | 1 + frozen/.signature | 10 ++--- ...73cc5c6413127d47f325cbb34a607e2cb030.patch | 37 ------------------- frozen/Pkgfile | 9 +---- frozen/frozen-1.1.1-missing-include.patch | 12 ------ 5 files changed, 7 insertions(+), 62 deletions(-) delete mode 100644 frozen/079f73cc5c6413127d47f325cbb34a607e2cb030.patch delete mode 100644 frozen/frozen-1.1.1-missing-include.patch diff --git a/frozen/.footprint b/frozen/.footprint index 8d3e39393..9b8543068 100644 --- a/frozen/.footprint +++ b/frozen/.footprint @@ -11,6 +11,7 @@ drwxrwxr-x root/root usr/include/frozen/bits/ -rw-rw-r-- root/root usr/include/frozen/bits/elsa_std.h -rw-rw-r-- root/root usr/include/frozen/bits/exceptions.h -rw-rw-r-- root/root usr/include/frozen/bits/hash_string.h +-rw-rw-r-- root/root usr/include/frozen/bits/mpl.h -rw-rw-r-- root/root usr/include/frozen/bits/pmh.h -rw-rw-r-- root/root usr/include/frozen/bits/version.h -rw-rw-r-- root/root usr/include/frozen/map.h diff --git a/frozen/.signature b/frozen/.signature index 84010e329..e7d14a9a9 100644 --- a/frozen/.signature +++ b/frozen/.signature @@ -1,7 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3yK8URfa1urDK9GQf1Ap0ZF19PBngSa7HuKkmvTDX9v8/YvbHe3MhPBo9MyJDofFXvvmidbVpKv5+R3TkE6eFgY= -SHA256 (Pkgfile) = 4e3156687198bc335b9ee397a16734d9008e9924e959670a8f91cc236487b536 -SHA256 (.footprint) = f0e261c1b3f1896560cc2cbd29043b12a94e3b8def670edc8a03238ba0e91804 -SHA256 (frozen-1.1.1.tar.gz) = f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45 -SHA256 (frozen-1.1.1-missing-include.patch) = ec8a0168430701e2878e8ad50fd56ea4ada85984ce365ac34dd8f96705586a95 -SHA256 (079f73cc5c6413127d47f325cbb34a607e2cb030.patch) = 97a4f7f24427adc43cf2671fa41fa183e0d41ba547c791b5850954632f02df06 +RWSagIOpLGJF35iZF2KjN0bGGTt+080pual0PW/1mnqRK54VsTkvQrEJ/9BrjI0HtxfJuPiCOZ40hNdPQNihAiI0teZN3u3w0QM= +SHA256 (Pkgfile) = ccbaaa741df84cedf3d8efc45197f163d3ff68b0e8c81d297e6e2e1c4671ced6 +SHA256 (.footprint) = 96cdcfbf7b0c97709ecc2a74e22aa3cdca0d7f7c50cb8de792f8b3b9f7fafb4f +SHA256 (frozen-1.2.0.tar.gz) = ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823 diff --git a/frozen/079f73cc5c6413127d47f325cbb34a607e2cb030.patch b/frozen/079f73cc5c6413127d47f325cbb34a607e2cb030.patch deleted file mode 100644 index 1ce542e0e..000000000 --- a/frozen/079f73cc5c6413127d47f325cbb34a607e2cb030.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 079f73cc5c6413127d47f325cbb34a607e2cb030 Mon Sep 17 00:00:00 2001 -From: serge-sans-paille -Date: Fri, 16 Dec 2022 22:58:51 +0100 -Subject: [PATCH] Workaround gcc 11 limitation - -For some reason, gcc sees a constexpr violation here. Trust clang and msvc on this. ---- - include/frozen/unordered_set.h | 2 +- - tests/test_unordered_set.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/frozen/unordered_set.h b/include/frozen/unordered_set.h -index 4d16df9..196ea50 100644 ---- a/include/frozen/unordered_set.h -+++ b/include/frozen/unordered_set.h -@@ -105,7 +105,7 @@ class unordered_set { - /* lookup */ - template - constexpr std::size_t count(KeyType const &key, Hasher const &hash, Equal const &equal) const { -- auto const k = lookup(key, hash); -+ auto const & k = lookup(key, hash); - return equal(k, key); - } - template -diff --git a/tests/test_unordered_set.cpp b/tests/test_unordered_set.cpp -index e90a0d4..042c1a8 100644 ---- a/tests/test_unordered_set.cpp -+++ b/tests/test_unordered_set.cpp -@@ -65,7 +65,7 @@ TEST_CASE("tripleton str frozen unordered set", "[unordered set]") { - constexpr auto max_size = ze_set.max_size(); - REQUIRE(max_size == 3); - -- constexpr auto nocount = ze_set.count(4); -+ const auto nocount = ze_set.count(4); - REQUIRE(nocount == 0); - - constexpr auto count = ze_set.count(1); diff --git a/frozen/Pkgfile b/frozen/Pkgfile index bed2f76bc..0f8d7d3fb 100644 --- a/frozen/Pkgfile +++ b/frozen/Pkgfile @@ -3,16 +3,11 @@ # Maintainer: Tim Biermann, tbier at posteo dot de name=frozen -version=1.1.1 +version=1.2.0 release=1 -source=(https://github.com/serge-sans-paille/frozen/archive/$version/$name-$version.tar.gz - frozen-1.1.1-missing-include.patch - 079f73cc5c6413127d47f325cbb34a607e2cb030.patch) +source=(https://github.com/serge-sans-paille/frozen/archive/$version/$name-$version.tar.gz) build() { - patch -Np1 -d $name-$version -i $SRC/frozen-1.1.1-missing-include.patch - patch -Np1 -d $name-$version -i $SRC/079f73cc5c6413127d47f325cbb34a607e2cb030.patch - cmake -S $name-$version -B build -G Ninja \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_LIBDIR=lib \ diff --git a/frozen/frozen-1.1.1-missing-include.patch b/frozen/frozen-1.1.1-missing-include.patch deleted file mode 100644 index ed60abd1c..000000000 --- a/frozen/frozen-1.1.1-missing-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up frozen-1.1.1/include/frozen/bits/pmh.h:5.omv~ frozen-1.1.1/include/frozen/bits/pmh.h:5 -diff -up frozen-1.1.1/include/frozen/bits/pmh.h.omv~ frozen-1.1.1/include/frozen/bits/pmh.h ---- frozen-1.1.1/include/frozen/bits/pmh.h.omv~ 2023-07-10 15:37:16.000503631 +0200 -+++ frozen-1.1.1/include/frozen/bits/pmh.h 2023-07-10 15:37:22.640548964 +0200 -@@ -29,6 +29,7 @@ - - #include - #include -+#include - - namespace frozen { -