git: aba7329a240e - main - mail/astroid: Fix build with protobuf 22+

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Thu, 14 Dec 2023 17:03:35 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=aba7329a240ead0a9e01ef917093ec39874bdf52

commit aba7329a240ead0a9e01ef917093ec39874bdf52
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-12-14 16:22:34 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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 <bsd.port.mk>
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