diff --git a/graphics/scantpaper/Makefile b/graphics/scantpaper/Makefile index 60cb37a71567..841d309ec0cc 100644 --- a/graphics/scantpaper/Makefile +++ b/graphics/scantpaper/Makefile @@ -1,41 +1,41 @@ PORTNAME= scantpaper DISTVERSIONPREFIX= v -DISTVERSION= 3.0.9 +DISTVERSION= 3.0.10 CATEGORIES= graphics python MAINTAINER= cmt@FreeBSD.org COMMENT= GUI to produce PDFs or DjVus from scanned documents WWW= https://github.com/carygravel/scantpaper LICENSE= GPLv3 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}polib>0:devel/py-polib@${PY_FLAVOR} LIB_DEPENDS= libtiff.so:graphics/tiff \ libpoppler.so:graphics/poppler \ libgoocanvas-2.0.so:graphics/goocanvas2 RUN_DEPENDS= unpaper:graphics/unpaper \ ${PYTHON_PKGNAMEPREFIX}img2pdf>0:graphics/py-img2pdf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tesserocr>0:graphics/py-tesserocr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ocrmypdf>=15.4.3:textproc/py-ocrmypdf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-iso639>0:textproc/py-python-iso639@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sane>0:graphics/py-sane@${PY_FLAVOR} \ ${PY_PILLOW} USES= compiler:c++17-lang gettext gnome magick:build,run python USE_GITHUB= yes GH_ACCOUNT= carygravel USE_GNOME= cairo gdkpixbuf gtk30 introspection librsvg2 pygobject3 USE_PYTHON= pep517 NO_ARCH= yes PLIST_SUB= DISTVERSION=${DISTVERSION} post-build: (cd ${WRKSRC} ; python3.12 dev/compile_mo.py --src po --out locale --domain scantpaper) post-install: (cd ${WRKSRC} ; for mo in locale/*/LC_MESSAGES/scantpaper.mo ; do ${MKDIR} "${STAGEDIR}/${PREFIX}/share/$$(dirname $${mo})" ; ${INSTALL_DATA} "$${mo}" "${STAGEDIR}/${PREFIX}/share/$$(dirname $${mo})/" ; done) .include diff --git a/graphics/scantpaper/distinfo b/graphics/scantpaper/distinfo index f857adeba683..c2774b25ba01 100644 --- a/graphics/scantpaper/distinfo +++ b/graphics/scantpaper/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1782590815 -SHA256 (carygravel-scantpaper-v3.0.9_GH0.tar.gz) = 3e2e79ae005ba7dea42b417c055672be78f4722ed97e6e867e91dfe3a2ff8f54 -SIZE (carygravel-scantpaper-v3.0.9_GH0.tar.gz) = 950340 +TIMESTAMP = 1783163771 +SHA256 (carygravel-scantpaper-v3.0.10_GH0.tar.gz) = db87d13db2c422f4d157d9aa667e548d3c6e5755a754c3c9f324151da268ff9a +SIZE (carygravel-scantpaper-v3.0.10_GH0.tar.gz) = 953796 diff --git a/graphics/scantpaper/files/patch-scantpaper_scanner_options.py b/graphics/scantpaper/files/patch-scantpaper_scanner_options.py deleted file mode 100644 index 3c504ee75cab..000000000000 --- a/graphics/scantpaper/files/patch-scantpaper_scanner_options.py +++ /dev/null @@ -1,27 +0,0 @@ -commit a3c6b805552d64a235b47935f47919ee2b436663 -Author: Christoph Moench-Tegeder -Date: Fri Jul 3 18:58:11 2026 +0200 - - Skip empty ("None") options when searching for "source" - - The list of options returned by sanes get_options() may contain - entries without a name set ('None'), which will cause an exception - to be raised when scanned by re.search() and the whole process - will fail. As those options are not what we're looking for, just - skip options where name is None in this loop. - A similar pattern has been applied in commit 97fa64ee to - scantpaper/scanner/options.py l.158 - -diff --git scantpaper/scanner/options.py scantpaper/scanner/options.py -index ed7775f..5ba280e 100644 ---- scantpaper/scanner/options.py -+++ scantpaper/scanner/options.py -@@ -60,7 +60,7 @@ class Options(GObject.Object): - self.source = self.by_name("source") - else: - for option in self.array: -- if re.search( -+ if option.name is not None and re.search( - r"source", option.name, re.MULTILINE | re.DOTALL | re.VERBOSE - ): - self.source = option