[packages/frozen] - updated to 1.2.0

qboosh qboosh at pld-linux.org
Fri Oct 25 20:06:23 CEST 2024


commit e8b092caeff3a59b20ceee8cdf3a7abb2a1cc829
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Oct 25 19:53:14 2024 +0200

    - updated to 1.2.0

 frozen-fix-arch-in-cmake.patch | 18 ------------------
 frozen-gcc.patch               | 37 -------------------------------------
 frozen-includes.patch          | 11 -----------
 frozen.spec                    | 10 ++--------
 4 files changed, 2 insertions(+), 74 deletions(-)
---
diff --git a/frozen.spec b/frozen.spec
index eee7aff..564ec84 100644
--- a/frozen.spec
+++ b/frozen.spec
@@ -5,16 +5,13 @@
 Summary:	Header-only, constexpr alternative to gperf for C++14 users
 Summary(pl.UTF-8):	Składająca się z samych nagłówków, wykorzystująca constexpr alternatywa dla gperfa dla C++14
 Name:		frozen
-Version:	1.1.1
+Version:	1.2.0
 Release:	1
 License:	Apache v2.0
 Group:		Libraries
 #Source0Download: https://github.com/serge-sans-paille/frozen/tags
 Source0:	https://github.com/serge-sans-paille/frozen/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	9c498c6845e4e33ea686770d3d429aa2
-Patch0:		%{name}-gcc.patch
-Patch1:		%{name}-includes.patch
-Patch2:		%{name}-fix-arch-in-cmake.patch
+# Source0-md5:	16e41d6f91ffb8b62a92344258424721
 URL:		https://github.com/serge-sans-paille/frozen
 BuildRequires:	cmake >= 3.8
 BuildRequires:	libstdc++-devel >= 6:5
@@ -89,9 +86,6 @@ W tym:
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p0
-%patch2 -p1
 
 %build
 install -d build
diff --git a/frozen-fix-arch-in-cmake.patch b/frozen-fix-arch-in-cmake.patch
deleted file mode 100644
index e782761..0000000
--- a/frozen-fix-arch-in-cmake.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 65fb923..dfcc437 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -126,8 +126,13 @@ if(frozen.installation)
-   # generate a CMake configuration file for consumption by CMake's `find_package`
-   # intrinsic
-   #
-+
-+  if(${CMAKE_VERSION} VERSION_GREATER "3.14")
-+    set(OPTIONAL_ARCH_INDEPENDENT "ARCH_INDEPENDENT")
-+  endif()
-   write_basic_package_version_file("frozenConfigVersion.cmake"
-     VERSION ${PROJECT_VERSION}
-+    ${OPTIONAL_ARCH_INDEPENDENT}
-     COMPATIBILITY SameMajorVersion)
- 
-   install(FILES "${PROJECT_BINARY_DIR}/frozenConfigVersion.cmake"
diff --git a/frozen-gcc.patch b/frozen-gcc.patch
deleted file mode 100644
index 1ce542e..0000000
--- a/frozen-gcc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 079f73cc5c6413127d47f325cbb34a607e2cb030 Mon Sep 17 00:00:00 2001
-From: serge-sans-paille <serge.guelton at telecom-bretagne.eu>
-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 <class KeyType, class Hasher, class Equal>
-   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 <class KeyType>
-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-includes.patch b/frozen-includes.patch
deleted file mode 100644
index 039138b..0000000
--- a/frozen-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/frozen/bits/pmh.h~	2022-03-31 00:56:25.000000000 -0500
-+++ include/frozen/bits/pmh.h	2023-07-17 13:42:52.903675376 -0500
-@@ -30,6 +30,8 @@
- #include <array>
- #include <limits>
- 
-+#include <cstdint>
-+
- namespace frozen {
- 
- namespace bits {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/frozen.git/commitdiff/e8b092caeff3a59b20ceee8cdf3a7abb2a1cc829



More information about the pld-cvs-commit mailing list