From 922a624197a389b210b4a5152b2883498684bd4a Mon Sep 17 00:00:00 2001
From: Alexander Stefanov <alexander@mezon.ru>
Date: Mon, 20 Jun 2022 16:03:48 +0000
Subject: [PATCH] 1.5.2 upgrade

---
 .abf.yml                              |  2 +-
 dont-vectorize-like-a-clang-e2k.patch | 13 -------------
 zstd.spec                             |  8 +++++---
 3 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 dont-vectorize-like-a-clang-e2k.patch

diff --git a/.abf.yml b/.abf.yml
index 28c04a0..a965ce9 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  zstd-1.5.0.tar.gz: 3299248fcd44d7f21ba2f1f198c1173eeb3c4f32
+  zstd-1.5.2.tar.gz: 8ddf671abb68fd7ed2c655e84753c0e899477455
diff --git a/dont-vectorize-like-a-clang-e2k.patch b/dont-vectorize-like-a-clang-e2k.patch
deleted file mode 100644
index 9bb45ca..0000000
--- a/dont-vectorize-like-a-clang-e2k.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/common/compiler.h b/lib/common/compiler.h
-index 95e9483..088afcf 100644
---- a/lib/common/compiler.h
-+++ b/lib/common/compiler.h
-@@ -139,7 +139,7 @@
-
- /* vectorization
-  * older GCC (pre gcc-4.3 picked as the cutoff) uses a different syntax */
--#if !defined(__INTEL_COMPILER) && !defined(__clang__) && defined(__GNUC__)
-+#if !defined(__INTEL_COMPILER) && !defined(__clang__) && defined(__GNUC__) && !defined(__LCC__)
- #  if (__GNUC__ == 4 && __GNUC_MINOR__ > 3) || (__GNUC__ >= 5)
- #    define DONT_VECTORIZE __attribute__((optimize("no-tree-vectorize")))
- #  else
diff --git a/zstd.spec b/zstd.spec
index 33af7e5..1ebc263 100644
--- a/zstd.spec
+++ b/zstd.spec
@@ -9,13 +9,12 @@
 
 Summary:	Zstd compression library
 Name:		zstd
-Version:	1.5.0
-Release:	2
+Version:	1.5.2
+Release:	1
 License:	BSD and GPLv2+
 Group:		Archiving/Compression
 Url:		http://www.zstd.net/
 Source0:	https://github.com/facebook/zstd/archive/v%{version}/%{name}-%{version}.tar.gz
-Patch2:		dont-vectorize-like-a-clang-e2k.patch
 BuildRequires:	gtest-devel
 BuildRequires:	pkgconfig(liblz4)
 BuildRequires:	pkgconfig(liblzma)
@@ -88,6 +87,9 @@ Static library for zstd.
 sed -i -e 's,-L\${libdir} ,,g' lib/*.pc.in
 sed -i -e '/^Cflags:/d' lib/*.pc.in
 find -name .gitignore -delete
+# Don't use obsolete standards
+# https://github.com/facebook/zstd/issues/3163
+sed -i -e 's,c99,gnu2a,g' build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
 
 %build
 %set_build_flags