From nobody Thu Dec 14 17:03:19 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 4Srdw80zjvz52kgx; Thu, 14 Dec 2023 17:03:20 +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 4Srdw80YXdz3YWv; Thu, 14 Dec 2023 17:03:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573400; 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=KCaH6mEWyHQy7p/67uhJ3VOzmjKSszYp1QZbhSFMAzQ=; b=UQ1U81b679tGzUH6QecltpU692x/+icwzBH7i4Rp408i1twByvb6ZOS52GuIhf04vo3G7N ciEFcsSA9V9lnZezLUyLAR4GZTCUKfZgiTkdhDtTqlsfV99TwLQof7My/zUlWdPBJqxtCh AhqovAO4SVx2Xy2uTU+ElEPW1DOm2qilxR+nM/xAIgt7KBzf2BeCz6sI/0zraA1aPNT6N9 xcQ70pNGuPCpoFA3OpyU1p7Zfu5KSAPJ7YiRuehS0plc6UbKNyA1ry1p/9siLecIB+IWnl rpLC3j14vB7BJ1LP1yMxC4ZUazpjDB4sRibWqS7NgmFx7JiQgrz1n1koMqiflw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702573400; a=rsa-sha256; cv=none; b=B4hZu7upb/HToy6nMpqpoiuJK38Db7M4BWeKSYzcIj3p4kwdbd7uy7EFCLkUfq1JkRm7Jq ZGmbdiNTYrf/UcTppRKxur6vnsqjCFa53YL3gVQEmG6hj27pBhyx4OyZtmYodZaLo0eep5 SmEarIPMuRgc9vf1PWZp59OAubYdDajZjoHdNBEXkPhBxSveNzdSJ17CVjaKfHKVuZg40e X11AwYpEqzq9nKWhyMZc3Uwag8PEqSAc3jXXvuy/lcXlSQKpvgsZGtESppwRj0z9EEpA0X nUpAg4m3s2/J7kyYEszVK+m+alrkQ6lfaT4ggO7r7w5D48DYMEZL9DEwJaR0wQ== 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=1702573400; 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=KCaH6mEWyHQy7p/67uhJ3VOzmjKSszYp1QZbhSFMAzQ=; b=Iaj38hO2zaF17iCJ7pukAq38tv+VepWRZpFv4jO0DKuT7U039TK4buJlfQJo/JC5zzV/Ih rOtIA3RUVId2kneaHkFyDnYxsPvXPmUsx0GI8feHpj/WoLj3xw5N8IehzqMa+7ijYJTovT ki9Y+Gzzes8df8OOe87Rw9q81hG/Igtt+Q2XVYXiZJBSZi5ygnEj/DuaQeaPMBgkIBBDa1 P6gbEO2z4bACIGOKZIYATapYBtb7OktAgRy1SSSMJN4pxVibqve3VpFM6Ns16/ym0VhJNF 7au4OrvB2o6U0JlO0bC9IRqWEqQGz0C3CDrpauTdWRw3YDqsvnhrLka9h0eXVA== 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 4Srdw76glwzbmj; Thu, 14 Dec 2023 17:03: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 3BEH3J2L016371; Thu, 14 Dec 2023 17:03:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEH3JGw016368; Thu, 14 Dec 2023 17:03:19 GMT (envelope-from git) Date: Thu, 14 Dec 2023 17:03:19 GMT Message-Id: <202312141703.3BEH3JGw016368@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: 808769fdda87 - main - astro/libosmpbf: 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: 808769fdda874bfe1cd27cf65973cf7458638758 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=808769fdda874bfe1cd27cf65973cf7458638758 commit 808769fdda874bfe1cd27cf65973cf7458638758 Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 16:22:22 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-14 17:03:02 +0000 astro/libosmpbf: Fix build with protobuf 22+ --- astro/libosmpbf/Makefile | 4 ++-- astro/libosmpbf/files/patch-protobuf | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/astro/libosmpbf/Makefile b/astro/libosmpbf/Makefile index 0b57580847d4..ef91f55e6cde 100644 --- a/astro/libosmpbf/Makefile +++ b/astro/libosmpbf/Makefile @@ -17,7 +17,7 @@ USE_GITHUB= yes GH_ACCOUNT= scrosby GH_PROJECT= OSM-binary -USES= cmake compiler:c++11-lang -USE_CXXSTD= c++11 +USES= cmake compiler:c++17-lang +USE_CXXSTD= c++17 .include diff --git a/astro/libosmpbf/files/patch-protobuf b/astro/libosmpbf/files/patch-protobuf new file mode 100644 index 000000000000..499906ee3407 --- /dev/null +++ b/astro/libosmpbf/files/patch-protobuf @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2021-01-06 13:47:22 UTC ++++ CMakeLists.txt +@@ -4,7 +4,7 @@ project(osmpbf VERSION 1.5.0) + + include(GNUInstallDirs) + +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 17) + + find_package(Protobuf REQUIRED) +