[pkgsrc/trunk]: pkgsrc/devel cmake: libarchive from PkgSrc currenty does not ...

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e340bfc5cdcc
branches:  trunk
changeset: 436285:e340bfc5cdcc
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Jul 31 09:42:10 2020 +0000

description:
cmake: libarchive from PkgSrc currenty does not support ZSTD

diffstat:

 devel/cmake-gui/Makefile                            |   3 +--
 devel/cmake/distinfo                                |   3 ++-
 devel/cmake/patches/patch-Source_cmArchiveWrite.cxx |  20 ++++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diffs (52 lines):

diff -r e521f867bb47 -r e340bfc5cdcc devel/cmake-gui/Makefile
--- a/devel/cmake-gui/Makefile  Fri Jul 31 09:26:38 2020 +0000
+++ b/devel/cmake-gui/Makefile  Fri Jul 31 09:42:10 2020 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.13 2020/06/02 08:23:34 adam Exp $
+# $NetBSD: Makefile,v 1.14 2020/07/31 09:42:10 adam Exp $
 
-PKGREVISION= 1
 .include "../../devel/cmake/Makefile.common"
 
 PKGNAME=       cmake-gui-${CMAKE_VERSION}
diff -r e521f867bb47 -r e340bfc5cdcc devel/cmake/distinfo
--- a/devel/cmake/distinfo      Fri Jul 31 09:26:38 2020 +0000
+++ b/devel/cmake/distinfo      Fri Jul 31 09:42:10 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.161 2020/07/31 09:02:31 wiz Exp $
+$NetBSD: distinfo,v 1.162 2020/07/31 09:42:10 adam Exp $
 
 SHA1 (cmake-3.18.1.tar.gz) = 60c36386d0df016adc96c8bb3215d02de3777869
 RMD160 (cmake-3.18.1.tar.gz) = 3ed2d64fe8640f05522570cb9000e31f20477d7e
@@ -18,6 +18,7 @@
 SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = d5e2708df6fcda078b1b5ea59264c663d2633ced
 SHA1 (patch-Source_CursesDialog_ccmake.cxx) = 7f6ca6fda5d0db615f04c18efa8ecdd6ef00cb93
 SHA1 (patch-Source_QtDialog_CMakeLists.txt) = c4007da363c5b7c925f1ff345901057f3fbdc4e1
+SHA1 (patch-Source_cmArchiveWrite.cxx) = 2d226c5394465b96f60e8e3e8d2e49852c721006
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
 SHA1 (patch-Utilities_std_cm_string__view) = 90bbb578c5628b661a25974d7dd9aa6f5063271f
 SHA1 (patch-bootstrap) = fc1b689bbe705cd888e2bef4debad1a26e5885bd
diff -r e521f867bb47 -r e340bfc5cdcc devel/cmake/patches/patch-Source_cmArchiveWrite.cxx
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cmake/patches/patch-Source_cmArchiveWrite.cxx       Fri Jul 31 09:42:10 2020 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-Source_cmArchiveWrite.cxx,v 1.4 2020/07/31 09:42:10 adam Exp $
+
+Libarchive from PkgSrc currenty does not support ZSTD.
+
+--- Source/cmArchiveWrite.cxx.orig     2020-07-20 09:34:34.000000000 +0000
++++ Source/cmArchiveWrite.cxx
+@@ -143,13 +143,6 @@ cmArchiveWrite::cmArchiveWrite(std::ostr
+         return;
+       }
+       break;
+-    case CompressZstd:
+-      if (archive_write_add_filter_zstd(this->Archive) != ARCHIVE_OK) {
+-        this->Error = cmStrCat("archive_write_add_filter_zstd: ",
+-                               cm_archive_error_string(this->Archive));
+-        return;
+-      }
+-      break;
+   }
+ #if !defined(_WIN32) || defined(__CYGWIN__)
+   if (archive_read_disk_set_standard_lookup(this->Disk) != ARCHIVE_OK) {