Pullup ticket #6703 - requested by wiz

mail/evolution: build fix

Revisions pulled up:
- mail/evolution/Makefile                                       1.263
- mail/evolution/buildlink3.mk                                  1.103
- mail/evolution/distinfo                                       1.90
- mail/evolution/patches/patch-src-modules-book-config-carddav-evolution-book-config-carddav-c 1.1
- mail/evolution/patches/patch-src-modules-cal-config-caldav-evolution-cal-config-caldav-c 1.1
- mail/evolution/patches/patch-src-modules-cal-config-google-e-google-chooser-button-c 1.1

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Wed Nov  9 13:00:58 UTC 2022

   Modified Files:
   	pkgsrc/mail/evolution: Makefile buildlink3.mk distinfo
   Added Files:
   	pkgsrc/mail/evolution/patches:
   	    patch-src-modules-book-config-carddav-evolution-book-config-carddav-c
   	    patch-src-modules-cal-config-caldav-evolution-cal-config-caldav-c
   	    patch-src-modules-cal-config-google-e-google-chooser-button-c

   Log Message:
   evolution: fix build with latest evolution-data-server

   Patches from Dave Tyson on tech-pkg.

   Remove BROKEN tag, bump PKGREVISION.

6 files changed, 70 insertions, 8 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 147f24f0d44..81a86a25759 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.262 2022/08/11 05:08:58 gutteridge Exp $
+# $NetBSD: Makefile,v 1.262.2.1 2022/11/16 17:12:24 bsiegert Exp $
 
 DISTNAME=	evolution-3.34.1
-PKGREVISION=	16
+PKGREVISION=	17
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
@@ -16,8 +16,6 @@ USE_TOOLS+=	pkg-config itstool
 USE_TOOLS+=	intltool msgfmt msgmerge xgettext
 USE_TOOLS+=	gdbus-codegen
 
-BROKEN+=	"Incompatible with latest evolution-data-server, needs update"
-
 DEPENDS+=	highlight-[0-9]*:../../textproc/highlight
 
 LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/evolution
diff --git a/mail/evolution/buildlink3.mk b/mail/evolution/buildlink3.mk
index 8c6be18d581..6eedba4d4d9 100644
--- a/mail/evolution/buildlink3.mk
+++ b/mail/evolution/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.102 2022/08/11 05:08:58 gutteridge Exp $
+# $NetBSD: buildlink3.mk,v 1.102.2.1 2022/11/16 17:12:24 bsiegert Exp $
 
 BUILDLINK_TREE+=	evolution
 
@@ -9,8 +9,6 @@ BUILDLINK_API_DEPENDS.evolution+=	evolution>=2.8.0
 BUILDLINK_ABI_DEPENDS.evolution+=	evolution>=3.34.1nb16
 BUILDLINK_PKGSRCDIR.evolution?=		../../mail/evolution
 
-.include "../../devel/nspr/buildlink3.mk"
-.include "../../devel/nss/buildlink3.mk"
 .include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../audio/libcanberra/buildlink3.mk"
 .endif # EVOLUTION_BUILDLINK3_MK
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 7940041af1c..5b44317da17 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.89 2021/10/26 10:53:59 nia Exp $
+$NetBSD: distinfo,v 1.89.8.1 2022/11/16 17:12:24 bsiegert Exp $
 
 BLAKE2s (evolution-3.34.1.tar.xz) = 5bce69bc6de9df34996eb577efc99fa60e201d150c00e21de4c0fbd331b0267a
 SHA512 (evolution-3.34.1.tar.xz) = d72329b2dde41724cc8818f843b5530c5465e4fd7fceca3208a26180f9d6e286165d03d33ba4066e959a6e69bd1e5d33759d4287a57bb765bf7143410be6102c
 Size (evolution-3.34.1.tar.xz) = 11919428 bytes
 SHA1 (patch-cmake_modules_PrintableOptions.cmake) = 4f6eca93f9e859730b7abe0b7daceb0b4219b345
