From nobody Sat Jan 18 17:23:55 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 4Yb3Nr2ySrz5kcwj; Sat, 18 Jan 2025 17:23:56 +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 4Yb3Nr07Y5z3qDY; Sat, 18 Jan 2025 17:23:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737221036; 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=kLe/Qqxfsz8/URqUuVh6+cqim1N/hZP3ojDRF5ydLTk=; b=cYRymqAYjUFWGnPWennMoZSZo/v3Jc89xeVv6M39f+nwBTFFix7W0wcMFY6mfAzKoSDkgp 0SHFiKZWl1006i9QysM7ZXGcCkMas/clnRZc6Q90QZIXmbpNxC8tluhkiqepdOs0R6kqFL GBS2xnqVG0HWwGCzdIkHT/J3HZU7UVySwt+t6kUY+8vzG8N0V8Cj/bVO3mMhhwHHX5AxeD m9I5LX8XbCyuKGDliGDkc8zH5rinL+HLTwI7+6AHyNNVIlza1sgQ224aMboUL/SsgVGFqW BzDmMmp99JQcfmQufwscID96KLaXDrNOPYune+PxMCg8Hf9muyQVaipV2NvBEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737221036; 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=kLe/Qqxfsz8/URqUuVh6+cqim1N/hZP3ojDRF5ydLTk=; b=taX8yzldDhy22oe3jkNMIQImhU2qZ/75Taa8WB92InNHLTaPYS0wdURYWU9RPHEPe5ZDDY PGmrF6MeL54yO2vMmF/+kI6mWtw6ESAbruUkkXcfd4XvkfOncllcGJ/iG+GURpSeqQs0la Q4BAZqzNd9AIn9Wdzmxx6UaibSIv6WCRnKjkIR5uCvT8uiO98757oQleXmrbFnfVBgmNXK dDxMJ1N+SyCqTWPlFB2+++zTjJ2Tq3ZjLTQfmDOPL8EpSP2Fecp2NaJpQZp5I7vZZ2zHah j6nafCRGcC2vzo+1g64hKTFCNZhIwImUrQB6DQyU2hRII34S0VJOEkzaXnjkrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737221036; a=rsa-sha256; cv=none; b=bnz0UEf1Odh7X4F+WfQeSSmln9xdaFISobRxh/abVpH6VQLoi99PR2VrBbYvc6VWEjYXQM gfO2mntbDDAF46XRvVnOIzATpg77IljtUAizeq0ub5JcrQngK5nncz6tz9LJ8fXAl1QNPV 788/z45k3VxcHrkmv4PoG3+8Zimx3tRhpbZdFYUXzcnTSeP8mD6EDgQyBWiTQBvMXh80w3 JYfkkUalQrQ1da7VRW84ouaQS9KGiR7Zm8EFYDYGiKY+h0kO41j4R769C8BJEWWo+d6+0Z ezyn1cCSGuvwnbuR+jojOYNo7WCDggtpMCEDxIQ5J/JCD190lB6CNfqGldPaqA== 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 4Yb3Nq6gvkz1CMN; Sat, 18 Jan 2025 17:23:55 +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 50IHNtZD041611; Sat, 18 Jan 2025 17:23:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50IHNtgV041608; Sat, 18 Jan 2025 17:23:55 GMT (envelope-from git) Date: Sat, 18 Jan 2025 17:23:55 GMT Message-Id: <202501181723.50IHNtgV041608@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: e5c93d0cadc4 - main - textproc/libqxp: 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: e5c93d0cadc433bf6be15b1e43fa49f2f534447b Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=e5c93d0cadc433bf6be15b1e43fa49f2f534447b commit e5c93d0cadc433bf6be15b1e43fa49f2f534447b Author: Daniel Engberg AuthorDate: 2025-01-18 17:22:05 +0000 Commit: Daniel Engberg CommitDate: 2025-01-18 17:23:18 +0000 textproc/libqxp: Fix build with ICU 76.1 and improve port Fix build with ICU and while at it clean up port Makefile PR: 283545 --- textproc/libqxp/Makefile | 26 ++++++++++---------------- textproc/libqxp/files/patch-configure.ac | 25 +++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/textproc/libqxp/Makefile b/textproc/libqxp/Makefile index 4ee5a1e93481..05469100d631 100644 --- a/textproc/libqxp/Makefile +++ b/textproc/libqxp/Makefile @@ -1,5 +1,5 @@ PORTNAME= libqxp -PORTVERSION= 0.0.0 +DISTVERSION= 0.0.0 PORTREVISION= 24 CATEGORIES= textproc MASTER_SITES= https://dev-www.libreoffice.org/src/${PORTNAME}/ @@ -10,34 +10,28 @@ WWW= https://wiki.documentfoundation.org/DLP/Libraries/libqxp LICENSE= MPL20 +BUILD_DEPENDS= ${LOCALBASE}/include/boost/cstdint.hpp:devel/boost-libs LIB_DEPENDS= librevenge-0.0.so:textproc/librevenge \ libicui18n.so:devel/icu - #libicui18n.so:devel/icu \ - #libicuuc.so:devel/icu \ - #libicudata.so:devel/icu -BUILD_DEPENDS= ${LOCALBASE}/include/boost/math/constants/constants.hpp:devel/boost-libs \ - ${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs \ - ${LOCALBASE}/include/boost/variant.hpp:devel/boost-libs \ - ${LOCALBASE}/include/boost/range/adaptor/reversed.hpp:devel/boost-libs \ - ${LOCALBASE}/include/boost/cstdint.hpp:devel/boost-libs -CONFIGURE_ARGS= --disable-werror -CPPFLAGS+= -I${LOCALBASE}/include +USES= autoreconf compiler:c++11-lang libtool localbase pathfix \ + pkgconfig tar:xz +USE_LDCONFIG= yes GNU_CONFIGURE= yes -USES= compiler:c++11-lang libtool pathfix pkgconfig tar:xz -USE_LDCONFIG= yes INSTALL_TARGET= install-strip +TEST_TARGET= check + +PORTDOCS= * + +CONFIGURE_ARGS= --disable-werror OPTIONS_DEFINE= DOCS DOXYGEN TEST -OPTIONS_DEFAULT= OPTIONS_SUB= yes -TEST_TARGET= check TEST_LIB_DEPENDS= libcppunit.so:devel/cppunit TEST_CONFIGURE_ENABLE= tests -PORTDOCS= * DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen DOXYGEN_CONFIGURE_OFF= --without-docs DOXYGEN_IMPLIES= DOCS diff --git a/textproc/libqxp/files/patch-configure.ac b/textproc/libqxp/files/patch-configure.ac new file mode 100644 index 000000000000..412056403676 --- /dev/null +++ b/textproc/libqxp/files/patch-configure.ac @@ -0,0 +1,25 @@ +--- configure.ac.orig 2025-01-04 21:30:40 UTC ++++ configure.ac +@@ -69,21 +69,7 @@ AC_SUBST([BOOST_CFLAGS]) + # ======== + # Find icu + # ======== +-AS_IF([test "${ICU_CFLAGS+set}" = set],[ +- ICU_CFLAGS_overriden=yes],[ +- ICU_CFLAGS_overriden=no]) +-PKG_CHECK_MODULES([ICU],[icu-i18n],[ +- AS_IF([test "${ICU_CFLAGS_overriden}" = no], [ +- ICU_CFLAGS="${ICU_CFLAGS} `${PKG_CONFIG} icu-i18n --variable=CXXFLAGS`"]) +- ], [ +- AC_PATH_PROG([ICU_CONFIG],[icu-config]) +- AC_MSG_CHECKING([ICU installation]) +- AS_IF([${ICU_CONFIG} --cflags >/dev/null 2>&1],[ +- ICU_CFLAGS=`${ICU_CONFIG} --cppflags-searchpath --cxxflags` +- ICU_LIBS=`${ICU_CONFIG} --ldflags` +- AC_MSG_RESULT([found])],[ +- AC_MSG_ERROR([libicu config program icu-config not found])])] +-) ++PKG_CHECK_MODULES([ICU],[icu-i18n icu-uc]) + AC_SUBST(ICU_CFLAGS) + AC_SUBST(ICU_LIBS) +