From nobody Sat Jan 18 17:23:53 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 4Yb3Np0twQz5kctV; Sat, 18 Jan 2025 17:23:54 +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 4Yb3Nn5XRqz3qLZ; Sat, 18 Jan 2025 17:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737221033; 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=MpigiaqLdt5LpsIorcSvITT5W6SXr2colrOtAutqXnA=; b=LeXt34N/HbDALWpTr9mX7CUarEwgC01YmHKpdP2fL2TMc7buwGIE7vtYrDxoG47CP+Il8I WCfQFp2PSwMPegk6SNzxW2Xl/xGbCTOvWpyhi0BjW3cw/qcvUWRcXfkCe/bxuuDGHfxXkT Vj9GyTNmdnMCVDymylAHHFQXIdhTvkuxn/R0oFgxfFS/utr4UMYMxdkelyqF+xWPKU9BSU zsu/WvbepfZTruMjYCwovKlGoWDKn3+S7UAq9uHIUrsE9XwPzg7gBfFyjzR5Zt0DwrFpE5 0YnkAnl0CAT+P+7gpSNP4KXmHT2QyZ+Hj/xD66T5UUp9+EpGCD6vcTqjNxa9cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737221033; 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=MpigiaqLdt5LpsIorcSvITT5W6SXr2colrOtAutqXnA=; b=ltW9rQ40K6UO0vCKLBhYwIiY1qEZwi9WloydKQpkUu/80TOWGWEm8G46lh/rDBCTbR3dAW RROJr2kPDLJPF4SuxjEjG7HBDNAXmkgDEZh/8oVsaF3aMxbRraOOsOpS1J16EaetTh9xQI j1fB251GRzZyJpDp+UazkTcP/UV3e82Tx+snYX7M3VBkU7Wm6L9bTK6NoPf3QTdUas0EZq 43o37oEX3DX1qWngdaJZKgleIUGAsYvfdHVhCpYb/x4ZAe+YTKcsYXsMVaznJQM4Lqcz7P WvKtvK3iUfDFZ3y39u0V/7FMRdD1q3UL/mQOBPNIVkkJXdrZTbjaE+oPsPaWtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737221033; a=rsa-sha256; cv=none; b=LkfLwkvNq5uLr8G9sUUoah5/PDz3vbH/hfroxSv6VBadf9B1cyfOXVpXxnG/bvdFJXVacU sr0yvX0cuUlrYWiFOkEevlq5HUZ5Ng1I88SLEggBjhwgOOwL/uSBCol8ZuEGcMuLs+F8Fe Fz3WxUxd4X2gdhsfjFzQGSycKylxjGX0XbfmMZbVP6YyWrA1m7+7w7pmXXXY4Gp68AYYPV ZcDBGU4aKQ1FrPyMO0ixV66jRtR9tFASaXbJE+X5YpCasCX5SIIbm8Qa6I41xLiedqXswS etNgejx67DPCTsMA8VREs1qs443aGfF9LnislmW0PGLlOnUm4sg9AMDSZHUDcg== 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 4Yb3Nn54bmz1CdD; Sat, 18 Jan 2025 17:23:53 +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 50IHNrsl041488; Sat, 18 Jan 2025 17:23:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50IHNrqi041485; Sat, 18 Jan 2025 17:23:53 GMT (envelope-from git) Date: Sat, 18 Jan 2025 17:23:53 GMT Message-Id: <202501181723.50IHNrqi041485@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: 1e244834ad6b - main - textproc/libe-book: Fix build with ICU 76.1 and improve port 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: 1e244834ad6ba96c8227424514674b095c1991f6 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=1e244834ad6ba96c8227424514674b095c1991f6 commit 1e244834ad6ba96c8227424514674b095c1991f6 Author: Daniel Engberg AuthorDate: 2025-01-18 17:14:35 +0000 Commit: Daniel Engberg CommitDate: 2025-01-18 17:23:17 +0000 textproc/libe-book: Fix build with ICU 76.1 and improve port Fix build with ICU and while at it clean up port Makefile PR: 283574 Approved by: portmgr (maintainer timeout, 3+ weeks) --- textproc/libe-book/Makefile | 21 ++++++++++++--------- textproc/libe-book/files/patch-configure.ac | 11 +++++++++++ 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/textproc/libe-book/Makefile b/textproc/libe-book/Makefile index 74447b901a66..68866a8e40a7 100644 --- a/textproc/libe-book/Makefile +++ b/textproc/libe-book/Makefile @@ -1,8 +1,8 @@ PORTNAME= libe-book -PORTVERSION= 0.1.3 +DISTVERSION= 0.1.3 PORTREVISION= 28 CATEGORIES= textproc -MASTER_SITES= SF/libebook/${PORTNAME}-${PORTVERSION}/ +MASTER_SITES= SF/libebook/${PORTNAME}-${DISTVERSION}/ MAINTAINER= office@FreeBSD.org COMMENT= Library for import of reflowable e-book formats @@ -15,19 +15,22 @@ LIB_DEPENDS= libicui18n.so:devel/icu \ liblangtag.so:devel/liblangtag \ librevenge-0.0.so:textproc/librevenge -OPTIONS_DEFINE= DOCS - +USES= autoreconf compiler:c++11-lib gmake gnome gperf libtool \ + localbase pathfix pkgconfig tar:xz USE_GNOME= libxml2 - -USES= compiler:c++11-lib gmake gnome gperf libtool pathfix pkgconfig \ - tar:xz USE_LDCONFIG= yes + GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -CONFIGURE_ARGS= --disable-werror --disable-tests -CPPFLAGS+= -I${LOCALBASE}/include -DBOOST_ERROR_CODE_HEADER_ONLY PORTDOCS= * + +CPPFLAGS+= -DBOOST_ERROR_CODE_HEADER_ONLY + +CONFIGURE_ARGS= --disable-werror --disable-tests + +OPTIONS_DEFINE= DOCS + DOCS_BUILD_DEPENDS= doxygen:devel/doxygen DOCS_CONFIGURE_OFF= --without-docs diff --git a/textproc/libe-book/files/patch-configure.ac b/textproc/libe-book/files/patch-configure.ac new file mode 100644 index 000000000000..e6f18b6f6ecb --- /dev/null +++ b/textproc/libe-book/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2025-01-04 19:00:12 UTC ++++ configure.ac +@@ -127,7 +127,7 @@ AC_SUBST([BOOST_CFLAGS]) + # ======== + # Find icu + # ======== +-PKG_CHECK_MODULES([ICU], [icu-i18n]) ++PKG_CHECK_MODULES([ICU], [icu-i18n icu-uc]) + AC_SUBST(ICU_CFLAGS) + AC_SUBST(ICU_LIBS) +