+SHA1 (patch-src-modules-book-config-carddav-evolution-book-config-carddav-c) = 5c669c2db616f6a7d63565105627d448071b7708
+SHA1 (patch-src-modules-cal-config-caldav-evolution-cal-config-caldav-c) = 0cdbf2ec489c2338e8a3cf860353dc19c411637e
+SHA1 (patch-src-modules-cal-config-google-e-google-chooser-button-c) = 26615d37c56c2619e847d191be1c885835aa8539
diff --git a/mail/evolution/patches/patch-src-modules-book-config-carddav-evolution-book-config-carddav-c b/mail/evolution/patches/patch-src-modules-book-config-carddav-evolution-book-config-carddav-c
new file mode 100644
index 00000000000..e78c4db96ef
--- /dev/null
+++ b/mail/evolution/patches/patch-src-modules-book-config-carddav-evolution-book-config-carddav-c
@@ -0,0 +1,21 @@
+$NetBSD: patch-src-modules-book-config-carddav-evolution-book-config-carddav-c,v 1.1.2.2 2022/11/16 17:12:24 bsiegert Exp $
+
+e_webdav_discover_content_get_selected now takes an extra argument for order
+
+--- src/modules/book-config-carddav/evolution-book-config-carddav.c.orig	2019-10-07 08:22:43.000000000 +0100
++++ src/modules/book-config-carddav/evolution-book-config-carddav.c	2022-11-06 22:08:40.619734168 +0000
+@@ -115,12 +115,12 @@
+ 
+ 	if (gtk_dialog_run (dialog) == GTK_RESPONSE_ACCEPT) {
+ 		gchar *href = NULL, *display_name = NULL, *color = NULL, *email;
+-		guint supports = 0;
++		guint supports = 0, order = 0;
+ 		GtkWidget *content;
+ 
+ 		content = e_webdav_discover_dialog_get_content (dialog);
+ 
+-		if (e_webdav_discover_content_get_selected (content, 0, &href, &supports, &display_name, &color)) {
++		if (e_webdav_discover_content_get_selected (content, 0, &href, &supports, &display_name, &color, &order)) {
+ 			soup_uri_free (uri);
+ 			uri = soup_uri_new (href);
+ 
diff --git a/mail/evolution/patches/patch-src-modules-cal-config-caldav-evolution-cal-config-caldav-c b/mail/evolution/patches/patch-src-modules-cal-config-caldav-evolution-cal-config-caldav-c
new file mode 100644
index 00000000000..4fad033a6dd
--- /dev/null
+++ b/mail/evolution/patches/patch-src-modules-cal-config-caldav-evolution-cal-config-caldav-c
@@ -0,0 +1,21 @@
+$NetBSD: patch-src-modules-cal-config-caldav-evolution-cal-config-caldav-c,v 1.1.2.2 2022/11/16 17:12:24 bsiegert Exp $
+
+e_webdav_discover_content_get_selected now takes an extra argument for order
+
+--- src/modules/cal-config-caldav/evolution-cal-config-caldav.c.orig	2019-10-07 08:22:43.000000000 +0100
++++ src/modules/cal-config-caldav/evolution-cal-config-caldav.c	2022-11-06 22:11:48.813568184 +0000
+@@ -146,12 +146,12 @@
+ 
+ 	if (gtk_dialog_run (dialog) == GTK_RESPONSE_ACCEPT) {
+ 		gchar *href = NULL, *display_name = NULL, *color = NULL, *email;
+-		guint supports = 0;
++		guint supports = 0, order = 0;
+ 		GtkWidget *content;
+ 
+ 		content = e_webdav_discover_dialog_get_content (dialog);
+ 
+-		if (e_webdav_discover_content_get_selected (content, 0, &href, &supports, &display_name, &color)) {
++		if (e_webdav_discover_content_get_selected (content, 0, &href, &supports, &display_name, &color, &order)) {
+ 			soup_uri_free (uri);
+ 			uri = soup_uri_new (href);
+ 
diff --git a/mail/evolution/patches/patch-src-modules-cal-config-google-e-google-chooser-button-c b/mail/evolution/patches/patch-src-modules-cal-config-google-e-google-chooser-button-c
new file mode 100644
index 00000000000..52d866def9a
--- /dev/null
+++ b/mail/evolution/patches/patch-src-modules-cal-config-google-e-google-chooser-button-c
@@ -0,0 +1,21 @@
+$NetBSD: patch-src-modules-cal-config-google-e-google-chooser-button-c,v 1.1.2.2 2022/11/16 17:12:24 bsiegert Exp $
+
+e_webdav_discover_content_get_selected now takes an extra argument for order
+
+--- src/modules/cal-config-google/e-google-chooser-button.c.orig	2019-10-07 08:22:43.000000000 +0100
++++ src/modules/cal-config-google/e-google-chooser-button.c	2022-11-06 22:14:10.184192760 +0000
+@@ -257,12 +257,12 @@
+ 
+ 	if (gtk_dialog_run (dialog) == GTK_RESPONSE_ACCEPT) {
+ 		gchar *href = NULL, *display_name = NULL, *color = NULL, *email;
+-		guint supports = 0;
++		guint supports = 0, order = 0;
+ 		GtkWidget *content;
+ 
+ 		content = e_webdav_discover_dialog_get_content (dialog);
+ 
+-		if (e_webdav_discover_content_get_selected (content, 0, &href, &supports, &display_name, &color)) {
++		if (e_webdav_discover_content_get_selected (content, 0, &href, &supports, &display_name, &color, &order)) {
+ 			soup_uri_free (uri);
+ 			uri = soup_uri_new (href);
+