git: d4a8ac1e2d2b - main - textproc/libfolia: Fix build with ICU 76+
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 25 Jan 2025 17:32:27 UTC
The branch main has been updated by diizzy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d4a8ac1e2d2b42dd2e11357596e9596a201c56ed
commit d4a8ac1e2d2b42dd2e11357596e9596a201c56ed
Author: Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2025-01-25 16:10:26 +0000
Commit: Daniel Engberg <diizzy@FreeBSD.org>
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 <bsd.port.mk>
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