From nobody Sat Jan 25 22:00:10 2025 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 4YgTBL4dlpz5m02g; Sat, 25 Jan 2025 22:00:10 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YgTBL3zpWz3kSh; Sat, 25 Jan 2025 22:00:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737842410; 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=bUwEfw9o8otytFgd4tRVByi/+lcHHX/Xrh5sM6IZPSM=; b=jyaxOzSZYCDp9Pbgle/iwttzJjCe8pYG343d6sCJtk3in7u+Cc+Rz0TBYH14GTln3TvptY WTmXATQG4CfbprcUpnMM4Db+Z0rqVszH6LInhrCyg5sFoxPexLXMEKTmqz+c3NSUoaLpOF UNL4tVyFeUg94Elc5WN0Zw4MCgdYRLWk8ce8c0ffXjuEmg0Ep0plYBiH5GpqtRGotykO5I L7qMi7pXk5A8EK8QMmyddQYtkDf3dzIHh3XObxM2k8BK0lPgVPU+ruxgJnc/vtdrYv5o9I OhkPg1+qi720IkYcTlGcBOQ3M/+o9Q43hq44Eq/qE3vAr5fMIwIqgu9l4pczoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737842410; 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=bUwEfw9o8otytFgd4tRVByi/+lcHHX/Xrh5sM6IZPSM=; b=CyX4Um6PUQiFsBf3fMSI2M+HbMQrlxTp0TAnQr6csIspL6tuLd1CBfXNsbHg69oT+7z3ZO Jq8qUwHn2Wk4S0yf2Z2udwN5keriKsCyXLDCxPoOuyiqzgkE9u0bfYSQ5BFheiOUb0kVWO lf2VYuShq7L9LEJJI6Y/58Oi+GyszEY9XgQfIgTT8q2ivwwW1DRooyacwz32oTgjxkaY9I l67cZ9hB2nIVLkB/jSGL3LpffkBfq86dBEST2NC8LPgY9m1onHAtQYnQSCyRNAbAqvb1gy TmLmFTWS7SqIoAdF4f0Jb66DitVhJ8qEsHUY+xVhc28vPq/wh5CRqPyndKH77w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737842410; a=rsa-sha256; cv=none; b=iVoUKC7UYlViQW87YHDh7qHSrd6bEtQSe988ldHqPnfQ9lEekWHz3phOBcp9uhm8StUxfb tAN8ujgILdZ64d1WCflmap32lBBDeg+LXSnLNcJAhXnLwsLmpZA9BykWHX5tiAmZsVQZy3 ZA81kmXYkWG6gZ7McVJtkARB11WEJQU3Bp0OK3ubM91UnSBxQjsxiorY1aT9KkQlipke5+ Pr1exO1ODHJGXGoTlVwNQQkIQo6Jg2ePwDltn/qCVFoxno/+fSyylxszoqODC6m1Lk7b7D /xF2axhty9f6DB27n/fqa+0Kl9JRnPtuHr9gOkVBg0dsM/0RvxHTpcfoSgW85A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YgTBL3WS3z71; Sat, 25 Jan 2025 22:00:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50PM0A1W036307; Sat, 25 Jan 2025 22:00:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50PM0AeQ036298; Sat, 25 Jan 2025 22:00:10 GMT (envelope-from git) Date: Sat, 25 Jan 2025 22:00:10 GMT Message-Id: <202501252200.50PM0AeQ036298@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 36bc497cf6ca - main - databases/evolution-data-server: Fix build with ICU 76+ 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36bc497cf6ca03161bee5f64a02d32e732c47d60 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=36bc497cf6ca03161bee5f64a02d32e732c47d60 commit 36bc497cf6ca03161bee5f64a02d32e732c47d60 Author: Daniel Engberg AuthorDate: 2025-01-25 21:57:42 +0000 Commit: Daniel Engberg CommitDate: 2025-01-25 22:00:06 +0000 databases/evolution-data-server: Fix build with ICU 76+ * Bump C++ version to c++17 * Adjust CMake build script to include all required ICU libraries PR: 278420 Approved by: portmgr (blanket, build fix) --- databases/evolution-data-server/Makefile | 10 +++++----- .../files/patch-CMakeLists.txt | 22 ++++++++++++++++++++-- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 0b4cbf4ebfd8..ba50c6c2b7b5 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -31,8 +31,8 @@ LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ PORTSCOUT= limitw:1,even -USES= bdb:5 cmake compiler:c++11-lib cpe gettext gnome gperf \ - iconv:wchar_t localbase pathfix pkgconfig python:build\ +USES= bdb:5 cmake compiler:c++17-lang cpe gettext gnome gperf \ + iconv:wchar_t localbase pathfix pkgconfig python:build \ sqlite tar:xz xorg USE_CXXSTD= gnu++11 USE_GNOME= cairo gdkpixbuf2 gtk30 intltool introspection:build libxml2 @@ -40,10 +40,10 @@ USE_XORG= x11 USE_LDCONFIG= yes CPE_VENDOR= gnome +CMAKE_OFF= CMAKE_CXX_EXTENSIONS CMAKE_ARGS= -DENABLE_INTROSPECTION=ON \ - -DENABLE_UOA=OFF - -CMAKE_ARGS+= -DWITH_LIBDB_CFLAGS=-I${LOCALBASE}/include/db5 \ + -DENABLE_UOA=OFF \ + -DWITH_LIBDB_CFLAGS=-I${LOCALBASE}/include/db5 \ -DWITH_LIBDB_LIBS="-L${LOCALBASE}/lib -ldb-5" GLIB_SCHEMAS= org.gnome.evolution-data-server.addressbook.gschema.xml \ diff --git a/databases/evolution-data-server/files/patch-CMakeLists.txt b/databases/evolution-data-server/files/patch-CMakeLists.txt index 498ca37305de..54edf6edce36 100644 --- a/databases/evolution-data-server/files/patch-CMakeLists.txt +++ b/databases/evolution-data-server/files/patch-CMakeLists.txt @@ -1,6 +1,24 @@ ---- CMakeLists.txt.orig 2021-11-05 17:23:17 UTC +--- CMakeLists.txt.orig 2022-08-05 07:45:35 UTC +++ CMakeLists.txt -@@ -521,6 +521,7 @@ endif(WITH_LIBDB) +@@ -6,7 +6,7 @@ project(evolution-data-server + project(evolution-data-server + VERSION 3.44.4 + LANGUAGES C CXX) +-set(CMAKE_CXX_STANDARD 14) ++set(CMAKE_CXX_STANDARD 17) + set(PROJECT_BUGREPORT "https://gitlab.gnome.org/GNOME/evolution-data-server/issues/") + + # Base Version: This is for API/version tracking for things like +@@ -358,7 +358,7 @@ endif(WIN32) + # ICU started shipping pkg-config files but it's not present + # on many systems, if we don't find the pkg-config + # file then let's fallback on a manual check +-pkg_check_modules(ICU icu-i18n) ++pkg_check_modules(ICU icu-i18n icu-uc) + + if(NOT ICU_FOUND) + CHECK_INCLUDE_FILE(unicode/ucol.h HAVE_UNICODE_UCOL_H) +@@ -526,6 +526,7 @@ set(CMAKE_REQUIRED_LIBRARIES "-liconv") # ****************************** set(CMAKE_REQUIRED_LIBRARIES "-liconv")