diff options
| -rw-r--r-- | graphics/engauge-digitizer/Makefile | 37 | ||||
| -rw-r--r-- | graphics/engauge-digitizer/distinfo | 6 | ||||
| -rw-r--r-- | graphics/engauge-digitizer/files/patch-src_Logger_LoggerUpload.h | 11 | ||||
| -rw-r--r-- | graphics/engauge-digitizer/pkg-plist | 5 |
4 files changed, 30 insertions, 29 deletions
diff --git a/graphics/engauge-digitizer/Makefile b/graphics/engauge-digitizer/Makefile index 7286295d0d0c..041de408675a 100644 --- a/graphics/engauge-digitizer/Makefile +++ b/graphics/engauge-digitizer/Makefile @@ -1,12 +1,12 @@ PORTNAME= engauge-digitizer DISTVERSIONPREFIX= v -DISTVERSION= 12.2.2 -PORTREVISION= 37 +DISTVERSION= 12.9.1 CATEGORIES= graphics math science MAINTAINER= yuri@FreeBSD.org COMMENT= Extract data points from images of graphs -WWW= https://markummitchell.github.io/engauge-digitizer/ +WWW= https://markummitchell.github.io/engauge-digitizer/ \ + https://github.com/akhuettel/engauge-digitizer LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE @@ -14,38 +14,34 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libfftw3.so:math/fftw3 \ liblog4cpp.so:devel/log4cpp \ libopenjp2.so:graphics/openjpeg \ - libpoppler-qt5.so:graphics/poppler-qt5 + libpoppler-qt6.so:graphics/poppler-qt6 -USES= compiler:c++11-lang desktop-file-utils gl pkgconfig qmake qt:5 # pkgconfig is for https://github.com/markummitchell/engauge-digitizer/issues/423 -USE_GITHUB= yes -GH_ACCOUNT= markummitchell -USE_QT= core gui printsupport sql xml widgets buildtools:build +USES= compiler:c++11-lang desktop-file-utils gl pkgconfig qmake qt:6 # pkgconfig is for https://github.com/markummitchell/engauge-digitizer/issues/423 +USE_QT= base tools USE_GL= gl + +USE_GITHUB= yes +GH_ACCOUNT= akhuettel + CONFIGURE_ENV= OPENJPEG_INCLUDE=${PREFIX}/include/openjpeg-2.4 OPENJPEG_LIB=${PREFIX}/lib \ - POPPLER_INCLUDE=${PREFIX}/include/poppler/qt5 POPPLER_LIB=${PREFIX}/lib + POPPLER_INCLUDE=${PREFIX}/include/poppler/qt6 POPPLER_LIB=${PREFIX}/lib QMAKE_ARGS= "CONFIG+=jpeg2000 pdf" CXXFLAGS+= `pkg-config --cflags libopenjp2` # workaround for https://github.com/markummitchell/engauge-digitizer/issues/423 -OPTIONS_DEFINE= NLS DOCS +OPTIONS_DEFINE= NLS OPTIONS_SUB= yes -DOCS_USE= QT=help,linguist:build +#DOCS_USE= QT=help,linguist:build do-patch-NLS-on: @${REINPLACE_CMD} -e 's|QCoreApplication::applicationDirPath () + "/translations",|"${DATADIR}/translations",|' ${WRKSRC}/src/Translator/TranslatorContainer.cpp -do-patch-DOCS-on: - @${REINPLACE_CMD} -e 's|qcollectiongenerator|${QCOLLECTIONGENERATOR}|' ${WRKSRC}/help/build.bash - post-build-NLS-on: @cd ${WRKSRC} && ${LRELEASE} engauge.pro -post-build-DOCS-on: - @cd ${WRKSRC}/help && ./build.bash - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/engauge ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/bin/Engauge ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps ${GZIP_CMD} < ${WRKSRC}/src/img/${PORTNAME}.svg > ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svgz ${INSTALL_DATA} ${WRKSRC}/dev/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop @@ -54,9 +50,4 @@ do-install-NLS-on: @${MKDIR} ${STAGEDIR}${DATADIR}/translations ${INSTALL_DATA} ${WRKSRC}/translations/*.qm ${STAGEDIR}${DATADIR}/translations -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/bin/documentation/engauge.qch ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/bin/documentation/engauge.qhc ${STAGEDIR}${DOCSDIR} - .include <bsd.port.mk> diff --git a/graphics/engauge-digitizer/distinfo b/graphics/engauge-digitizer/distinfo index 791ca4cc4ef1..efd4c1e22e3d 100644 --- a/graphics/engauge-digitizer/distinfo +++ b/graphics/engauge-digitizer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1595407069 -SHA256 (markummitchell-engauge-digitizer-v12.2.2_GH0.tar.gz) = d66f4028c112f02024b6313288dc88b1b1039b43dcbc90524cc20ad28f0f3363 -SIZE (markummitchell-engauge-digitizer-v12.2.2_GH0.tar.gz) = 73793824 +TIMESTAMP = 1763961598 +SHA256 (akhuettel-engauge-digitizer-v12.9.1_GH0.tar.gz) = 0da5d884390af70770204a0c19e3b1e2fca876ba1d5f416b62a6922edff365f3 +SIZE (akhuettel-engauge-digitizer-v12.9.1_GH0.tar.gz) = 70903732 diff --git a/graphics/engauge-digitizer/files/patch-src_Logger_LoggerUpload.h b/graphics/engauge-digitizer/files/patch-src_Logger_LoggerUpload.h new file mode 100644 index 000000000000..dfad4c5a48ac --- /dev/null +++ b/graphics/engauge-digitizer/files/patch-src_Logger_LoggerUpload.h @@ -0,0 +1,11 @@ +--- src/Logger/LoggerUpload.h.orig 2025-11-24 05:39:46 UTC ++++ src/Logger/LoggerUpload.h +@@ -9,7 +9,7 @@ + + #include <QtGlobal> + +-#if defined(WIN32) || defined(WIN64) ++#if defined(WIN32) || defined(WIN64) || defined(__FreeBSD__) + #define NO_RETURN_VALUE + #else + #define NO_RETURN_VALUE Q_NORETURN diff --git a/graphics/engauge-digitizer/pkg-plist b/graphics/engauge-digitizer/pkg-plist index c8c2a5de271d..d129126f1a68 100644 --- a/graphics/engauge-digitizer/pkg-plist +++ b/graphics/engauge-digitizer/pkg-plist @@ -1,7 +1,5 @@ -bin/engauge +bin/Engauge share/applications/engauge-digitizer.desktop -%%PORTDOCS%%%%DOCSDIR%%/engauge.qch -%%PORTDOCS%%%%DOCSDIR%%/engauge.qhc %%NLS%%%%DATADIR%%/translations/engauge_ar.qm %%NLS%%%%DATADIR%%/translations/engauge_cs.qm %%NLS%%%%DATADIR%%/translations/engauge_de.qm @@ -15,6 +13,7 @@ share/applications/engauge-digitizer.desktop %%NLS%%%%DATADIR%%/translations/engauge_kk.qm %%NLS%%%%DATADIR%%/translations/engauge_ko.qm %%NLS%%%%DATADIR%%/translations/engauge_nb.qm +%%NLS%%%%DATADIR%%/translations/engauge_nl.qm %%NLS%%%%DATADIR%%/translations/engauge_pt.qm %%NLS%%%%DATADIR%%/translations/engauge_ru.qm %%NLS%%%%DATADIR%%/translations/engauge_zh.qm |