Fri Jul 31 09:42:10 2020 UTC ()
cmake: libarchive from PkgSrc currenty does not support ZSTD


(adam)
diff -r1.161 -r1.162 pkgsrc/devel/cmake/distinfo
diff -r1.13 -r1.14 pkgsrc/devel/cmake-gui/Makefile
diff -r0 -r1.4 pkgsrc/devel/cmake/patches/patch-Source_cmArchiveWrite.cxx
cvs diff -r1.161 -r1.162 pkgsrc/devel/cmake/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/cmake/distinfo 2020/07/31 09:02:31 1.161
+++ pkgsrc/devel/cmake/distinfo 2020/07/31 09:42:10 1.162
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1$NetBSD: distinfo,v 1.161 2020/07/31 09:02:31 wiz Exp $ 1$NetBSD: distinfo,v 1.162 2020/07/31 09:42:10 adam Exp $
2 2
3SHA1 (cmake-3.18.1.tar.gz) = 60c36386d0df016adc96c8bb3215d02de3777869 3SHA1 (cmake-3.18.1.tar.gz) = 60c36386d0df016adc96c8bb3215d02de3777869
4RMD160 (cmake-3.18.1.tar.gz) = 3ed2d64fe8640f05522570cb9000e31f20477d7e 4RMD160 (cmake-3.18.1.tar.gz) = 3ed2d64fe8640f05522570cb9000e31f20477d7e
5SHA512 (cmake-3.18.1.tar.gz) = e0591d5fb234f3e7b74d6d2aad44fbf3e19e69547bd428681ba6ad0461d4f3d2a154605808b4733531d2c66f0e91eb39a179ae0d89a37e92a3f20e9cae691468 5SHA512 (cmake-3.18.1.tar.gz) = e0591d5fb234f3e7b74d6d2aad44fbf3e19e69547bd428681ba6ad0461d4f3d2a154605808b4733531d2c66f0e91eb39a179ae0d89a37e92a3f20e9cae691468
6Size (cmake-3.18.1.tar.gz) = 8969366 bytes 6Size (cmake-3.18.1.tar.gz) = 8969366 bytes
7SHA1 (patch-CMakeLists.txt) = fabdb0590f4b97c34c2242749ae3b6af18aefc0a 7SHA1 (patch-CMakeLists.txt) = fabdb0590f4b97c34c2242749ae3b6af18aefc0a
8SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9 8SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9
9SHA1 (patch-Modules_FindCurses.cmake) = 98cac805a6abafcfb8b61e441b50a1d6aec27ad0 9SHA1 (patch-Modules_FindCurses.cmake) = 98cac805a6abafcfb8b61e441b50a1d6aec27ad0
10SHA1 (patch-Modules_FindGTK2.cmake) = 51b7520d35fdec2a7bfcf494fe35ce0e3863e4ee 10SHA1 (patch-Modules_FindGTK2.cmake) = 51b7520d35fdec2a7bfcf494fe35ce0e3863e4ee
11SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f 11SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
12SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05 12SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
13SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c 13SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
14SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 911271546d3ac52be0e8000857bdb236ac50ec1c 14SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 911271546d3ac52be0e8000857bdb236ac50ec1c
15SHA1 (patch-Source_CMakeLists.txt) = 533667d43048b8bc2be17a766b5dc32f3101866e 15SHA1 (patch-Source_CMakeLists.txt) = 533667d43048b8bc2be17a766b5dc32f3101866e
16SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 37d95c6162cc1f4c0e47b537ac8204cb9fe75b8c 16SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 37d95c6162cc1f4c0e47b537ac8204cb9fe75b8c
17SHA1 (patch-Source_Checks_Curses_CheckCurses.c) = c86cae48f7b39fb735eba4788d4e9d595b2ccf3b 17SHA1 (patch-Source_Checks_Curses_CheckCurses.c) = c86cae48f7b39fb735eba4788d4e9d595b2ccf3b
18SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = d5e2708df6fcda078b1b5ea59264c663d2633ced 18SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = d5e2708df6fcda078b1b5ea59264c663d2633ced
19SHA1 (patch-Source_CursesDialog_ccmake.cxx) = 7f6ca6fda5d0db615f04c18efa8ecdd6ef00cb93 19SHA1 (patch-Source_CursesDialog_ccmake.cxx) = 7f6ca6fda5d0db615f04c18efa8ecdd6ef00cb93
20SHA1 (patch-Source_QtDialog_CMakeLists.txt) = c4007da363c5b7c925f1ff345901057f3fbdc4e1 20SHA1 (patch-Source_QtDialog_CMakeLists.txt) = c4007da363c5b7c925f1ff345901057f3fbdc4e1
 21SHA1 (patch-Source_cmArchiveWrite.cxx) = 2d226c5394465b96f60e8e3e8d2e49852c721006
21SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796 22SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
22SHA1 (patch-Utilities_std_cm_string__view) = 90bbb578c5628b661a25974d7dd9aa6f5063271f 23SHA1 (patch-Utilities_std_cm_string__view) = 90bbb578c5628b661a25974d7dd9aa6f5063271f
23SHA1 (patch-bootstrap) = fc1b689bbe705cd888e2bef4debad1a26e5885bd 24SHA1 (patch-bootstrap) = fc1b689bbe705cd888e2bef4debad1a26e5885bd
cvs diff -r1.13 -r1.14 pkgsrc/devel/cmake-gui/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/cmake-gui/Makefile 2020/06/02 08:23:34 1.13
+++ pkgsrc/devel/cmake-gui/Makefile 2020/07/31 09:42:10 1.14
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.13 2020/06/02 08:23:34 adam Exp $ 1# $NetBSD: Makefile,v 1.14 2020/07/31 09:42:10 adam Exp $
2 2
3PKGREVISION= 1 
4.include "../../devel/cmake/Makefile.common" 3.include "../../devel/cmake/Makefile.common"
5 4
6PKGNAME= cmake-gui-${CMAKE_VERSION} 5PKGNAME= cmake-gui-${CMAKE_VERSION}
7 6
8COMMENT= CMake GUI 7COMMENT= CMake GUI
9 8
10USE_CMAKE= yes 9USE_CMAKE= yes
11BUILD_DIRS= Source/QtDialog 10BUILD_DIRS= Source/QtDialog
12CMAKE_ARGS+= -DBUILD_TESTING=OFF 11CMAKE_ARGS+= -DBUILD_TESTING=OFF
13CMAKE_ARGS+= -DBUILD_QtDialog=ON 12CMAKE_ARGS+= -DBUILD_QtDialog=ON
14CMAKE_ARGS+= -DCMAKE_USE_SYSTEM_LIBARCHIVE=ON 13CMAKE_ARGS+= -DCMAKE_USE_SYSTEM_LIBARCHIVE=ON
15CMAKE_ARGS+= -DCMAKE_USE_SYSTEM_CURL=ON 14CMAKE_ARGS+= -DCMAKE_USE_SYSTEM_CURL=ON
16CMAKE_ARGS+= -DCMAKE_USE_SYSTEM_EXPAT=ON 15CMAKE_ARGS+= -DCMAKE_USE_SYSTEM_EXPAT=ON
File Added: pkgsrc/devel/cmake/patches/Attic/patch-Source_cmArchiveWrite.cxx
$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) {