Received: by mail.netbsd.org (Postfix, from userid 605) id CD75184D59; Fri, 31 Jul 2020 09:42:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5834584D2D for ; Fri, 31 Jul 2020 09:42:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id dHW5KkdHGJrW for ; Fri, 31 Jul 2020 09:42:10 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id CBE4884CDA for ; Fri, 31 Jul 2020 09:42:10 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id BF3DCFB28; Fri, 31 Jul 2020 09:42:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_159618853064200" MIME-Version: 1.0 Date: Fri, 31 Jul 2020 09:42:10 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/devel To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20200731094210.BF3DCFB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_159618853064200 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Fri Jul 31 09:42:10 UTC 2020 Modified Files: pkgsrc/devel/cmake: distinfo pkgsrc/devel/cmake-gui: Makefile Added Files: pkgsrc/devel/cmake/patches: patch-Source_cmArchiveWrite.cxx Log Message: cmake: libarchive from PkgSrc currenty does not support ZSTD To generate a diff of this commit: cvs rdiff -u -r1.161 -r1.162 pkgsrc/devel/cmake/distinfo cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/cmake-gui/Makefile cvs rdiff -u -r0 -r1.4 \ pkgsrc/devel/cmake/patches/patch-Source_cmArchiveWrite.cxx Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_159618853064200 Content-Disposition: inline Content-Length: 2729 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/cmake/distinfo diff -u pkgsrc/devel/cmake/distinfo:1.161 pkgsrc/devel/cmake/distinfo:1.162 --- pkgsrc/devel/cmake/distinfo:1.161 Fri Jul 31 09:02:31 2020 +++ pkgsrc/devel/cmake/distinfo Fri Jul 31 09:42:10 2020 @@ -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_Curses_CheckCu 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 Index: pkgsrc/devel/cmake-gui/Makefile diff -u pkgsrc/devel/cmake-gui/Makefile:1.13 pkgsrc/devel/cmake-gui/Makefile:1.14 --- pkgsrc/devel/cmake-gui/Makefile:1.13 Tue Jun 2 08:23:34 2020 +++ pkgsrc/devel/cmake-gui/Makefile Fri Jul 31 09:42:10 2020 @@ -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} Added files: Index: pkgsrc/devel/cmake/patches/patch-Source_cmArchiveWrite.cxx diff -u /dev/null pkgsrc/devel/cmake/patches/patch-Source_cmArchiveWrite.cxx:1.4 --- /dev/null Fri Jul 31 09:42:10 2020 +++ pkgsrc/devel/cmake/patches/patch-Source_cmArchiveWrite.cxx Fri Jul 31 09:42:10 2020 @@ -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) { --_----------=_159618853064200--