Date: Thu, 11 Jun 2026 08:46:48 +0000 From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 31c3bc08543f - 2026Q2 - cad/fritzing: Do not hardcode QuaZip version Message-ID: <6a2a75f8.26c57.490d6495@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch 2026Q2 has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=31c3bc08543f796e93d44401074b1a784e990479 commit 31c3bc08543f796e93d44401074b1a784e990479 Author: Max Brazhnikov <makc@FreeBSD.org> AuthorDate: 2026-06-11 08:45:17 +0000 Commit: Max Brazhnikov <makc@FreeBSD.org> CommitDate: 2026-06-11 08:45:17 +0000 cad/fritzing: Do not hardcode QuaZip version This fixes build after QuaZip update to 1.7.x (cherry picked from commit cee44928ce27dfe15680e1c6d9089a433d35c7db) --- cad/fritzing/Makefile | 2 +- cad/fritzing/files/pri_quazipdetect.pri | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cad/fritzing/Makefile b/cad/fritzing/Makefile index 617cd7446526..3093460c78c2 100644 --- a/cad/fritzing/Makefile +++ b/cad/fritzing/Makefile @@ -37,7 +37,7 @@ post-extract: post-patch: ${REINPLACE_CMD} -e '/CONFIG += debug_and_release/d' ${WRKSRC}/phoenix.pro ${REINPLACE_CMD} -e 's|QT_MOST=.*|QT_MOST=${QT6_VERSION}|' ${WRKSRC}/phoenix.pro - ${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${FILESDIR}/pri_quazipdetect.pri > ${WRKSRC}/pri/quazipdetect.pri + ${CP} ${FILESDIR}/pri_quazipdetect.pri ${WRKSRC}/pri/quazipdetect.pri ${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${FILESDIR}/pri_spicedetect.pri > ${WRKSRC}/pri/spicedetect.pri ${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${FILESDIR}/pri_clipper1detect.pri > ${WRKSRC}/pri/clipper1detect.pri diff --git a/cad/fritzing/files/pri_quazipdetect.pri b/cad/fritzing/files/pri_quazipdetect.pri index 799e59a2a7dd..6a3d4616413b 100644 --- a/cad/fritzing/files/pri_quazipdetect.pri +++ b/cad/fritzing/files/pri_quazipdetect.pri @@ -3,5 +3,5 @@ message("Using FreeBSD-provided quazip detect script.") SOURCES += \ src/zlibdummy.c \ -INCLUDEPATH += "%%LOCALBASE%%/include/QuaZip-Qt6-1.5/" +INCLUDEPATH += $$system(pkgconf --cflags-only-I quazip1-qt6|sed 's,-I,,g') LIBS += "-lquazip1-qt6"home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a2a75f8.26c57.490d6495>