Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/cmake cmake: Remove not needed patch for libarchive



details:   https://anonhg.NetBSD.org/pkgsrc/rev/81f5a0ca57f6
branches:  trunk
changeset: 433875:81f5a0ca57f6
user:      kamil <kamil%pkgsrc.org@localhost>
date:      Mon Jun 08 12:00:59 2020 +0000

description:
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.

Patch by <gang65>

Closes https://github.com/NetBSD/pkgsrc/pull/61

diffstat:

 devel/cmake/distinfo                                |   3 +-
 devel/cmake/patches/patch-Source_cmArchiveWrite.cxx |  22 ---------------------
 2 files changed, 1 insertions(+), 24 deletions(-)

diffs (43 lines):

diff -r 858791c7c745 -r 81f5a0ca57f6 devel/cmake/distinfo
--- a/devel/cmake/distinfo      Mon Jun 08 11:44:41 2020 +0000
+++ b/devel/cmake/distinfo      Mon Jun 08 12:00:59 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.159 2020/06/01 06:21:27 adam Exp $
+$NetBSD: distinfo,v 1.160 2020/06/08 12:00:59 kamil Exp $
 
 SHA1 (cmake-3.17.3.tar.gz) = faef76cfc9f07cae7eecee72eba0d28abbbac5b4
 RMD160 (cmake-3.17.3.tar.gz) = 3dbfa61d6a51c1190bba6b0423dd3d227906a24c
@@ -18,7 +18,6 @@
 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 -r 858791c7c745 -r 81f5a0ca57f6 devel/cmake/patches/patch-Source_cmArchiveWrite.cxx
--- a/devel/cmake/patches/patch-Source_cmArchiveWrite.cxx       Mon Jun 08 11:44:41 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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) {



Home | Main Index | Thread Index | Old Index