From nobody Thu Dec 14 17:03:35 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 4SrdwS0TlLz52kf2; Thu, 14 Dec 2023 17:03:36 +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 4SrdwR6yLmz3ZSm; Thu, 14 Dec 2023 17:03:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573416; 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=f4mdgh3YcCi4YgVp3OaGiKeX5+OOHfSpn2vLEP3J0Ww=; b=jsHrHiorV2E9ZKFyQ70UW0g6K5dIAywHWTWGEx20v2G2kZ2Yy+9mCAwb+YAwdw/IGeTD06 jniE1ru3k4psUMHbCL7A3r2cYZa7dpbYOT+esZj+PSu/uj338pLi7fimzDIJeJOuYxuMRo u4lSyCmORIC6rPa5H7eXmOGUG7+xZ9FD0NF0W7LZR4f3CBT+GzV4LDZ+PUP5f8UE38dP4u 8+aGXpIQiO7/DIyCDOp4bGP2LvhsobjAx+Sg8zkZJyqA74t+yAkpBPNh96iSAkKq8Stb1m azCmInQIsPb1uoxM3IM3xm+iIsQnlgjCqJKVRoMByfEfOOrQN7Ql7dcZiwToYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702573416; a=rsa-sha256; cv=none; b=Hs2p7Lh5eV2awsZFm2EKTWPVVLbt8QJmzf+wtAhcCjgyxmezPNvMo4MpZZuLewwCUZiWtA iX5ogb8vB+fXhBt78ueC3szU2BHwc3ss3xRNrynWuV8daqyj73wNhRzDBhzLPCMMHc4fi+ m74c91Vz4NVY2xnvjD8u92+cUGp/q3s2iwidaj/mXdC+9Tmho3nhF7pESvzhh4epndxh70 eCGW0ji6E1Fb40Zh65vbCudfN+C0vIsxMwHOnV3rzai4a6OY/cdB8iWwzInHZvcy3Zd1Cu 08wDt/WZCyRqccijvVxxwxR5EytE4wFjd1ABe0t8iXF5Drz3Om9hIO8qrjreEQ== 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=1702573416; 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=f4mdgh3YcCi4YgVp3OaGiKeX5+OOHfSpn2vLEP3J0Ww=; b=tCPACASj8pHxBvZVXIYxy7eaiXXKYXNu0rmVHJYcAcMjPzqN768Yb1/cpiIRswmjuK/zs+ u3hC3u7YaouN+LAxK1ecsorVxz9tyEYQ8YdFi24RrUeEx9IzGJWNUKUdcpz7EWkAQK2VMj Dm3bQ9a/4FHEx13bedeaQkomQY2B+PvDmFj2ub4P2oQPzZjRiGV3dud9fCdF++HnnjaXCj kclbX6p1pcfs+mDGrtl6cCSEOWRf3g/e4QE3d9LVECc6wZgOU5KsyM4YJGPGuZLTtTfRXG KL0K1XOBZ/OIwM1TOG9p/yERyDV65x+qj9w/aCmJqaL3EQlINJAQgTiCEW2qfw== 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 4SrdwR64ZxzbKC; Thu, 14 Dec 2023 17:03:35 +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 3BEH3ZFX017042; Thu, 14 Dec 2023 17:03:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEH3ZBg017039; Thu, 14 Dec 2023 17:03:35 GMT (envelope-from git) Date: Thu, 14 Dec 2023 17:03:35 GMT Message-Id: <202312141703.3BEH3ZBg017039@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: aba7329a240e - main - mail/astroid: 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: aba7329a240ead0a9e01ef917093ec39874bdf52 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=aba7329a240ead0a9e01ef917093ec39874bdf52 commit aba7329a240ead0a9e01ef917093ec39874bdf52 Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 16:22:34 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-14 17:03:06 +0000 mail/astroid: Fix build with protobuf 22+ - While I'm here, update manpage location (003a571d1d6585196545295efc181514f171c4c4, r523104) --- mail/astroid/Makefile | 4 +++- mail/astroid/files/patch-CMakeLists.txt | 11 ----------- mail/astroid/pkg-plist | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/mail/astroid/Makefile b/mail/astroid/Makefile index 882ea1005060..be7fb6682245 100644 --- a/mail/astroid/Makefile +++ b/mail/astroid/Makefile @@ -26,11 +26,13 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libsoup-2.4.so:devel/libsoup RUN_DEPENDS= notmuch:mail/notmuch -USES= cmake compiler:c++14-lang desktop-file-utils gettext-runtime gnome \ +USES= cmake compiler:c++17-lang desktop-file-utils gettext-runtime gnome \ pkgconfig USE_GITHUB= yes GH_ACCOUNT= astroidmail USE_GNOME= atk atkmm cairo cairomm gdkpixbuf2 glib20 glibmm gtk30 \ gtkmm30 introspection libsigc++20 pango pangomm vte3 +USE_CXXSTD= c++17 + .include diff --git a/mail/astroid/files/patch-CMakeLists.txt b/mail/astroid/files/patch-CMakeLists.txt deleted file mode 100644 index 738a688ce8c8..000000000000 --- a/mail/astroid/files/patch-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2019-08-08 06:21:44 UTC -+++ CMakeLists.txt -@@ -543,7 +543,7 @@ install ( TARGETS tvextension - # Install man page - if (NOT DISABLE_DOCS) - install ( FILES ${CMAKE_BINARY_DIR}/astroid.1.gz -- DESTINATION share/man/man1 -+ DESTINATION man/man1 - ) - endif () - diff --git a/mail/astroid/pkg-plist b/mail/astroid/pkg-plist index 0a878b11d471..38f645adc763 100644 --- a/mail/astroid/pkg-plist +++ b/mail/astroid/pkg-plist @@ -1,7 +1,6 @@ bin/astroid lib/astroid/web-extensions/libtvextension.so lib/girepository-1.0/Astroid-0.2.typelib -man/man1/astroid.1.gz share/applications/astroid.desktop %%DATADIR%%/ui/edit-message.glade %%DATADIR%%/ui/icons/LICENSE @@ -26,3 +25,4 @@ share/applications/astroid.desktop share/gir-1.0/Astroid-0.2.gir share/icons/hicolor/512x512/apps/astroid.png share/icons/hicolor/scalable/apps/astroid.svg +share/man/man1/astroid.1.gz