From nobody Tue Jan 28 17:07:34 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 4YjBYM3xZyz5ln3l; Tue, 28 Jan 2025 17:07:35 +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 4YjBYL6g2Sz468Z; Tue, 28 Jan 2025 17:07:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738084054; 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=/Npp706RsuIULrvEIXKGVnzi2wkA5XOEQ0KxbA/RTjM=; b=u8shmiRt+rG9g3BHUBIXdbBmnhs+EGGsBm6xmmxL0+A0kOhhAzmTtmei2GkrjFin8JhENR aVKgJX4AebstY+egi+HeR46aSS6CKabKQ5YxewWMmtHo9sADsceGz1xPiZgoFwNnJQ9Bhv iFEIh+BGBIQ/97S/HcuiThl84EnAQNa1ZqXR6iYJcNENEwKHwdnB9iJKTc23VzBWubERXA sr9vmPqzTygy0JBu0F31hQGQmSRQB3s9v/53gYviXNT0NDOkZZNTAADxUwEBhsH6dRd4fm qSNjhsREBIcbez7ENriWMxVM1sDo51msNhmqpoR6i8AjcdV+qsi7zVzgZMSBsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738084054; 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=/Npp706RsuIULrvEIXKGVnzi2wkA5XOEQ0KxbA/RTjM=; b=WD8+cn/ri1i4pJ46p5X8TnSKFo1fxiZZWadYypIt9cIY0D7qaREw+ylZREtLNdBXtxVkZ0 gNgrCL0qgX78BaGjmf0BtVXJcJLmiOewinHFtojmG3HihWFvHzN3kZrC0IOeSyZxsTK/uB C4gH++VcPSExgSTDoxFG6R5O31ypQhyqlTEEqgj4KrJ3/T0B3iX/cUa+GwIhmFeyiJNKdQ 6HIG6U41MkaOgor0t639jFhfjdpmPk4m9ntABNxxRbh0EXsBll9BcFblcDs6fHmCqXzQmH 5xSWzeD20r0AypGoAF7iPtNCatirlAhpwcHFxq43q59/V2NfB94z8/BJDTwjmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738084054; a=rsa-sha256; cv=none; b=JwZu8WAqjgAUYhxBLRwozzv5j8wvENjxT8Gh7H9y6m5xb5+BjBTcZAS/lRe71ZOuLmzyzE g8ijGDtW7Zs0qzl8+f32m7wq1V8XmFwzFo6E/LCP5vk2Va9a9Xm7xuMTu72YEKWoz6uD1T ZP7Iup/7yw9YaU2B/KA1LfNoa358cz4uxqXUEDdOgUhV3eb5tRcOWgJQat/oh3SpAdn0IE oI0P2T0D7Ar6Ccd7Bi7uQ1vch0XQDPuUg+zzwMFuU4g54/OnPqQoUxe5bpgFQeanWCyGwY dMm9fLdpY+JlWJmFkTgMXNZ0EKLC4wySsBfNPqW+aQjSnu3R/jTU8BEBx28QWg== 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 4YjBYL5zZvz89L; Tue, 28 Jan 2025 17:07:34 +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 50SH7YhP064253; Tue, 28 Jan 2025 17:07:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SH7YHr064250; Tue, 28 Jan 2025 17:07:34 GMT (envelope-from git) Date: Tue, 28 Jan 2025 17:07:34 GMT Message-Id: <202501281707.50SH7YHr064250@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: ca315094f93a - main - print/libmspub01: Simplify ICU fix 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca315094f93a92aed537fab6a0efba9c4330ec77 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=ca315094f93a92aed537fab6a0efba9c4330ec77 commit ca315094f93a92aed537fab6a0efba9c4330ec77 Author: Po-Chuan Hsieh AuthorDate: 2025-01-28 16:58:19 +0000 Commit: Po-Chuan Hsieh CommitDate: 2025-01-28 17:05:00 +0000 print/libmspub01: Simplify ICU fix - Add LICENSE_FILE --- print/libmspub01/Makefile | 11 +++---- print/libmspub01/files/patch-configure | 52 +++++++++++++++++++++++++++++++ print/libmspub01/files/patch-configure.ac | 11 ------- 3 files changed, 57 insertions(+), 17 deletions(-) diff --git a/print/libmspub01/Makefile b/print/libmspub01/Makefile index 7f19aa1e5de3..58e96a114189 100644 --- a/print/libmspub01/Makefile +++ b/print/libmspub01/Makefile @@ -1,5 +1,5 @@ PORTNAME= libmspub -DISTVERSION= 0.1.4 +PORTVERSION= 0.1.4 PORTREVISION= 24 CATEGORIES= print graphics devel MASTER_SITES= LODEV/${PORTNAME} @@ -10,18 +10,17 @@ COMMENT= Library and tools for parsing Microsoft Publisher file format WWW= https://wiki.documentfoundation.org/DLP/Libraries/libmspub LICENSE= MPL20 +LICENSE_FILE= ${WRKSRC}/COPYING.MPL BUILD_DEPENDS= ${LOCALBASE}/include/boost/cstdint.hpp:devel/boost-libs LIB_DEPENDS= libicui18n.so:devel/icu \ librevenge-0.0.so:textproc/librevenge -USES= autoreconf compiler:c++11-lib libtool localbase pathfix \ - pkgconfig tar:xz -USE_LDCONFIG= yes +USES= compiler:c++11-lib libtool localbase pathfix pkgconfig tar:xz +CONFIGURE_ARGS= --disable-werror --without-docs GNU_CONFIGURE= yes INSTALL_TARGET= install-strip - -CONFIGURE_ARGS= --disable-werror --without-docs +USE_LDCONFIG= yes .include diff --git a/print/libmspub01/files/patch-configure b/print/libmspub01/files/patch-configure new file mode 100644 index 000000000000..44c9a1679326 --- /dev/null +++ b/print/libmspub01/files/patch-configure @@ -0,0 +1,52 @@ +--- configure.orig 2018-02-28 12:02:05 UTC ++++ configure +@@ -18856,12 +18856,12 @@ if test -n "$ICU_CFLAGS"; then + pkg_cv_ICU_CFLAGS="$ICU_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "icu-i18n") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n icu-uc\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "icu-i18n icu-uc") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n" 2>/dev/null` ++ pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n icu-uc" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -18873,12 +18873,12 @@ if test -n "$ICU_LIBS"; then + pkg_cv_ICU_LIBS="$ICU_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "icu-i18n") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n icu-uc\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "icu-i18n icu-uc") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-i18n" 2>/dev/null` ++ pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-i18n icu-uc" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -18899,14 +18899,14 @@ fi + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ICU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "icu-i18n" 2>&1` ++ ICU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "icu-i18n icu-uc" 2>&1` + else +- ICU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "icu-i18n" 2>&1` ++ ICU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "icu-i18n icu-uc" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ICU_PKG_ERRORS" >&5 + +- as_fn_error $? "Package requirements (icu-i18n) were not met: ++ as_fn_error $? "Package requirements (icu-i18n icu-uc) were not met: + + $ICU_PKG_ERRORS + diff --git a/print/libmspub01/files/patch-configure.ac b/print/libmspub01/files/patch-configure.ac deleted file mode 100644 index c2316cbe73e6..000000000000 --- a/print/libmspub01/files/patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2025-01-04 20:17:51 UTC -+++ configure.ac -@@ -104,7 +104,7 @@ AC_CHECK_HEADERS( - # ======== - # Find icu - # ======== --PKG_CHECK_MODULES([ICU], [icu-i18n]) -+PKG_CHECK_MODULES([ICU], [icu-i18n icu-uc]) - AC_SUBST(ICU_CFLAGS) - AC_SUBST(ICU_LIBS) -