aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Brazhnikov <makc@FreeBSD.org>2026-06-11 08:45:17 +0000
committerMax Brazhnikov <makc@FreeBSD.org>2026-06-11 08:45:17 +0000
commit31c3bc08543f796e93d44401074b1a784e990479 (patch)
tree7f7740585b46e279fe8cc2a515cdab3de98f2efb
parent9abbb61d551d85392589d32e23d8b7aa70159449 (diff)
cad/fritzing: Do not hardcode QuaZip version
This fixes build after QuaZip update to 1.7.x (cherry picked from commit cee44928ce27dfe15680e1c6d9089a433d35c7db)
-rw-r--r--cad/fritzing/Makefile2
-rw-r--r--cad/fritzing/files/pri_quazipdetect.pri2
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"