Selaa lähdekoodia

package/dovecot: Fix build with icu 76.1

Buildroot commit dcee99507c6767230fd1faeeefe95f5662eb03a3 bumped icu
from version 73-2 to 77-1 causing a build error during linking.

Upstream is not expected to backport this patch to 2.3.x:
https://dovecot.org/mailman3/archives/list/dovecot@dovecot.org/thread/VT7D6XWB5ZRL7KIER445D3JR464CALPU/

Fixes:
https://autobuild.buildroot.org/results/94fc2de03b5d6afd32c457be7faf0ac06cc37212/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
Bernd Kuhls 2 kuukautta sitten
vanhempi
commit
0ec4649c16

+ 28 - 0
package/dovecot/0002-configure-Explicitly-check-for-icu-uc.patch

@@ -0,0 +1,28 @@
+From 1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830 Mon Sep 17 00:00:00 2001
+From: fundawang <fundawang@yeah.net>
+Date: Sun, 27 Oct 2024 22:11:21 +0800
+Subject: [PATCH] configure: Explicitly check for icu-uc
+
+Ensure we link against libicu-uc when it's split in v76.
+
+Upstream: https://github.com/dovecot/core/commit/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+[Bernd: backported to version 2.3.21.1]
+---
+ m4/want_icu.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/m4/want_icu.m4 b/m4/want_icu.m4
+index b656ef9f479..405a73b361f 100644
+--- a/m4/want_icu.m4
++++ b/m4/want_icu.m4
+@@ -1,7 +1,7 @@
+ AC_DEFUN([DOVECOT_WANT_ICU], [
+   if test "$want_icu" != "no"; then
+     if test "$PKG_CONFIG" != "" && $PKG_CONFIG --exists icu-i18n 2>/dev/null; then
+-      PKG_CHECK_MODULES(LIBICU, icu-i18n)
++      PKG_CHECK_MODULES(LIBICU, icu-i18n icu-uc)
+       have_icu=yes
+       AC_DEFINE(HAVE_LIBICU,, [Define if you want ICU normalization support for FTS])
+     elif test "$want_icu" = "yes"; then

+ 4 - 0
package/dovecot/dovecot.mk

@@ -12,7 +12,11 @@ DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015
 DOVECOT_LICENSE_FILES = COPYING COPYING.LGPL COPYING.MIT
 DOVECOT_CPE_ID_VENDOR = dovecot
 DOVECOT_SELINUX_MODULES = dovecot
+DOVECOT_AUTORECONF = YES
+
+# add host-gettext for AM_ICONV macro needed for autoreconf
 DOVECOT_DEPENDENCIES = \
+	host-gettext \
 	host-pkgconf \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
 	openssl