From a265657c070f42f4b004711de3932b15c71e4177 Mon Sep 17 00:00:00 2001 From: Bartosz Kosiorek Date: Mon, 1 Jun 2020 17:00:51 +0200 Subject: [PATCH] cmake: Remove not needed patch for libarchive According to comment: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4833#note_769729 the libarchive 3.3.3 is required for CMake build. It is already contain Zstd support. --- devel/cmake/distinfo | 1 - .../patches/patch-Source_cmArchiveWrite.cxx | 22 ------------------- 2 files changed, 23 deletions(-) delete mode 100644 devel/cmake/patches/patch-Source_cmArchiveWrite.cxx diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index 93b82fa4429d..d1ffd0ef786f 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -18,7 +18,6 @@ SHA1 (patch-Source_Checks_Curses_CheckCurses.c) = c86cae48f7b39fb735eba4788d4e9d 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) = 1b6a46252bd10618703116ef69e22f8ec5c5f31f SHA1 (patch-Source_cmWorkerPool.cxx) = 8eb3faf10767fe9228ed6822c17c96c04f017777 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796 SHA1 (patch-Utilities_std_cm_string__view) = 90bbb578c5628b661a25974d7dd9aa6f5063271f diff --git a/devel/cmake/patches/patch-Source_cmArchiveWrite.cxx b/devel/cmake/patches/patch-Source_cmArchiveWrite.cxx deleted file mode 100644 index a05586910520..000000000000 --- a/devel/cmake/patches/patch-Source_cmArchiveWrite.cxx +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-Source_cmArchiveWrite.cxx,v 1.2 2019/11/27 22:32:27 adam Exp $ - -Allow older libarchive without ZSTD support. - ---- Source/cmArchiveWrite.cxx.orig 2019-11-26 14:18:07.000000000 +0000 -+++ Source/cmArchiveWrite.cxx -@@ -141,6 +141,7 @@ cmArchiveWrite::cmArchiveWrite(std::ostr - return; - } - break; -+#ifdef ARCHIVE_FILTER_ZSTD - case CompressZstd: - if (archive_write_add_filter_zstd(this->Archive) != ARCHIVE_OK) { - this->Error = cmStrCat("archive_write_add_filter_zstd: ", -@@ -148,6 +149,7 @@ cmArchiveWrite::cmArchiveWrite(std::ostr - return; - } - break; -+#endif - } - #if !defined(_WIN32) || defined(__CYGWIN__) - if (archive_read_disk_set_standard_lookup(this->Disk) != ARCHIVE_OK) {