Date: Fri, 29 Dec 2023 18:24:56 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: cd0fa0d37731 - main - graphics/scantailor: Update version 1.0.16=>1.0.19 Message-ID: <202312291824.3BTIOu36003296@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd0fa0d3773140575d68b927e04428bc6cb40e20 commit cd0fa0d3773140575d68b927e04428bc6cb40e20 Author: Martin Neubauer <m.ne@gmx.net> AuthorDate: 2023-12-29 17:47:54 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2023-12-29 18:24:40 +0000 graphics/scantailor: Update version 1.0.16=>1.0.19 - Switch to active upstream - Upsate WWW Changelog: https://github.com/ScanTailor-Advanced/scantailor-advanced PR: 275992 Approved by: submitter is maintainer --- graphics/scantailor/Makefile | 17 +++++------------ graphics/scantailor/distinfo | 6 +++--- graphics/scantailor/files/patch-ImageViewBase.cpp | 10 ---------- .../files/patch-filters_output_OutputGenerator.cpp | 17 ----------------- .../files/patch-filters_page__layout_ImageView.cpp | 17 ----------------- .../files/patch-filters_page__layout_Thumbnail.cpp | 17 ----------------- .../patch-filters_select__content_ContentBoxFinder.cpp | 17 ----------------- .../files/patch-zones_ZoneContextMenuInteraction.cpp | 10 ---------- .../files/patch-zones_ZoneDefaultInteraction.cpp | 10 ---------- graphics/scantailor/pkg-plist | 5 +++++ 10 files changed, 13 insertions(+), 113 deletions(-) diff --git a/graphics/scantailor/Makefile b/graphics/scantailor/Makefile index 865ffcac3f1d..e9d77adcf96a 100644 --- a/graphics/scantailor/Makefile +++ b/graphics/scantailor/Makefile @@ -1,12 +1,11 @@ PORTNAME= scantailor DISTVERSIONPREFIX= v -DISTVERSION= 1.0.16 -PORTREVISION= 3 +DISTVERSION= 1.0.19 CATEGORIES= graphics MAINTAINER= m.ne@gmx.net COMMENT= Interactive post-processing tool for scanned pages -WWW= https://github.com/4lex4/scantailor-advanced +WWW= https://github.com/ScanTailor-Advanced/scantailor-advanced LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE @@ -20,11 +19,11 @@ USES= cmake compiler:c++11-lang desktop-file-utils jpeg qt:5 \ shared-mime-info xorg USE_CXXSTD= gnu++98 USE_GITHUB= yes -USE_QT= core gui network opengl widgets xml buildtools:build \ +USE_QT= core gui network opengl svg widgets xml buildtools:build \ linguisttools:build qmake:build USE_XORG+= xrender -GH_ACCOUNT= 4lex4 +GH_ACCOUNT= ScanTailor-Advanced GH_PROJECT= scantailor-advanced OPTIONS_GROUP= DOXYGEN @@ -50,17 +49,11 @@ PORTDOCS= * BUILD_DEPENDS+= doxygen:devel/doxygen .endif -post-patch: - @${REINPLACE_CMD} -e 's|_[12]|boost::lambda::&|g; s|bind(|boost::lambda::&|' \ - ${WRKSRC}/filters/*/Filter.cpp - @${REINPLACE_CMD} -e '/Categories/s|Applications|Scanning|' \ - ${WRKSRC}/resources/unix/scantailor.desktop - post-patch-NLS-off: @${REINPLACE_CMD} -e '/\/translations/s/install/# install/' ${WRKSRC}/CMakeLists.txt post-install: - ${INSTALL_DATA} ${WRKSRC}/resources/icons/appicon-about.png \ + ${INSTALL_DATA} ${WRKSRC}/src/resources/ScanTailor.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .if ${PORT_OPTIONS:MHTML} || ${PORT_OPTIONS:MLATEX} diff --git a/graphics/scantailor/distinfo b/graphics/scantailor/distinfo index b527422d4588..b5f059f0d0d9 100644 --- a/graphics/scantailor/distinfo +++ b/graphics/scantailor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1568221877 -SHA256 (4lex4-scantailor-advanced-v1.0.16_GH0.tar.gz) = 84629d2edba4c36c62bdb75eedb145262b894d950bcb95cec0dab43e21bdb909 -SIZE (4lex4-scantailor-advanced-v1.0.16_GH0.tar.gz) = 2792788 +TIMESTAMP = 1703829299 +SHA256 (ScanTailor-Advanced-scantailor-advanced-v1.0.19_GH0.tar.gz) = db41c3a1ba0ecfc00a40a4efe2bcc9d2abb71ecb77fdc873ae6553b07a228370 +SIZE (ScanTailor-Advanced-scantailor-advanced-v1.0.19_GH0.tar.gz) = 988881 diff --git a/graphics/scantailor/files/patch-ImageViewBase.cpp b/graphics/scantailor/files/patch-ImageViewBase.cpp deleted file mode 100644 index 15570b54c464..000000000000 --- a/graphics/scantailor/files/patch-ImageViewBase.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- ImageViewBase.cpp.orig 2020-05-21 09:35:48 UTC -+++ ImageViewBase.cpp -@@ -22,6 +22,7 @@ - #include <QMouseEvent> - #include <QPaintEngine> - #include <QPointer> -+#include <QPainterPath> - #include <QScrollBar> - #include <QSettings> - #include <QtWidgets/QMainWindow> diff --git a/graphics/scantailor/files/patch-filters_output_OutputGenerator.cpp b/graphics/scantailor/files/patch-filters_output_OutputGenerator.cpp deleted file mode 100644 index aebc1e5f85c2..000000000000 --- a/graphics/scantailor/files/patch-filters_output_OutputGenerator.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- filters/output/OutputGenerator.cpp.orig 2020-05-21 09:40:03 UTC -+++ filters/output/OutputGenerator.cpp -@@ -25,6 +25,7 @@ - #include <imageproc/ImageCombination.h> - #include <QDebug> - #include <QPainter> -+#include <QPainterPath> - #include <QtCore/QSettings> - #include <boost/bind.hpp> - #include "DebugImages.h" -@@ -2666,4 +2667,4 @@ QImage OutputGenerator::posterizeImage(const QImage& i - posterizationOptions.isForceBlackAndWhite(), 0, qRound(background_color.lightnessF() * 255)) - .getImage(); - } --} // namespace output -\ No newline at end of file -+} // namespace output diff --git a/graphics/scantailor/files/patch-filters_page__layout_ImageView.cpp b/graphics/scantailor/files/patch-filters_page__layout_ImageView.cpp deleted file mode 100644 index b9043f046992..000000000000 --- a/graphics/scantailor/files/patch-filters_page__layout_ImageView.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- filters/page_layout/ImageView.cpp.orig 2020-05-21 09:34:10 UTC -+++ filters/page_layout/ImageView.cpp -@@ -27,6 +27,7 @@ - #include <imageproc/Transform.h> - #include <QMouseEvent> - #include <QPainter> -+#include <QPainterPath> - #include <boost/bind.hpp> - #include <boost/lambda/lambda.hpp> - #include "ImagePresentation.h" -@@ -1160,4 +1161,4 @@ void ImageView::enableMiddleRectInteraction(const bool - bool ImageView::isShowingMiddleRectEnabled() const { - return (!m_nullContentRect && m_settings->isShowingMiddleRectEnabled()) || m_alignment.isNull(); - } --} // namespace page_layout -\ No newline at end of file -+} // namespace page_layout diff --git a/graphics/scantailor/files/patch-filters_page__layout_Thumbnail.cpp b/graphics/scantailor/files/patch-filters_page__layout_Thumbnail.cpp deleted file mode 100644 index 6322d7ce5d69..000000000000 --- a/graphics/scantailor/files/patch-filters_page__layout_Thumbnail.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- filters/page_layout/Thumbnail.cpp.orig 2020-05-21 09:40:03 UTC -+++ filters/page_layout/Thumbnail.cpp -@@ -18,6 +18,7 @@ - - #include "Thumbnail.h" - #include <QPainter> -+#include <QPainterPath> - #include <utility> - #include "Utils.h" - #include "imageproc/PolygonUtils.h" -@@ -111,4 +112,4 @@ void Thumbnail::paintOverImage(QPainter& painter, - paintDeviant(painter); - } - } // Thumbnail::paintOverImage --} // namespace page_layout -\ No newline at end of file -+} // namespace page_layout diff --git a/graphics/scantailor/files/patch-filters_select__content_ContentBoxFinder.cpp b/graphics/scantailor/files/patch-filters_select__content_ContentBoxFinder.cpp deleted file mode 100644 index 7ce6e3d627ba..000000000000 --- a/graphics/scantailor/files/patch-filters_select__content_ContentBoxFinder.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- filters/select_content/ContentBoxFinder.cpp.orig 2020-05-21 09:40:03 UTC -+++ filters/select_content/ContentBoxFinder.cpp -@@ -19,6 +19,7 @@ - #include "ContentBoxFinder.h" - #include <QDebug> - #include <QPainter> -+#include <QPainterPath> - #include <cmath> - #include <queue> - #include "DebugImages.h" -@@ -1353,4 +1354,4 @@ const SEDM& ContentBoxFinder::Garbage::sedm() { - - return m_sedm; - } --} // namespace select_content -\ No newline at end of file -+} // namespace select_content diff --git a/graphics/scantailor/files/patch-zones_ZoneContextMenuInteraction.cpp b/graphics/scantailor/files/patch-zones_ZoneContextMenuInteraction.cpp deleted file mode 100644 index e642826082b1..000000000000 --- a/graphics/scantailor/files/patch-zones_ZoneContextMenuInteraction.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- zones/ZoneContextMenuInteraction.cpp.orig 2020-05-21 09:38:01 UTC -+++ zones/ZoneContextMenuInteraction.cpp -@@ -21,6 +21,7 @@ - #include <QMenu> - #include <QMessageBox> - #include <QPainter> -+#include <QPainterPath> - #include <QSignalMapper> - #include <boost/bind.hpp> - #include "ImageViewBase.h" diff --git a/graphics/scantailor/files/patch-zones_ZoneDefaultInteraction.cpp b/graphics/scantailor/files/patch-zones_ZoneDefaultInteraction.cpp deleted file mode 100644 index cc8738261ceb..000000000000 --- a/graphics/scantailor/files/patch-zones_ZoneDefaultInteraction.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- zones/ZoneDefaultInteraction.cpp.orig 2020-05-21 09:38:01 UTC -+++ zones/ZoneDefaultInteraction.cpp -@@ -19,6 +19,7 @@ - #include "ZoneDefaultInteraction.h" - #include <QMouseEvent> - #include <QPainter> -+#include <QPainterPath> - #include "ImageViewBase.h" - #include "SerializableSpline.h" - #include "ZoneInteractionContext.h" diff --git a/graphics/scantailor/pkg-plist b/graphics/scantailor/pkg-plist index d9c28f29ad9e..5e636043eabf 100644 --- a/graphics/scantailor/pkg-plist +++ b/graphics/scantailor/pkg-plist @@ -3,5 +3,10 @@ share/applications/scantailor.desktop share/icons/hicolor/scalable/apps/ScanTailor.svg share/mime/packages/scantailor-project.xml share/pixmaps/scantailor.png +%%NLS%%%%DATADIR%%-advanced/translations/scantailor_de.qm %%NLS%%%%DATADIR%%-advanced/translations/scantailor_es.qm +%%NLS%%%%DATADIR%%-advanced/translations/scantailor_fr.qm +%%NLS%%%%DATADIR%%-advanced/translations/scantailor_ko.qm +%%NLS%%%%DATADIR%%-advanced/translations/scantailor_pl.qm +%%NLS%%%%DATADIR%%-advanced/translations/scantailor_pt.qm %%NLS%%%%DATADIR%%-advanced/translations/scantailor_ru.qm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202312291824.3BTIOu36003296>