:zap: Bumped to version v4.1.0

4 files changed, 6 insertions, 84 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 92f94f6de119..c545b8e079e1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,14 @@
-# Generated by mksrcinfo v8
-# Thu Sep 21 19:50:43 UTC 2017
 pkgbase = fmt
 	pkgdesc = Open-source formatting library for C++.
-	pkgver = 4.0.0
+	pkgver = 4.1.0
 	pkgrel = 2
 	url = http://fmtlib.net
 	arch = i686
 	arch = x86_64
 	license = BSD
 	makedepends = cmake
-	source = https://github.com/fmtlib/fmt/archive/4.0.0.tar.gz
-	md5sums = c9be9a37bc85493d1116b0af59a25eba
+	source = https://github.com/fmtlib/fmt/archive/4.1.0.tar.gz
+	md5sums = 057d1fc49f6d3114e29e8cc72cf70e08
 
 pkgname = fmt
 
diff --git a/0001-Fix-a-segfault-in-test-on-glibc-2.26-551.patch b/0001-Fix-a-segfault-in-test-on-glibc-2.26-551.patch
deleted file mode 100644
index e0d2a9bcc612..000000000000
--- a/0001-Fix-a-segfault-in-test-on-glibc-2.26-551.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6655e804c49f66b6c978fcdd01ef6b03b55208fa Mon Sep 17 00:00:00 2001
-From: Victor Zverovich <victor.zverovich@gmail.com>
-Date: Sun, 6 Aug 2017 20:18:04 -0700
-Subject: [PATCH] Fix a segfault in test on glibc 2.26 #551
-
----
- test/util-test.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/util-test.cc b/test/util-test.cc
-index a388255..6cef7e8 100644
---- a/test/util-test.cc
-+++ b/test/util-test.cc
-@@ -838,7 +838,7 @@ TEST(UtilTest, FormatSystemError) {
-   EXPECT_EQ(fmt::format("test: {}", get_system_error(EDOM)), message.str());
-   message.clear();
-   fmt::format_system_error(
--        message, EDOM, fmt::StringRef(0, std::numeric_limits<size_t>::max()));
-+        message, EDOM, fmt::StringRef(0, std::numeric_limits<ssize_t>::max()));
-   EXPECT_EQ(fmt::format("error {}", EDOM), message.str());
- }
- 
--- 
-2.14.1
-
diff --git a/0002-Fix-a-segfault-in-test-on-glibc-2.26-551-take-2.patch b/0002-Fix-a-segfault-in-test-on-glibc-2.26-551-take-2.patch
deleted file mode 100644
index 16e2d60324b8..000000000000
--- a/0002-Fix-a-segfault-in-test-on-glibc-2.26-551-take-2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 032c83807f95d83f2355f1c436909bb577b920bc Mon Sep 17 00:00:00 2001
-From: Victor Zverovich <victor.zverovich@gmail.com>
-Date: Thu, 10 Aug 2017 09:27:06 -0700
-Subject: [PATCH] Fix a segfault in test on glibc 2.26 #551, take 2
-
----
- test/util-test.cc | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/test/util-test.cc b/test/util-test.cc
-index 6cef7e8..6617b85 100644
---- a/test/util-test.cc
-+++ b/test/util-test.cc
-@@ -837,8 +837,21 @@ TEST(UtilTest, FormatSystemError) {
-   fmt::format_system_error(message, EDOM, "test");
-   EXPECT_EQ(fmt::format("test: {}", get_system_error(EDOM)), message.str());
-   message.clear();
--  fmt::format_system_error(
--        message, EDOM, fmt::StringRef(0, std::numeric_limits<ssize_t>::max()));
-+
-+  // Check if std::allocator throws on allocating max size_t / 2 chars.
-+  size_t max_size = std::numeric_limits<size_t>::max() / 2;
-+  bool throws_on_alloc = false;
-+  try {
-+    std::allocator<char> alloc;
-+    alloc.deallocate(alloc.allocate(max_size), max_size);
-+  } catch (std::bad_alloc) {
-+    throws_on_alloc = true;
-+  }
-+  if (!throws_on_alloc) {
-+    fmt::print("warning: std::allocator allocates {} chars", max_size);
-+    return;
-+  }
-+  fmt::format_system_error(message, EDOM, fmt::StringRef(0, max_size));
-   EXPECT_EQ(fmt::format("error {}", EDOM), message.str());
- }
- 
--- 
-2.14.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 32d9c9221b2e..620a7a16704a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Mihai Bişog <mihai.bisog at [gmail] d0t com>
 pkgname=fmt
-pkgver=4.0.0
+pkgver=4.1.0
 pkgrel=2
 pkgdesc="Open-source formatting library for C++."
 arch=("i686" "x86_64")
@@ -8,19 +8,8 @@ url="http://fmtlib.net"
 license=("BSD")
 makedepends=("cmake")
 
-source=("https://github.com/fmtlib/fmt/archive/$pkgver.tar.gz"
-        "0001-Fix-a-segfault-in-test-on-glibc-2.26-551.patch"
-        "0002-Fix-a-segfault-in-test-on-glibc-2.26-551-take-2.patch")
-md5sums=('c9be9a37bc85493d1116b0af59a25eba'
-         '95021c5ed1673d65b1c4ac54f047cc87'
-         '3d41d1083621f8252949412493f6a207')
-
-prepare() {
-    # Fixes an issue leading to a test segfaulting when run with glibc2.26
-    cd "$pkgname-$pkgver"
-    patch -p 1 -i ${srcdir}/0001-Fix-a-segfault-in-test-on-glibc-2.26-551.patch
-    patch -p 1 -i ${srcdir}/0002-Fix-a-segfault-in-test-on-glibc-2.26-551-take-2.patch
-}
+source=("https://github.com/fmtlib/fmt/archive/$pkgver.tar.gz")
+md5sums=('057d1fc49f6d3114e29e8cc72cf70e08')
 
 build() {
     cd "$pkgname-$pkgver"