From owner-svn-ports-all@freebsd.org Sun Feb 16 21:43:19 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E043E243DBA; Sun, 16 Feb 2020 21:43:19 +0000 (UTC) (envelope-from pizzamig@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48LLFz5h2dz4dKm; Sun, 16 Feb 2020 21:43:19 +0000 (UTC) (envelope-from pizzamig@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A6DEF2C69D; Sun, 16 Feb 2020 21:43:19 +0000 (UTC) (envelope-from pizzamig@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01GLhJpn045272; Sun, 16 Feb 2020 21:43:19 GMT (envelope-from pizzamig@FreeBSD.org) Received: (from pizzamig@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01GLhIJa045269; Sun, 16 Feb 2020 21:43:18 GMT (envelope-from pizzamig@FreeBSD.org) Message-Id: <202002162143.01GLhIJa045269@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pizzamig set sender to pizzamig@FreeBSD.org using -f From: Luca Pizzamiglio Date: Sun, 16 Feb 2020 21:43:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526328 - in head/devel/electron6: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pizzamig X-SVN-Commit-Paths: in head/devel/electron6: . files X-SVN-Commit-Revision: 526328 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Feb 2020 21:43:19 -0000 Author: pizzamig Date: Sun Feb 16 21:43:18 2020 New Revision: 526328 URL: https://svnweb.freebsd.org/changeset/ports/526328 Log: devel/electron6: small cleanup no functional changes, only small clean-up Submitted by: maintainer (via github) Added: head/devel/electron6/files/patch-third__party_snappy_src_snappy.h - copied unchanged from r526327, head/devel/electron6/files/patch-third__part_snappy_src_snappy.h Deleted: head/devel/electron6/Makefile.tests head/devel/electron6/files/patch-third__part_snappy_src_snappy.h Modified: head/devel/electron6/Makefile head/devel/electron6/Makefile.version head/devel/electron6/pkg-plist Modified: head/devel/electron6/Makefile ============================================================================== --- head/devel/electron6/Makefile Sun Feb 16 21:32:55 2020 (r526327) +++ head/devel/electron6/Makefile Sun Feb 16 21:43:18 2020 (r526328) @@ -165,7 +165,7 @@ POST_BUILD_DIST_TARGETS= electron_dist_zip electron_ch YARN_TIMESTAMP= 1576819964 PLIST_SUB= ELECTRON_VER=${ELECTRON_VER} \ - PKGNAMESUFFIX=${PKGNAMESUFFIX} + ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR} .include "Makefile.version" .include Modified: head/devel/electron6/Makefile.version ============================================================================== --- head/devel/electron6/Makefile.version Sun Feb 16 21:32:55 2020 (r526327) +++ head/devel/electron6/Makefile.version Sun Feb 16 21:43:18 2020 (r526328) @@ -1,4 +1,4 @@ # $FreeBSD$ ELECTRON_VER= 6.1.7 -ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/^([0-9]+)\..+$$/\1/} +ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} Copied: head/devel/electron6/files/patch-third__party_snappy_src_snappy.h (from r526327, head/devel/electron6/files/patch-third__part_snappy_src_snappy.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/electron6/files/patch-third__party_snappy_src_snappy.h Sun Feb 16 21:43:18 2020 (r526328, copy of r526327, head/devel/electron6/files/patch-third__part_snappy_src_snappy.h) @@ -0,0 +1,20 @@ +--- third_party/snappy/src/snappy.h.orig 2020-01-22 18:43:16 UTC ++++ third_party/snappy/src/snappy.h +@@ -73,7 +73,7 @@ namespace snappy { + // Original contents of *output are lost. + // + // REQUIRES: "input[]" is not an alias of "*output". +- size_t Compress(const char* input, size_t input_length, string* output); ++ size_t Compress(const char* input, size_t input_length, std::string* output); + + // Decompresses "compressed[0,compressed_length-1]" to "*uncompressed". + // Original contents of "*uncompressed" are lost. +@@ -82,7 +82,7 @@ namespace snappy { + // + // returns false if the message is corrupted and could not be decompressed + bool Uncompress(const char* compressed, size_t compressed_length, +- string* uncompressed); ++ std::string* uncompressed); + + // Decompresses "compressed" to "*uncompressed". + // Modified: head/devel/electron6/pkg-plist ============================================================================== --- head/devel/electron6/pkg-plist Sun Feb 16 21:32:55 2020 (r526327) +++ head/devel/electron6/pkg-plist Sun Feb 16 21:43:18 2020 (r526328) @@ -1,4 +1,4 @@ -bin/electron%%PKGNAMESUFFIX%% +bin/electron%%ELECTRON_VER_MAJOR%% %%DATADIR%%/LICENSE %%DATADIR%%/LICENSES.chromium.html %%DATADIR%%/chrome_100_percent.pak