git: ce0f6d297589 - main - databases/evolution-data-server: Update to 3.42.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 05 Nov 2021 17:57:09 UTC
The branch main has been updated by nc:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ce0f6d2975891473c10306fc413c4ba1dd4d051b
commit ce0f6d2975891473c10306fc413c4ba1dd4d051b
Author: Neel Chauhan <nc@FreeBSD.org>
AuthorDate: 2021-11-05 17:27:46 +0000
Commit: Neel Chauhan <nc@FreeBSD.org>
CommitDate: 2021-11-05 17:57:20 +0000
databases/evolution-data-server: Update to 3.42.1
---
databases/evolution-data-server/Makefile | 3 +--
databases/evolution-data-server/distinfo | 6 +++---
databases/evolution-data-server/files/patch-CMakeLists.txt | 4 ++--
databases/evolution-data-server/files/patch-icu61 | 10 +++++-----
.../files/patch-src_camel_camel-hostname-utils.c | 10 ++++++++++
databases/evolution-data-server/pkg-plist | 1 +
6 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index d365cc74978f..5cc639a435bf 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -1,8 +1,7 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
PORTNAME= evolution-data-server
-DISTVERSION= 3.42.0
-PORTREVISION= 1
+DISTVERSION= 3.42.1
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index 8ef3673513d2..4f78b6cc8452 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632863347
-SHA256 (gnome/evolution-data-server-3.42.0.tar.xz) = e8fdd3bc47a07d6f8a3052bbcae880f20f6dbc4f6973a8e90d00169bb99b1635
-SIZE (gnome/evolution-data-server-3.42.0.tar.xz) = 4614616
+TIMESTAMP = 1636128836
+SHA256 (gnome/evolution-data-server-3.42.1.tar.xz) = e6e67f2a77d0ff3e6da50b03dc5fa266e716626bcda2ef44144e317e35f2f528
+SIZE (gnome/evolution-data-server-3.42.1.tar.xz) = 4621996
diff --git a/databases/evolution-data-server/files/patch-CMakeLists.txt b/databases/evolution-data-server/files/patch-CMakeLists.txt
index 6d57e68b65ac..498ca37305de 100644
--- a/databases/evolution-data-server/files/patch-CMakeLists.txt
+++ b/databases/evolution-data-server/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2017-06-02 14:29:11 UTC
+--- CMakeLists.txt.orig 2021-11-05 17:23:17 UTC
+++ CMakeLists.txt
-@@ -503,6 +503,7 @@ endif(WITH_LIBDB)
+@@ -521,6 +521,7 @@ endif(WITH_LIBDB)
# ******************************
set(CMAKE_REQUIRED_LIBRARIES "-liconv")
diff --git a/databases/evolution-data-server/files/patch-icu61 b/databases/evolution-data-server/files/patch-icu61
index 3d1b0082a633..e201fce291e3 100644
--- a/databases/evolution-data-server/files/patch-icu61
+++ b/databases/evolution-data-server/files/patch-icu61
@@ -1,6 +1,6 @@
---- src/libedataserver/e-alphabet-index-private.cpp.orig 2017-05-08 12:04:10 UTC
+--- src/libedataserver/e-alphabet-index-private.cpp.orig 2021-10-29 07:18:27 UTC
+++ src/libedataserver/e-alphabet-index-private.cpp
-@@ -76,7 +76,7 @@ _e_alphabet_index_cxx_get_index (EAlphabetIndex *alph
+@@ -77,7 +77,7 @@ _e_alphabet_index_cxx_get_index (EAlphabetIndex *alph
const gchar *word)
{
UErrorCode status = U_ZERO_ERROR;
@@ -9,7 +9,7 @@
gint index;
g_return_val_if_fail (alphabet_index != NULL, -1);
-@@ -129,7 +129,7 @@ _e_alphabet_index_cxx_get_labels (EAlphabetIndex *alp
+@@ -130,7 +130,7 @@ _e_alphabet_index_cxx_get_labels (EAlphabetIndex *alp
for (i = 0; alphabet_index->priv->nextBucket (status); i++) {
UAlphabeticIndexLabelType label_type;
@@ -18,9 +18,9 @@
std::string string;
label_type = alphabet_index->priv->getBucketLabelType ();
---- src/libedataserver/e-transliterator-private.cpp.orig 2017-05-08 12:04:10 UTC
+--- src/libedataserver/e-transliterator-private.cpp.orig 2021-10-29 07:18:27 UTC
+++ src/libedataserver/e-transliterator-private.cpp
-@@ -74,7 +74,7 @@ gchar *
+@@ -75,7 +75,7 @@ gchar *
_e_transliterator_cxx_transliterate (ETransliterator *transliterator,
const gchar *str)
{
diff --git a/databases/evolution-data-server/files/patch-src_camel_camel-hostname-utils.c b/databases/evolution-data-server/files/patch-src_camel_camel-hostname-utils.c
new file mode 100644
index 000000000000..05fa13d55e11
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-src_camel_camel-hostname-utils.c
@@ -0,0 +1,10 @@
+--- src/camel/camel-hostname-utils.c.orig 2021-11-05 17:23:49 UTC
++++ src/camel/camel-hostname-utils.c
+@@ -24,6 +24,7 @@
+
+ #include <unicode/uchar.h>
+ #include <unicode/uscript.h>
++#include <unicode/ustring.h>
+
+ #include "camel-string-utils.h"
+ #include "camel-hostname-utils.h"
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index 2d7667d07646..93761941a950 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -22,6 +22,7 @@ include/evolution-data-server/camel/camel-folder-summary.h
include/evolution-data-server/camel/camel-folder-thread.h
include/evolution-data-server/camel/camel-folder.h
include/evolution-data-server/camel/camel-gpg-context.h
+include/evolution-data-server/camel/camel-hostname-utils.h
include/evolution-data-server/camel/camel-html-parser.h
include/evolution-data-server/camel/camel-iconv.h
include/evolution-data-server/camel/camel-index.h