diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index 4d0f94acbbd7..426a1d9e3ee5 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -1,153 +1,154 @@ PORTNAME= calibre PORTVERSION= 6.22.0 +PORTREVISION= 1 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ \ https://curl.haxx.se/ca/:cacert DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ cacert.pem:cacert DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTFILES:C/:[^:]+$//:Ncacert.pem} MAINTAINER= madpilot@FreeBSD.org COMMENT= Ebook management application WWW= https://calibre-ebook.com/ LICENSE= GPLv3 LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libpoppler-qt6.so:graphics/poppler-qt6 \ libwmflite.so:graphics/libwmf \ libchm.so:misc/chmlib \ libicudata.so:devel/icu \ libpodofo.so:graphics/podofo \ libmtp.so:multimedia/libmtp \ libfreetype.so:print/freetype2 \ libhunspell-1.7.so:textproc/hunspell \ libhyphen.so:textproc/hyphen \ libstemmer.so:textproc/snowballstemmer \ libxkbcommon.so:x11/libxkbcommon \ libuchardet.so:textproc/uchardet BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyicu>0:devel/py-pyicu@${PY_FLAVOR} \ ${LOCALBASE}/bin/cmake:devel/cmake-core \ liberation-fonts-ttf>=2.1.3:x11-fonts/liberation-fonts-ttf \ MathJax3>0:www/mathjax3 RUN_DEPENDS= xdg-open:devel/xdg-utils \ ${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markdown>=0:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}charset-normalizer>=0:textproc/py-charset-normalizer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.8:textproc/py-feedparser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jeepney>=0.6:devel/py-jeepney@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ pdftohtml:graphics/poppler-utils \ ${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycryptodome>0:security/py-pycryptodome@${PY_FLAVOR} \ liberation-fonts-ttf>=2.1.3:x11-fonts/liberation-fonts-ttf\ MathJax3>0:www/mathjax3 USES= desktop-file-utils gettext-runtime gl gnome localbase:ldflags \ pkgconfig pyqt:6 python qt:6 shared-mime-info shebangfix \ ssl tar:xz xorg USE_RC_SUBR= calibre SUB_LIST+= PYTHON_VERSION=${PYTHON_VERSION} USE_PYQT= pyqt6 pysip qtbuilder sip webengine USE_QT= base USE_GL= egl gl USE_GNOME= glib20 USE_XORG= xrender xext x11 USE_GITHUB= nodefault GH_TUPLE= kovidgoyal:calibre-translations:d911cab:translations \ LibreOffice:dictionaries:8b6fc85:hypenation SHEBANG_GLOB= *.sh *.py *.recipe python_OLD_CMD= "/usr/bin/env python" ${LOCALBASE}/bin/python3 MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/include/fontconfig" \ FC_LIB_DIR="${LOCALBASE}/lib" \ OVERRIDE_CFLAGS="${CFLAGS}" \ OVERRIDE_LDFLAGS="${LDFLAGS}" \ PODOFO_LIB_DIR="${LOCALBASE}/lib" \ PODOFO_INC_DIR="${LOCALBASE}/include/podofo" \ WITH_USB=yes \ CALIBRE_CONFIG_DIRECTORY=${WRKDIR}/calibre-config \ XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share \ XDG_CONFIG_HOME=${WRKDIR}/xdg-config \ XDG_UTILS_INSTALL_MODE=system \ QMAKE=${QMAKE} \ SIP_BIN=${SIP} \ SIP_DIR=${PYQT_SIPDIR} \ PYTHONDONTWRITEBYTECODE=true post-extract: @${MV} ${WRKSRC_translations} ${WRKSRC}/src/translations @${CP} ${DISTDIR}/${DIST_SUBDIR}/cacert.pem ${WRKSRC}/resources/mozilla-ca-certs.pem @${CP} ${FILESDIR}/user-agent-data.json ${WRKSRC}/resources post-patch: @${REINPLACE_CMD} -e "s|#!/usr/bin/env python{py_major_version}|#!${PYTHON_CMD}|" \ -e "s|#!/usr/bin/env python|#!${PYTHON_CMD}|" \ ${WRKSRC}/setup/install.py \ ${WRKSRC}/src/calibre/gui2/dialogs/custom_recipes.py \ ${WRKSRC}/src/calibre/gui2/preferences/tweaks.py do-configure: # do nothing do-build: @${MKDIR} ${WRKDIR}/calibre-config ${WRKDIR}/xdg-config @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ ${PYSETUP} bootstrap \ --system-liberation_fonts \ --path-to-liberation_fonts=${LOCALBASE}/share/fonts/Liberation \ --system-mathjax \ --path-to-mathjax=${LOCALBASE}/www/MathJax3 \ --path-to-hyphenation=${WRKSRC_hypenation} \ ) @${RMDIR} ${LOCALBASE}/libexec/qt6/locales 2>/dev/null || ${TRUE} do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages \ ${STAGEDIR}${PREFIX}/share/icons/hicolor \ ${STAGEDIR}${PREFIX}/share/applications \ ${STAGEDIR}${PREFIX}/share/desktop-directories \ ${STAGEDIR}${PREFIX}/share/mime/packages # Create this file to avoid what looks like a bug in xdg-desktop-menu @${TOUCH} ${STAGEDIR}${PREFIX}/share/applications/defaults.list (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ ${PYSETUP} install --prefix ${PREFIX} \ --staging-root ${STAGEDIR}${PREFIX}) @${RM} ${STAGEDIR}${PREFIX}/bin/calibre-uninstall \ ${STAGEDIR}${PREFIX}/share/applications/defaults.list @${RMDIR} ${STAGEDIR}${PREFIX}/share/desktop-directories @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/calibre/calibre/plugins/* update-recent-uas: patch @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ ${PYSETUP} recent_uas) ${CP} ${BUILD_WRKSRC}/resources/user-agent-data.json ${FILESDIR} .include diff --git a/graphics/podofo/Makefile b/graphics/podofo/Makefile index 9ac4d354f995..7be1913c43f1 100644 --- a/graphics/podofo/Makefile +++ b/graphics/podofo/Makefile @@ -1,54 +1,55 @@ PORTNAME= podofo -PORTVERSION= 0.10.0 +PORTVERSION= 0.10.1 CATEGORIES= graphics print MAINTAINER= sunpoet@FreeBSD.org COMMENT= PDF manipulation library and tools WWW= https://podofo.sourceforge.net/ \ https://github.com/podofo/podofo LICENSE= LGPL20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= fast_float>=0:math/fast_float \ hhdate>=0:devel/hhdate \ libfmt>=0:devel/libfmt \ utf8cpp>=0:devel/utf8cpp LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libidn.so:dns/libidn USES= cmake compiler:c++17-lang cpe gnome localbase:ldflags pkgconfig ssl USE_GNOME= libxml2 -CFLAGS+= -I${LOCALBASE}/include/fast_float -I${WRKSRC} +CFLAGS+= -I${LOCALBASE}/include/fast_float CMAKE_ARGS= -DFONTCONFIG_LIBRARIES=${LOCALBASE}/lib/libfontconfig.so \ -DOPENSSL_INCLUDE_DIR=${OPENSSLINC} \ -DOPENSSL_LIBRARIES=${OPENSSLDIR} CMAKE_OFF= PODOFO_BUILD_EXAMPLES PODOFO_BUILD_LIB_ONLY PODOFO_BUILD_STATIC PODOFO_BUILD_TEST PODOFO_BUILD_TOOLS CMAKE_TESTING_ON= PODOFO_BUILD_TEST USE_LDCONFIG= yes +PLIST_SUB= PORTVERSION=${PORTVERSION} + USE_GITHUB= yes CPE_VENDOR= podofo_project OPTIONS_DEFINE= JPEG PNG TIFF OPTIONS_DEFAULT=JPEG PNG TIFF JPEG_CMAKE_BOOL= WANT_LIBJPEG JPEG_USES= jpeg PNG_CMAKE_BOOL= WANT_PNG PNG_LIB_DEPENDS= libpng.so:graphics/png TIFF_CMAKE_BOOL= WANT_TIFF TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff post-patch: # Clean up bundled libraries @${RM} ${WRKSRC}/3rdparty/fast_float.h @${RM} -r ${WRKSRC}/3rdparty/date/ @${RM} -r ${WRKSRC}/3rdparty/fmt/ - @${RM} -r ${WRKSRC}/3rdparty/utfcpp/ - @${LN} -s ${LOCALBASE}/include/utf8cpp ${WRKSRC}/3rdparty/utfcpp + @${RM} -r ${WRKSRC}/3rdparty/utf8cpp/ .include diff --git a/graphics/podofo/distinfo b/graphics/podofo/distinfo index 429ff9e8f512..179f84209711 100644 --- a/graphics/podofo/distinfo +++ b/graphics/podofo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685219099 -SHA256 (podofo-podofo-0.10.0_GH0.tar.gz) = c9bf607fe4862b5cc6eac1754f0e39674c553350e8bbde68f5fff3e3eb2ed4bc -SIZE (podofo-podofo-0.10.0_GH0.tar.gz) = 1660970 +TIMESTAMP = 1688132640 +SHA256 (podofo-podofo-0.10.1_GH0.tar.gz) = 9b2bb5d54185a547e440413ca2e9ec3ea9c522fec81dfeb9a23dbc3d65fbaa55 +SIZE (podofo-podofo-0.10.1_GH0.tar.gz) = 1690279 diff --git a/graphics/podofo/files/patch-CMakeLists.txt b/graphics/podofo/files/patch-CMakeLists.txt index 74a6fd522797..8c17487d09ef 100644 --- a/graphics/podofo/files/patch-CMakeLists.txt +++ b/graphics/podofo/files/patch-CMakeLists.txt @@ -1,47 +1,48 @@ ---- CMakeLists.txt.orig 2023-03-25 11:01:27 UTC +--- CMakeLists.txt.orig 2023-06-29 08:54:06 UTC +++ CMakeLists.txt -@@ -21,7 +21,7 @@ endif() +@@ -21,8 +21,8 @@ endif() set(PODOFO_VERSION_MAJOR "0" CACHE STRING "Major part of podofo version number") set(PODOFO_VERSION_MINOR "10" CACHE STRING "Minor part of podofo version number") - set(PODOFO_VERSION_PATCH "0" CACHE STRING "Patchlevel part of podofo version number") --set(PODOFO_LIBVERSION "${PODOFO_VERSION_MAJOR}.${PODOFO_VERSION_MINOR}.${PODOFO_VERSION_PATCH}") -+set(PODOFO_LIBVERSION "1.${PODOFO_VERSION_MAJOR}.${PODOFO_VERSION_MINOR}.${PODOFO_VERSION_PATCH}") - set(PODOFO_SOVERSION "1") + set(PODOFO_VERSION_PATCH "1" CACHE STRING "Patchlevel part of podofo version number") +-set(PODOFO_VERSION "${PODOFO_VERSION_MAJOR}.${PODOFO_VERSION_MINOR}.${PODOFO_VERSION_PATCH}") + set(PODOFO_SOVERSION "2") ++set(PODOFO_VERSION "${PODOFO_SOVERSION}.${PODOFO_VERSION_MAJOR}.${PODOFO_VERSION_MINOR}.${PODOFO_VERSION_PATCH}") # + # Main includes @@ -149,6 +149,7 @@ else() message("Libidn not found. AES-256 Encryption support will be disabled") endif() +if(WANT_LIBJPEG) find_package(JPEG) if(JPEG_FOUND) @@ -157,7 +158,9 @@ if(JPEG_FOUND) else() message("Libjpeg not found. JPEG support will be disabled") endif() +endif() +if(WANT_TIFF) find_package(TIFF) if(TIFF_FOUND) @@ -166,7 +169,9 @@ if(TIFF_FOUND) else() message("Libtiff not found. TIFF support will be disabled") endif() +endif() +if(WANT_PNG) find_package(PNG) if(PNG_FOUND) @@ -175,6 +180,7 @@ if(PNG_FOUND) else() message("LibPng not found. PNG support will be disabled") set(PNG_LIBRARIES "") +endif() endif() find_package(Freetype REQUIRED) diff --git a/graphics/podofo/pkg-plist b/graphics/podofo/pkg-plist index a3eafb891f41..e9ef840d29b5 100644 --- a/graphics/podofo/pkg-plist +++ b/graphics/podofo/pkg-plist @@ -1,149 +1,150 @@ include/podofo/auxiliary/EnumFlags.h include/podofo/auxiliary/InputDevice.h include/podofo/auxiliary/InputStream.h include/podofo/auxiliary/MathBase.h include/podofo/auxiliary/Matrix.h include/podofo/auxiliary/OutputDevice.h include/podofo/auxiliary/OutputStream.h include/podofo/auxiliary/Rect.h include/podofo/auxiliary/StateStack.h include/podofo/auxiliary/StreamDevice.h include/podofo/auxiliary/StreamDeviceBase.h include/podofo/auxiliary/Vector2.h include/podofo/auxiliary/Version.h include/podofo/auxiliary/basecompat.h include/podofo/auxiliary/basedefs.h include/podofo/auxiliary/baseincludes.h include/podofo/auxiliary/basetypes.h include/podofo/auxiliary/nullable.h include/podofo/auxiliary/podofo_config.h include/podofo/auxiliary/span.h include/podofo/auxiliary/span.hpp include/podofo/main/PdfAcroForm.h include/podofo/main/PdfAction.h include/podofo/main/PdfAnnotation.h include/podofo/main/PdfAnnotationActionBase.h include/podofo/main/PdfAnnotationCollection.h include/podofo/main/PdfAnnotationWidget.h include/podofo/main/PdfAnnotation_Types.h include/podofo/main/PdfArray.h include/podofo/main/PdfButton.h include/podofo/main/PdfCIDToGIDMap.h include/podofo/main/PdfCMapEncoding.h include/podofo/main/PdfCanvas.h include/podofo/main/PdfCanvasInputDevice.h include/podofo/main/PdfCatalog.h include/podofo/main/PdfCharCodeMap.h include/podofo/main/PdfCheckBox.h include/podofo/main/PdfChoiceField.h include/podofo/main/PdfColor.h include/podofo/main/PdfComboBox.h include/podofo/main/PdfCommon.h include/podofo/main/PdfContentStreamOperators.h include/podofo/main/PdfContentStreamReader.h include/podofo/main/PdfContents.h include/podofo/main/PdfData.h include/podofo/main/PdfDataContainer.h include/podofo/main/PdfDataProvider.h include/podofo/main/PdfDate.h include/podofo/main/PdfDeclarations.h include/podofo/main/PdfDestination.h include/podofo/main/PdfDictionary.h include/podofo/main/PdfDifferenceEncoding.h include/podofo/main/PdfDocument.h include/podofo/main/PdfElement.h include/podofo/main/PdfEncoding.h include/podofo/main/PdfEncodingCommon.h include/podofo/main/PdfEncodingFactory.h include/podofo/main/PdfEncodingMap.h include/podofo/main/PdfEncodingMapFactory.h include/podofo/main/PdfEncodingShim.h include/podofo/main/PdfEncrypt.h include/podofo/main/PdfError.h include/podofo/main/PdfExtGState.h include/podofo/main/PdfExtension.h include/podofo/main/PdfField.h include/podofo/main/PdfFieldChildrenCollection.h include/podofo/main/PdfFileSpec.h include/podofo/main/PdfFilter.h include/podofo/main/PdfFont.h include/podofo/main/PdfFontCID.h include/podofo/main/PdfFontCIDTrueType.h include/podofo/main/PdfFontCIDType1.h include/podofo/main/PdfFontConfigWrapper.h include/podofo/main/PdfFontManager.h include/podofo/main/PdfFontMetrics.h include/podofo/main/PdfFontMetricsFreetype.h include/podofo/main/PdfFontMetricsObject.h include/podofo/main/PdfFontMetricsStandard14.h include/podofo/main/PdfFontObject.h include/podofo/main/PdfFontSimple.h include/podofo/main/PdfFontTrueType.h include/podofo/main/PdfFontTrueTypeSubset.h include/podofo/main/PdfFontType1.h include/podofo/main/PdfFontType3.h include/podofo/main/PdfGraphicsState.h include/podofo/main/PdfIdentityEncoding.h include/podofo/main/PdfImage.h include/podofo/main/PdfImmediateWriter.h include/podofo/main/PdfIndirectObjectList.h include/podofo/main/PdfInfo.h include/podofo/main/PdfListBox.h include/podofo/main/PdfMath.h include/podofo/main/PdfMemDocument.h include/podofo/main/PdfMemoryObjectStream.h include/podofo/main/PdfMetadata.h include/podofo/main/PdfName.h include/podofo/main/PdfNameTree.h include/podofo/main/PdfObject.h include/podofo/main/PdfObjectStream.h include/podofo/main/PdfObjectStreamParser.h include/podofo/main/PdfObjectStreamProvider.h include/podofo/main/PdfOperatorUtils.h include/podofo/main/PdfOutlines.h include/podofo/main/PdfPage.h include/podofo/main/PdfPageCollection.h -include/podofo/main/PdfPageTreeCache.h include/podofo/main/PdfPainter.h include/podofo/main/PdfPainterPath.h include/podofo/main/PdfPainterTextObject.h include/podofo/main/PdfParser.h include/podofo/main/PdfParserObject.h include/podofo/main/PdfPostScriptTokenizer.h include/podofo/main/PdfPredefinedEncoding.h include/podofo/main/PdfPushButton.h include/podofo/main/PdfRadioButton.h include/podofo/main/PdfReference.h include/podofo/main/PdfResources.h include/podofo/main/PdfSignature.h include/podofo/main/PdfSigner.h include/podofo/main/PdfStatefulEncrypt.h include/podofo/main/PdfStreamedDocument.h include/podofo/main/PdfStreamedObjectStream.h include/podofo/main/PdfString.h include/podofo/main/PdfStringStream.h include/podofo/main/PdfTextBox.h include/podofo/main/PdfTextState.h include/podofo/main/PdfTokenizer.h include/podofo/main/PdfTrailer.h include/podofo/main/PdfVariant.h include/podofo/main/PdfVariantStack.h include/podofo/main/PdfWriter.h include/podofo/main/PdfXMPMetadata.h include/podofo/main/PdfXMPPacket.h include/podofo/main/PdfXObject.h include/podofo/main/PdfXObjectForm.h include/podofo/main/PdfXObjectPostScript.h include/podofo/main/PdfXRef.h include/podofo/main/PdfXRefEntry.h include/podofo/main/PdfXRefStream.h include/podofo/main/PdfXRefStreamParserObject.h include/podofo/podofo.h include/podofo/staging/PdfFunction.h include/podofo/staging/PdfPainterExtensions.h include/podofo/staging/PdfShadingPattern.h include/podofo/staging/PdfTilingPattern.h lib/libpodofo.so -lib/libpodofo.so.1 -lib/libpodofo.so.1.0.10.0 +lib/libpodofo.so.2 +lib/libpodofo.so.2.%%PORTVERSION%% libdata/pkgconfig/libpodofo.pc +%%DATADIR%%/podofo-config-%%CMAKE_BUILD_TYPE%%.cmake +%%DATADIR%%/podofo-config.cmake