From nobody Thu Dec 14 17:03:49 2023 X-Original-To: dev-commits-ports-main@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 4Srdwj6SZsz52l4P; Thu, 14 Dec 2023 17:03:49 +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 4Srdwj42glz3b7H; Thu, 14 Dec 2023 17:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573429; 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=7/x2V46HN6uYJUCOt1mr96pOAwr2Jwcokyjb2Xw/A2M=; b=gxHhgYRHXBnwy7WHjO1hQZa5JA7p4xDxmKtKNXXKoNruXojwK0UHC8/HjfZnOCqXUX7wrc MQikFmyB7HU9msTzuSCaYKOdscf1dW6VdJlR7cJ7hKBcw1IdxmokYcvEiaoF7darrYylTV x8G0P5HHNXcD4yq+aof5KBR0FWD0sZuBdjIxh9zp630D2qYFQnTurjgH5QB0A4yPbJsnQs 9GwdniNjvQJN0o2Y0nq2D0/IjlG4kWeQK6ZYWLUQsciAfdamRirN5qyMiAa2FpZ6gP3gp/ sP79uJ5Bv3mJfjUibszXeBz3SgSrpT6MeF0DiVzXE4x4YyZpPnD7kzEBRe9HCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702573429; a=rsa-sha256; cv=none; b=sInqd0wvAmlsXMLT+dopXSwTTM6hF/PcURNNsgS+zbJee0OU19C0GJZh/vacbgePISFqsa R5r1hi9I7TXchWuAtPQucHief/SimeBnyHH45mzNEdBJFEoT5xUOTuzcImIWx2dl41BQog wSTGDqfBHYavAZRjzPzeqaH1n2suUr0LpG5oMNBl/EGh04cjdKycorcNpGcEhIt38k7w60 kbLW9eNJJdamwJkQiXkzzxA1xDco/BFFmn8QnmGyG/oeHD78akdxxhYkBS/7dt4enssQXK Tn+jHtUvDHJH1i7dPlDRBypbUBm9CR7BQo5nZNOs6+4uDyr2im09eId539SwSg== 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=1702573429; 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=7/x2V46HN6uYJUCOt1mr96pOAwr2Jwcokyjb2Xw/A2M=; b=QPWex8A9hTBUGuUurcDH+YXUF2sFUPOAHGq+k5811u48/nffUaWioyHySbnoD/aIsHTyk5 0Bilk8YQMnZwahSWPEU4RuxmApXkR0Nq8TjO+E3/Ou/DJWHLZ3KqfT0wJK0KxKdb/3dArs udtBifEFFN7f6psjHwI5yJArf+Tt/la+FA6K/bkBPFdGM2NVBWZT4sOCSjz5W6ur1/BZZQ gwr5TA1oqW8yppwqzsACkikHDSq+k0Xrpc6yjDjqMv06Br76fLineBCsxCQ4wGnYDja3v3 ejEyejnn3dEAiInXiTqPkCcjeXOoqKm0VTT+U3kXvt58xwG+p+g/wVbnQcITAA== 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 4Srdwj2rlfzbmp; Thu, 14 Dec 2023 17:03:49 +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 3BEH3nqf017627; Thu, 14 Dec 2023 17:03:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEH3nEs017624; Thu, 14 Dec 2023 17:03:49 GMT (envelope-from git) Date: Thu, 14 Dec 2023 17:03:49 GMT Message-Id: <202312141703.3BEH3nEs017624@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: c5ebde2ab858 - main - net-im/ricochet: Fix build with protobuf 22+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5ebde2ab858e84a03fdc26b576aba65add8a0f3 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=c5ebde2ab858e84a03fdc26b576aba65add8a0f3 commit c5ebde2ab858e84a03fdc26b576aba65add8a0f3 Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 16:23:12 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-14 17:03:08 +0000 net-im/ricochet: Fix build with protobuf 22+ --- net-im/ricochet/Makefile | 4 +++- net-im/ricochet/files/patch-ricochet.pro | 11 ++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/net-im/ricochet/Makefile b/net-im/ricochet/Makefile index 962651787961..db96d352d700 100644 --- a/net-im/ricochet/Makefile +++ b/net-im/ricochet/Makefile @@ -15,12 +15,14 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libprotobuf.so:devel/protobuf -USES= compiler:c++11-lib gl gmake pkgconfig qmake qt:5 ssl +USES= compiler:c++17-lang gl gmake pkgconfig qmake qt:5 ssl USE_GITHUB= yes GH_ACCOUNT= ricochet-im USE_QT= core declarative gui multimedia network quickcontrols widgets \ buildtools:build linguisttools:build USE_GL= gl + +USE_CXXSTD= c++17 QMAKE_ARGS+= DEFINES+=RICOCHET_NO_PORTABLE OPENSSLDIR=${OPENSSLBASE} OPTIONS_DEFINE= TOR diff --git a/net-im/ricochet/files/patch-ricochet.pro b/net-im/ricochet/files/patch-ricochet.pro index 95e60a660f0d..8db388772378 100644 --- a/net-im/ricochet/files/patch-ricochet.pro +++ b/net-im/ricochet/files/patch-ricochet.pro @@ -1,6 +1,15 @@ --- ricochet.pro.orig 2016-11-04 22:05:33 UTC +++ ricochet.pro -@@ -52,18 +52,18 @@ CONFIG(release,debug|release):DEFINES += +@@ -36,7 +36,7 @@ lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION + TARGET = ricochet + TEMPLATE = app + QT += core gui network quick widgets multimedia +-CONFIG += c++11 ++CONFIG += c++17 + + VERSION = 1.1.4 + +@@ -52,18 +52,18 @@ CONFIG(release,debug|release):DEFINES += QT_NO_DEBUG_O contains(DEFINES, RICOCHET_NO_PORTABLE) { unix:!macx {