From nobody Thu Jun 6 05:21:19 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vvt3M3JD6z5LBm7; Thu, 06 Jun 2024 05:21:19 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vvt3M2CX3z4t8B; Thu, 6 Jun 2024 05:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717651279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XVV3ayCtCz7VzEy3g+HoaKXZumw9nIchXsDHoGBAjEw=; b=XCyJVNyLXQDSXcVKQvxobVo1IVgbaSnBVwAatY2J7iYKs7daMjUT1UafaJ4wBbxgE5e8ZZ +QMy5+tHwxMxAHC1dS+8j33abBsXGRuT4YgXxO5PVGWvVSrR1AW/ABRmYC4Unzhp4Ml48A yOFxRLaSalnmVzo6V/JtdPsHpTPvHThqW4h1MVOT5m28/rq2hHiBktWAz3EJh+27u8yFWP pYg3GFmgMgUTpj1nuwCvqhTMMx2SwUA8IHCEIsMneHct8jLERBRCg7juFbbJAYVyoUW8HL JniAaIuRB32uxZ/vUUNjnxtsjRg2cdVyl6t/acffhwV1ui9wkdS26L3xQ4yoCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717651279; a=rsa-sha256; cv=none; b=TCDjS2zB/ApLQPLKSACCcsQHoPWGhPDx3QpFjM8ElsyWZTyJvt8Heha9bAUv1u76I8sagj Wqs6FmuL+ejX2boqyX7MSUiBeoP3KrvqDDNqjHneBzPeNkAmxGVBVq8DicTSv37JGjK/vB XHguqPVbLDlY1PqfzufrvRDXieqc9iMRdQQzDAiDD/8AHc6KRGhmY+YPrSfe8XRA4YBiTG 9BbTM+yOoYdJyIo6uJKV/lHbvPilDRhAmOLfuaOYROfaccJiwiHrAJstozG7/mQeNEovxs ycoLpZxFB0dsJflT26tCJC6fskSCndHHaOYHEzEEDHf1upCgs3zCd8jBH1CWeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717651279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XVV3ayCtCz7VzEy3g+HoaKXZumw9nIchXsDHoGBAjEw=; b=J+Cap78HVt6Rrv2KiVfOpjelCXUXav9k8TpJ2yWnaeewNXC1rVmyFFDWWw6AbzRM01t8Mw wZbvREQCDb+q7r4+ba7Peu1n5sfXLPbixkPjq6UUa3c8a96x4iCIFK9xIEHF4TEQrAVpZo ZtA43KyTYdGd2zYx5xrGQL9VnC4lGWoluco7Yb3oMT8Y+UelFgb6MH2a2YPI0UIJCOHVgC fQSqIJ9fOlGBvK1U23/P33ubx4cRqiCQIbIcHIaD2cNarTZxmW48ICNgPsJmXnlwsYobjd NiFHntXjoN4mU8Lcbxl+NrbaveCoR4Ncof98BAxtvwIwVMyB5AnLMtaAoKkEAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vvt3M1nbCzYcQ; Thu, 6 Jun 2024 05:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4565LJRV051607; Thu, 6 Jun 2024 05:21:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4565LJND051604; Thu, 6 Jun 2024 05:21:19 GMT (envelope-from git) Date: Thu, 6 Jun 2024 05:21:19 GMT Message-Id: <202406060521.4565LJND051604@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Vanilla I. Shu" Subject: git: f24377b7b9eb - main - archivers/snappy: update to 1.2.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vanilla X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f24377b7b9ebd842c9d458a04eb6c68dfa592fae Auto-Submitted: auto-generated The branch main has been updated by vanilla: URL: https://cgit.FreeBSD.org/ports/commit/?id=f24377b7b9ebd842c9d458a04eb6c68dfa592fae commit f24377b7b9ebd842c9d458a04eb6c68dfa592fae Author: Vanilla I. Shu AuthorDate: 2024-06-06 03:03:23 +0000 Commit: Vanilla I. Shu CommitDate: 2024-06-06 05:21:12 +0000 archivers/snappy: update to 1.2.1 --- archivers/snappy/Makefile | 2 +- archivers/snappy/distinfo | 6 ++--- archivers/snappy/files/patch-CMakeLists.txt | 40 +++++++++++------------------ 3 files changed, 19 insertions(+), 29 deletions(-) diff --git a/archivers/snappy/Makefile b/archivers/snappy/Makefile index 9278973efcfd..4f722de84b77 100644 --- a/archivers/snappy/Makefile +++ b/archivers/snappy/Makefile @@ -1,5 +1,5 @@ PORTNAME= snappy -DISTVERSION= 1.2.0 +DISTVERSION= 1.2.1 CATEGORIES= archivers MAINTAINER= vanilla@FreeBSD.org diff --git a/archivers/snappy/distinfo b/archivers/snappy/distinfo index d362e3372754..7202568365c9 100644 --- a/archivers/snappy/distinfo +++ b/archivers/snappy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712399939 -SHA256 (google-snappy-1.2.0_GH0.tar.gz) = 9b8f10fbb5e3bc112f2e5e64f813cb73faea42ec9c533a5023b5ae08aedef42e -SIZE (google-snappy-1.2.0_GH0.tar.gz) = 1107265 +TIMESTAMP = 1717485290 +SHA256 (google-snappy-1.2.1_GH0.tar.gz) = 736aeb64d86566d2236ddffa2865ee5d7a82d26c9016b36218fcc27ea4f09f86 +SIZE (google-snappy-1.2.1_GH0.tar.gz) = 1108761 diff --git a/archivers/snappy/files/patch-CMakeLists.txt b/archivers/snappy/files/patch-CMakeLists.txt index 1359fddec816..be8f6d0055d1 100644 --- a/archivers/snappy/files/patch-CMakeLists.txt +++ b/archivers/snappy/files/patch-CMakeLists.txt @@ -1,27 +1,18 @@ ---- CMakeLists.txt.orig 2024-04-04 19:04:38 UTC +--- CMakeLists.txt.orig 2024-05-21 19:36:39 UTC +++ CMakeLists.txt -@@ -27,7 +27,7 @@ cmake_minimum_required(VERSION 3.1) - # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - cmake_minimum_required(VERSION 3.1) --project(Snappy VERSION 1.1.10 LANGUAGES C CXX) -+project(Snappy VERSION 1.2.0 LANGUAGES C CXX) - - # C++ standard can be overridden when this is used as a sub-project. - if(NOT CMAKE_CXX_STANDARD) -@@ -83,8 +83,10 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions") +@@ -53,8 +53,10 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + add_definitions(-D_HAS_EXCEPTIONS=0) # Disable RTTI. -- string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") +- string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-") + if (NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD") # devel/folly requires RTTI info, see https://github.com/facebook/folly/issues/1606 -+ string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") ++ string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-") + endif() - endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - - # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make + else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + # Use -Wall for clang and gcc. + if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall") @@ -248,8 +250,7 @@ configure_file( "snappy-stubs-public.h.in" "${PROJECT_BINARY_DIR}/snappy-stubs-public.h") @@ -32,7 +23,7 @@ PRIVATE "snappy-internal.h" "snappy-stubs-internal.h" -@@ -270,20 +271,35 @@ target_sources(snappy +@@ -270,20 +271,34 @@ target_sources(snappy $ $ ) @@ -54,25 +45,24 @@ - set_target_properties(snappy PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) -endif(BUILD_SHARED_LIBS) +set_target_properties(snappy PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) - +add_library(snappy-static STATIC) +target_sources(snappy-static ${SNAPPY_SRCS}) +target_include_directories(snappy-static ${SNAPPY_INCS}) +set_target_properties(snappy-static + PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}) -+ + +target_compile_definitions(snappy-static PRIVATE -DHAVE_CONFIG_H) + +if (MSVC) -+ set_target_properties(snappy-static PROPERTIES OUTPUT_NAME snappy-static) ++ set_target_properties(snappy-static PROPERTIES OUTPUT_NAME snappy-static) +else() -+ set_target_properties(snappy-static PROPERTIES OUTPUT_NAME snappy) ++ set_target_properties(snappy-static PROPERTIES OUTPUT_NAME snappy) +endif() + if(SNAPPY_BUILD_TESTS OR SNAPPY_BUILD_BENCHMARKS) add_library(snappy_test_support "") target_sources(snappy_test_support -@@ -399,7 +415,7 @@ if(SNAPPY_INSTALL) +@@ -399,7 +414,7 @@ if(SNAPPY_INSTALL) include(GNUInstallDirs) if(SNAPPY_INSTALL)