From nobody Sat Jan 25 17:32:27 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 4YgMFS1lzhz5lfXs; Sat, 25 Jan 2025 17:32:28 +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 4YgMFR4v9wz4P3b; Sat, 25 Jan 2025 17:32:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737826347; 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=pLmS71yfN8e8v3fTwOWNt0FNRDad1AQ7EKfVps9bBgE=; b=E9o+HryTjOfb4fJtGYEbYwr1XS3UfQHFFwlVPs/WB008fIpjrprXTPSdsqGiasb5LlaHBn SohXbBYPFdBnMbnsaJ0Jpp4QhYRYstFYANrMSfbE0BPjw8x4FZUoJDXWgTq8/Xm3XIStwb OMxnIA1XaaGByJ8Ai5CbEfuxVpp9draeZtNrgzirQsrMVIwccrO/dQG/EooDfG26RH3ZO4 e0bmMypoLKdaxCdZiFgvfyV46ed35+i2d6GgHmLhWHkAjAqsvvEQRHdkEO+lQxPd0QYcne pwo7YPtCJZnfy5eduGmTVDRmlP43ImslPjW2+SLM+J1DjOTtncWqSPDjj9o9Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737826347; 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=pLmS71yfN8e8v3fTwOWNt0FNRDad1AQ7EKfVps9bBgE=; b=Ezaqu2WXRLFW2Mcu0nfGyC06VJEHr6uQ13fB7X8XIWq79DA6R2DFWMEpMFWC3b18IAXU/x ukCuWp9NcsC5By/SP/0TVenpvNKyaWt0hwqBPCGbaw0ARmVbfgL52jgMuDX8Ux0730Zrb+ 2zs3l1V7AkN0NAa/yLzmcYqbi+O6xOC3IVnjA4aSI9/rCh5l8uxebmlLWuws8RdR0xbj6Y Xca/vVbP+IQIuWM+DFY7nvEnvE6mkF1ovUgxC6O/COqf2WHbvdUiuGcdbPY4vRjDJv5mWO PFQuB35w3NNfBVltQ4U9/NTaiCj7dxh64IxnuLSOYgP+eCFnZP5PkZVjyxM07A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737826347; a=rsa-sha256; cv=none; b=bbg78yav01o++Cqh8NpjyMMe2omIIUzv1aqLG8iE9xaOkumiEFx61qvrryLt+4TwclLlqU rlGB2Feh0WsZRI8s7rrUm45qJWiNszRSgo3Eu1Z08PrzJiV6m4I0f/xfz9I9JMWRWkOmvr 1gF7Yp7+mn0Duwh/nDBg6qVLu7xSexoLp1/+Bvzie9DvHZWTD3OhgyH7bWGp86zhePazr2 wd019a61YpTom9BpAhEwfiQeDfZiWmlBBi0zSw8P6ELJzsJ25/Sr0Twp4jyJhXU8DfRLOv Gl5QTLVseMf6Y+tJvzpNTNOUEHawOkIVx0i7zv+6vgJcq1R0oG60DyUbLhoulQ== 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 4YgMFR4KxQz1LKd; Sat, 25 Jan 2025 17:32:27 +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 50PHWRoP043928; Sat, 25 Jan 2025 17:32:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50PHWRUV043925; Sat, 25 Jan 2025 17:32:27 GMT (envelope-from git) Date: Sat, 25 Jan 2025 17:32:27 GMT Message-Id: <202501251732.50PHWRUV043925@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: d4a8ac1e2d2b - main - textproc/libfolia: 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: d4a8ac1e2d2b42dd2e11357596e9596a201c56ed Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d4a8ac1e2d2b42dd2e11357596e9596a201c56ed commit d4a8ac1e2d2b42dd2e11357596e9596a201c56ed Author: Daniel Engberg AuthorDate: 2025-01-25 16:10:26 +0000 Commit: Daniel Engberg CommitDate: 2025-01-25 17:31:46 +0000 textproc/libfolia: Fix build with ICU 76+ * Bump C++ version to c++17 * Adjust GNU Autoconfig script to include all required ICU libraries PR: 278420 Approved by: portmgr (blanket, build fix) --- textproc/libfolia/Makefile | 7 ++----- textproc/libfolia/files/patch-configure.ac | 11 +++++++++++ textproc/libfolia/files/patch-src_Makefile.am | 9 +++++++++ 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/textproc/libfolia/Makefile b/textproc/libfolia/Makefile index 44353d7f8a41..a3ed810ea346 100644 --- a/textproc/libfolia/Makefile +++ b/textproc/libfolia/Makefile @@ -13,7 +13,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libicui18n.so:devel/icu \ libticcutils.so:devel/ticcutils -USES= compiler:c++14-lang gmake gnome libtool pkgconfig +USES= autoreconf compiler:c++17-lang gmake gnome libtool \ + pathfix pkgconfig USE_GNOME= libxml2 USE_LDCONFIG= yes @@ -22,8 +23,4 @@ CONFIGURE_ARGS= --disable-static INSTALL_TARGET= install-strip -post-patch: - @${REINPLACE_CMD} -e 's|-g -O3||g' \ - ${PATCH_WRKSRC}/src/Makefile.in - .include diff --git a/textproc/libfolia/files/patch-configure.ac b/textproc/libfolia/files/patch-configure.ac new file mode 100644 index 000000000000..712c82ef4f1c --- /dev/null +++ b/textproc/libfolia/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2025-01-25 10:56:56 UTC ++++ configure.ac +@@ -71,7 +71,7 @@ LIBS="$ticcutils_LIBS $LIBS" + CXXFLAGS="$CXXFLAGS $ticcutils_CFLAGS" + LIBS="$ticcutils_LIBS $LIBS" + +-PKG_CHECK_MODULES([ICU], [icu-uc >= 50 icu-io] ) ++PKG_CHECK_MODULES([ICU], [icu-i18n icu-uc icu-io] ) + CXXFLAGS="$CXXFLAGS $ICU_CFLAGS" + LIBS="$ICU_LIBS $LIBS" + diff --git a/textproc/libfolia/files/patch-src_Makefile.am b/textproc/libfolia/files/patch-src_Makefile.am new file mode 100644 index 000000000000..cece3c87bf36 --- /dev/null +++ b/textproc/libfolia/files/patch-src_Makefile.am @@ -0,0 +1,9 @@ +--- src/Makefile.am.orig 2025-01-25 10:55:06 UTC ++++ src/Makefile.am +@@ -1,5 +1,5 @@ AM_CPPFLAGS = -I@top_srcdir@/include + AM_CPPFLAGS = -I@top_srcdir@/include +-AM_CXXFLAGS = -std=c++14 -g -O3 -W -Wall -pedantic ++AM_CXXFLAGS = -std=c++17 -W -Wall -pedantic + + + LDADD = libfolia.la