[arch-commits] Commit in leatherman/trunk (PKGBUILD gcc11.patch)

[Tim Meusel]

    Date: Tuesday, July 13, 2021 @ 21:16:37
  Author: bastelfreak
Revision: 976917

update leatherman 1.12.4-2->1.12.6-1

Modified:
  leatherman/trunk/PKGBUILD
Deleted:
  leatherman/trunk/gcc11.patch

-------------+
 PKGBUILD    |    9 ++++-----
 gcc11.patch |   58 ----------------------------------------------------------
 2 files changed, 4 insertions(+), 63 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-13 21:08:32 UTC (rev 976916)
+++ PKGBUILD	2021-07-13 21:16:37 UTC (rev 976917)
@@ -1,10 +1,11 @@
 # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Tim Meusel <tim at bastelfreak.de>
 # Contributor: Christian Rebischke <chris.rebischke at archlinux.org>
 # Contributor: Jonathan Steel <jsteel at archlinux.org>
 
 pkgname=leatherman
-pkgver=1.12.4
-pkgrel=2
+pkgver=1.12.6
+pkgrel=1
 pkgdesc="Collection of C++ and CMake utility libraries"
 arch=('x86_64')
 url="https://github.com/puppetlabs/leatherman"
@@ -30,7 +31,7 @@
         gcc11.patch
         build-against-ruby27.patch)
 
-sha512sums=('b2645a5049856f93c30bb89e87e3a47cf8137aeac73708248b2b228874818063fb31440ca2bd760783e8c95e880fe7ae34a387fcc448efee01dd0cda48089b55'
+sha512sums=('4e2a1ee2e7226224f115648a78bc3e4798ef0528ef32e01d1e7ebcbeb1250fd6ed88001c9db21456feeef3bd6ff201b0fd68fd5feb2671a66d13519dd3454386'
             'bf05009e466ea62282a78c16fe23e8cfacfbb6e5da9fdf118bf7b1b257a3b48c5c5665ef080bfdf12c9088cb4e180358d11a5bd05e2e658bdbe8f35e0bba4969'
             '1f95d6e0ac1000d2eb8cdfee6184ca74d2bb96a9dec50cdd1539cb7e3060decbf1e4863fa2594ce1cf3405b1edf270b94b82f1c9ca79aaeb6f32f11d10c7eece'
             '7d5418f4ade7b614eb22120a36ff02bf52ed10cf400b9c8cbca201684735b8ad7ff2a682f8602eb3a2d74c14b362c594d621b27c0f13f64716835b2bbfce7732'
@@ -46,8 +47,6 @@
   patch -Np1 < ../librapidjson-1.1.patch
   # Boost 1.74 provides nowide, and since leatherman vendors nowide it has to be patched out.
   patch -Np1 < ../1.12.4-shared_nowide.patch
-  # Fix build with GCC 11
-  patch -Np1 -i ../gcc11.patch
   # update leatherman to use ruby-2.7 and not ruby
   patch -Np1 < ../build-against-ruby27.patch
 }

Deleted: gcc11.patch
===================================================================
--- gcc11.patch	2021-07-13 21:08:32 UTC (rev 976916)
+++ gcc11.patch	2021-07-13 21:16:37 UTC (rev 976917)
@@ -1,58 +0,0 @@
-From 162559cddbb1796ba22a6355dfd9d126c4c216eb Mon Sep 17 00:00:00 2001
-From: mihaibuzgau <mihai.buzgau at puppet.com>
-Date: Tue, 25 May 2021 12:46:50 +0300
-Subject: [PATCH] (PA-3604) update code to compile with new compilers
-
----
- util/inc/leatherman/util/scope_exit.hpp      | 5 +++--
- util/inc/leatherman/util/scoped_resource.hpp | 5 +++--
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/util/inc/leatherman/util/scope_exit.hpp b/util/inc/leatherman/util/scope_exit.hpp
-index 3aed675..3f2f3df 100644
---- a/util/inc/leatherman/util/scope_exit.hpp
-+++ b/util/inc/leatherman/util/scope_exit.hpp
-@@ -5,6 +5,7 @@
- #pragma once
- 
- #include <functional>
-+#include <cstddef>
- 
- namespace leatherman { namespace util {
- 
-@@ -51,9 +52,9 @@ namespace leatherman { namespace util {
-     private:
-         explicit scope_exit(scope_exit const&) = delete;
-         scope_exit& operator=(scope_exit const&) = delete;
--        void* operator new(size_t) = delete;
-+        void* operator new(std::size_t) = delete;
-         void operator delete(void*) = delete;
--        void* operator new[](size_t) = delete;
-+        void* operator new[](std::size_t) = delete;
-         void operator delete[](void* ptr) = delete;
- 
-         std::function<void()> _callback;
-diff --git a/util/inc/leatherman/util/scoped_resource.hpp b/util/inc/leatherman/util/scoped_resource.hpp
-index 2ff19fc..062026f 100644
---- a/util/inc/leatherman/util/scoped_resource.hpp
-+++ b/util/inc/leatherman/util/scoped_resource.hpp
-@@ -5,6 +5,7 @@
- #pragma once
- 
- #include <functional>
-+#include <cstddef>
- 
- namespace leatherman { namespace util {
-     /**
-@@ -121,9 +122,9 @@ namespace leatherman { namespace util {
-         std::function<void(T&)> _deleter;
- 
-      private:
--        void* operator new(size_t) = delete;
-+        void* operator new(std::size_t) = delete;
-         void operator delete(void*) = delete;
--        void* operator new[](size_t) = delete;
-+        void* operator new[](std::size_t) = delete;
-         void operator delete[](void* ptr) = delete;
-     };
-