diff options
Diffstat (limited to 'media-gfx/scantailor-advanced')
9 files changed, 196 insertions, 285 deletions
diff --git a/media-gfx/scantailor-advanced/Manifest b/media-gfx/scantailor-advanced/Manifest index 7637dbe5e663..d232d4b589eb 100644 --- a/media-gfx/scantailor-advanced/Manifest +++ b/media-gfx/scantailor-advanced/Manifest @@ -1,2 +1 @@ -DIST scantailor-advanced-1.0.14.tar.gz 926267 BLAKE2B 2d901afebf3d9b405365ba71868f7aa29c23c537af72679a89a29351557a1a12692223b961dfd0ced3ea540c45f90dde8ea13bcd1667aa355e90a1c24a21e932 SHA512 113723b8a62da1b7141e03b5ad8ac7c426a2943f882cd229c9c51d10de75ee85d019ac21fc2d9eb4cc0d5bfb9ce66a4c41cf523698adc5a9a5d99da02369baf7 DIST scantailor-advanced-1.0.16.tar.gz 2792788 BLAKE2B d695f9e62bc83569a320f81d2aee5f77064b791f8d59208ca55b0f4a5f25350552a673adce23ab03b92d893bd57815eb6990c91a33c12cd3652c54998d15e29c SHA512 76f103afa44f5fa03f218d237dfe4565abe1d84937ec2ea5e64662c62d073e93d7b25f1e4f66dcfe13ad36bb08abd081b5d52c092f2f54f12f0bc6cdb4340e85 diff --git a/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.14-qt-5.11.patch b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.14-qt-5.11.patch deleted file mode 100644 index 6443809c102a..000000000000 --- a/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.14-qt-5.11.patch +++ /dev/null @@ -1,182 +0,0 @@ -From 64a151a3795013f58880d2a5f4ce4688ecb88838 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Tue, 10 Apr 2018 11:58:00 +0200 -Subject: [PATCH] Fix build with Qt 5.11 - ---- - DefaultParamsDialog.h | 9 ++++++--- - ErrorWidget.cpp | 3 +++ - filters/deskew/ApplyDialog.h | 3 +++ - filters/fix_orientation/ApplyDialog.h | 3 +++ - filters/output/ApplyColorsDialog.h | 3 +++ - filters/output/ChangeDewarpingDialog.h | 3 +++ - filters/output/ChangeDpiDialog.h | 3 +++ - filters/page_layout/ApplyDialog.h | 3 +++ - filters/page_split/SplitModeDialog.h | 3 +++ - filters/select_content/ApplyDialog.h | 3 +++ - 10 files changed, 33 insertions(+), 3 deletions(-) - -diff --git a/DefaultParamsDialog.h b/DefaultParamsDialog.h -index d9ec86e..043446c 100644 ---- a/DefaultParamsDialog.h -+++ b/DefaultParamsDialog.h -@@ -2,14 +2,17 @@ - #ifndef SCANTAILOR_DEFAULTPARAMSDIALOG_H - #define SCANTAILOR_DEFAULTPARAMSDIALOG_H - --#include <QtWidgets/QWidget> --#include <unordered_map> --#include <set> - #include "ui_DefaultParamsDialog.h" - #include "OrthogonalRotation.h" - #include "DefaultParamsProfileManager.h" - #include "DefaultParams.h" - -+#include <QButtonGroup> -+#include <QWidget> -+ -+#include <unordered_map> -+#include <set> -+ - class DefaultParamsDialog : public QDialog, private Ui::DefaultParamsDialog { - Q_OBJECT - private: -diff --git a/ErrorWidget.cpp b/ErrorWidget.cpp -index fb76cc4..6fb4c68 100644 ---- a/ErrorWidget.cpp -+++ b/ErrorWidget.cpp -@@ -18,6 +18,9 @@ - - #include "ErrorWidget.h" - -+#include <QIcon> -+#include <QStyle> -+ - ErrorWidget::ErrorWidget(const QString& text, Qt::TextFormat fmt) { - setupUi(this); - textLabel->setTextFormat(fmt); -diff --git a/filters/deskew/ApplyDialog.h b/filters/deskew/ApplyDialog.h -index bf1a055..69f18e1 100644 ---- a/filters/deskew/ApplyDialog.h -+++ b/filters/deskew/ApplyDialog.h -@@ -22,7 +22,10 @@ - #include "PageId.h" - #include "PageSequence.h" - #include "intrusive_ptr.h" -+ -+#include <QButtonGroup> - #include <QDialog> -+ - #include <set> - - class QButtonGroup; -diff --git a/filters/fix_orientation/ApplyDialog.h b/filters/fix_orientation/ApplyDialog.h -index dcd25d5..e46d30d 100644 ---- a/filters/fix_orientation/ApplyDialog.h -+++ b/filters/fix_orientation/ApplyDialog.h -@@ -24,7 +24,10 @@ - #include "PageRange.h" - #include "PageSequence.h" - #include "intrusive_ptr.h" -+ -+#include <QButtonGroup> - #include <QDialog> -+ - #include <vector> - #include <set> - -diff --git a/filters/output/ApplyColorsDialog.h b/filters/output/ApplyColorsDialog.h -index 4c525c7..81f4177 100644 ---- a/filters/output/ApplyColorsDialog.h -+++ b/filters/output/ApplyColorsDialog.h -@@ -23,7 +23,10 @@ - #include "PageId.h" - #include "PageSequence.h" - #include "intrusive_ptr.h" -+ -+#include <QButtonGroup> - #include <QDialog> -+ - #include <set> - - class PageSelectionAccessor; -diff --git a/filters/output/ChangeDewarpingDialog.h b/filters/output/ChangeDewarpingDialog.h -index de4f2c3..31ee19d 100644 ---- a/filters/output/ChangeDewarpingDialog.h -+++ b/filters/output/ChangeDewarpingDialog.h -@@ -24,8 +24,11 @@ - #include "PageId.h" - #include "PageSequence.h" - #include "intrusive_ptr.h" -+ -+#include <QButtonGroup> - #include <QDialog> - #include <QString> -+ - #include <set> - - class PageSelectionAccessor; -diff --git a/filters/output/ChangeDpiDialog.h b/filters/output/ChangeDpiDialog.h -index 7ce6f58..1b86ac7 100644 ---- a/filters/output/ChangeDpiDialog.h -+++ b/filters/output/ChangeDpiDialog.h -@@ -23,8 +23,11 @@ - #include "PageId.h" - #include "PageSequence.h" - #include "intrusive_ptr.h" -+ -+#include <QButtonGroup> - #include <QDialog> - #include <QString> -+ - #include <set> - - class PageSelectionAccessor; -diff --git a/filters/page_layout/ApplyDialog.h b/filters/page_layout/ApplyDialog.h -index ba25154..07f83c3 100644 ---- a/filters/page_layout/ApplyDialog.h -+++ b/filters/page_layout/ApplyDialog.h -@@ -24,7 +24,10 @@ - #include "PageRange.h" - #include "PageSequence.h" - #include "intrusive_ptr.h" -+ -+#include <QButtonGroup> - #include <QDialog> -+ - #include <set> - - class PageSelectionAccessor; -diff --git a/filters/page_split/SplitModeDialog.h b/filters/page_split/SplitModeDialog.h -index 2cf9e91..351f1e2 100644 ---- a/filters/page_split/SplitModeDialog.h -+++ b/filters/page_split/SplitModeDialog.h -@@ -25,7 +25,10 @@ - #include "PageId.h" - #include "PageSequence.h" - #include "intrusive_ptr.h" -+ -+#include <QButtonGroup> - #include <QDialog> -+ - #include <set> - - class ProjectPages; -diff --git a/filters/select_content/ApplyDialog.h b/filters/select_content/ApplyDialog.h -index f0f7041..a7ff19e 100644 ---- a/filters/select_content/ApplyDialog.h -+++ b/filters/select_content/ApplyDialog.h -@@ -24,7 +24,10 @@ - #include "PageRange.h" - #include "PageSequence.h" - #include "intrusive_ptr.h" -+ -+#include <QButtonGroup> - #include <QDialog> -+ - #include <vector> - #include <set> - --- -2.17.0 - diff --git a/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.16-bogus-dep.patch b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.16-bogus-dep.patch new file mode 100644 index 000000000000..553c108c19cf --- /dev/null +++ b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.16-bogus-dep.patch @@ -0,0 +1,37 @@ +--- a/CMakeLists.txt 2020-05-31 01:09:58.634978658 +0200 ++++ b/CMakeLists.txt 2020-05-31 01:12:51.011307579 +0200 +@@ -298,7 +298,6 @@ + find_package(Qt5Gui ${qt_min_version} REQUIRED) + find_package(Qt5Widgets ${qt_min_version} REQUIRED) + find_package(Qt5Xml ${qt_min_version} REQUIRED) +-find_package(Qt5Network ${qt_min_version} REQUIRED) + find_package(Qt5LinguistTools ${qt_min_version} REQUIRED) + find_package(Qt5OpenGL ${qt_min_version} REQUIRED) + +@@ -311,8 +310,6 @@ + link_directories(${Qt5Widgets_LIBRARIES}) + include_directories(${Qt5Xml_INCLUDE_DIRS}) + link_directories(${Qt5Xml_LIBRARIES}) +-include_directories(${Qt5Network_INCLUDE_DIRS}) +-link_directories(${Qt5Network_LIBRARIES}) + include_directories(${Qt5OpenGL_INCLUDE_DIRS}) + link_directories(${Qt5OpenGL_LIBRARIES}) + include_directories(${Qt5LinguistTools_INCLUDE_DIRS}) +@@ -578,7 +575,7 @@ + scantailor + fix_orientation page_split deskew select_content page_layout output stcore + dewarping zones interaction imageproc math foundation +- ${Qt5Core_LIBRARIES} ${Qt5GUI_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Xml_LIBRARIES} ${Qt5Network_LIBRARIES} ++ ${Qt5Core_LIBRARIES} ${Qt5GUI_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Xml_LIBRARIES} + ${Qt5OpenGL_LIBRARIES} ${Qt5LinguistTools_LIBRARIES} ${EXTRA_LIBS} + ) + +@@ -639,7 +636,7 @@ + qt5_libs + ${Qt5Widgets_LIBRARIES} ${Qt5Gui_LIBRARIES} + ${Qt5Core_LIBRARIES} ${Qt5Xml_LIBRARIES} +- ${Qt5Network_LIBRARIES} ${Qt5OpenGL_LIBRARIES} ++ ${Qt5OpenGL_LIBRARIES} + ) + + foreach (target ${qt5_libs}) diff --git a/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.16-desktopfile.patch b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.16-desktopfile.patch new file mode 100644 index 000000000000..cececbb84f43 --- /dev/null +++ b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.16-desktopfile.patch @@ -0,0 +1,23 @@ +From e4125b66138c4258f13e69dc4bd8e6df41323599 Mon Sep 17 00:00:00 2001 +From: 4lex4 <4lex49@zoho.com> +Date: Tue, 27 Aug 2019 17:30:50 +0300 +Subject: [PATCH] ~ Remove a deprecated value from the .desktop file + +--- + resources/unix/scantailor.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/resources/unix/scantailor.desktop b/resources/unix/scantailor.desktop +index 9e49d5e..4df7d97 100644 +--- a/resources/unix/scantailor.desktop ++++ b/resources/unix/scantailor.desktop +@@ -7,5 +7,5 @@ Icon=ScanTailor + Terminal=false + X-MultipleArgs=false + Type=Application +-Categories=Graphics;Applications; ++Categories=Graphics; + MimeType=application/x-scantailor-project; +-- +2.26.2 + diff --git a/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.16-qt-5.15.patch b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.16-qt-5.15.patch new file mode 100644 index 000000000000..4ed357025622 --- /dev/null +++ b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.16-qt-5.15.patch @@ -0,0 +1,87 @@ +diff -ur a/filters/output/OutputGenerator.cpp b/filters/output/OutputGenerator.cpp +--- a/filters/output/OutputGenerator.cpp 2018-07-17 04:04:23.000000000 +0200 ++++ b/filters/output/OutputGenerator.cpp 2020-05-29 12:15:28.759822806 +0200 +@@ -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 @@ + posterizationOptions.isForceBlackAndWhite(), 0, qRound(background_color.lightnessF() * 255)) + .getImage(); + } +-} // namespace output +\ Chybí znak konce řádku na konci souboru ++} // namespace output +diff -ur a/filters/page_layout/ImageView.cpp b/filters/page_layout/ImageView.cpp +--- a/filters/page_layout/ImageView.cpp 2018-07-17 04:04:23.000000000 +0200 ++++ b/filters/page_layout/ImageView.cpp 2020-05-29 12:14:09.691546103 +0200 +@@ -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 @@ + bool ImageView::isShowingMiddleRectEnabled() const { + return (!m_nullContentRect && m_settings->isShowingMiddleRectEnabled()) || m_alignment.isNull(); + } +-} // namespace page_layout +\ Chybí znak konce řádku na konci souboru ++} // namespace page_layout +diff -ur a/filters/select_content/ContentBoxFinder.cpp b/filters/select_content/ContentBoxFinder.cpp +--- a/filters/select_content/ContentBoxFinder.cpp 2018-07-17 04:04:23.000000000 +0200 ++++ b/filters/select_content/ContentBoxFinder.cpp 2020-05-29 12:12:39.023619751 +0200 +@@ -19,6 +19,7 @@ + #include "ContentBoxFinder.h" + #include <QDebug> + #include <QPainter> ++#include <QPainterPath> + #include <cmath> + #include <queue> + #include "DebugImages.h" +@@ -1353,4 +1354,4 @@ + + return m_sedm; + } +-} // namespace select_content +\ Chybí znak konce řádku na konci souboru ++} // namespace select_content +diff -ur a/ImageViewBase.cpp b/ImageViewBase.cpp +--- a/ImageViewBase.cpp 2018-07-17 04:04:23.000000000 +0200 ++++ b/ImageViewBase.cpp 2020-05-29 11:58:54.720220475 +0200 +@@ -24,6 +24,7 @@ + #include <QPointer> + #include <QScrollBar> + #include <QSettings> ++#include <QPainterPath> + #include <QtWidgets/QMainWindow> + #include <QtWidgets/QStatusBar> + #include "BackgroundExecutor.h" +diff -ur a/zones/ZoneContextMenuInteraction.cpp b/zones/ZoneContextMenuInteraction.cpp +--- a/zones/ZoneContextMenuInteraction.cpp 2018-07-17 04:04:23.000000000 +0200 ++++ b/zones/ZoneContextMenuInteraction.cpp 2020-05-29 12:10:53.079190198 +0200 +@@ -21,6 +21,7 @@ + #include <QMenu> + #include <QMessageBox> + #include <QPainter> ++#include <QPainterPath> + #include <QSignalMapper> + #include <boost/bind.hpp> + #include "ImageViewBase.h" +diff -ur a/zones/ZoneDefaultInteraction.cpp b/zones/ZoneDefaultInteraction.cpp +--- a/zones/ZoneDefaultInteraction.cpp 2018-07-17 04:04:23.000000000 +0200 ++++ b/zones/ZoneDefaultInteraction.cpp 2020-05-29 12:09:24.276172092 +0200 +@@ -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/media-gfx/scantailor-advanced/metadata.xml b/media-gfx/scantailor-advanced/metadata.xml index ac1f5ba3f485..c327896469a6 100644 --- a/media-gfx/scantailor-advanced/metadata.xml +++ b/media-gfx/scantailor-advanced/metadata.xml @@ -1,10 +1,7 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>graphics@gentoo.org</email> - <name>Gentoo Graphics Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">4lex4/scantailor-advanced</remote-id> </upstream> diff --git a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild deleted file mode 100644 index 902fbb1a3918..000000000000 --- a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils desktop virtualx - -DESCRIPTION="Interactive post-processing tool for scanned pages" -HOMEPAGE="http://scantailor.org/ https://github.com/4lex4/scantailor-advanced" -SRC_URI="https://github.com/4lex4/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 GPL-3 public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-libs/libpng:0= - media-libs/tiff:0 - sys-libs/zlib - virtual/jpeg:0 - x11-libs/libXrender -" -DEPEND="${RDEPEND} - dev-libs/boost - dev-qt/linguist-tools:5 - !media-gfx/scantailor -" - -PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) - -src_test() { - cd "${CMAKE_BUILD_DIR}" || die - virtx emake test -} - -src_install() { - cmake-utils_src_install - - newicon resources/appicon.svg ${PN}.svg - make_desktop_entry ${PN} "Scan Tailor Advanced" -} diff --git a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16-r3.ebuild b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16-r3.ebuild new file mode 100644 index 000000000000..e2b8291c9681 --- /dev/null +++ b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16-r3.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake virtualx xdg + +DESCRIPTION="Interactive post-processing tool for scanned pages" +HOMEPAGE="https://scantailor.org/ https://github.com/4lex4/scantailor-advanced" +SRC_URI="https://github.com/4lex4/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2 GPL-3 public-domain" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="" + +COMMON_DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/tiff:= + sys-libs/zlib +" +DEPEND="${COMMON_DEPEND} + dev-libs/boost +" +RDEPEND="${COMMON_DEPEND} + dev-qt/qtsvg:5 +" +BDEPEND="dev-qt/linguist-tools:5" + +PATCHES=( + "${FILESDIR}"/${P}-tests.patch # bug 662004 + "${FILESDIR}"/${P}-qt-5.15.patch # bug 726066 + "${FILESDIR}"/${P}-desktopfile.patch + "${FILESDIR}"/${P}-bogus-dep.patch +) + +src_test() { + cd "${CMAKE_BUILD_DIR}" || die + virtx cmake_src_test +} diff --git a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16.ebuild b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16.ebuild deleted file mode 100644 index be247dca96bb..000000000000 --- a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake desktop virtualx - -DESCRIPTION="Interactive post-processing tool for scanned pages" -HOMEPAGE="http://scantailor.org/ https://github.com/4lex4/scantailor-advanced" -SRC_URI="https://github.com/4lex4/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 GPL-3 public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-libs/libpng:0= - media-libs/tiff:0 - sys-libs/zlib - virtual/jpeg:0 - x11-libs/libXrender -" -DEPEND="${RDEPEND} - dev-libs/boost - dev-qt/linguist-tools:5 - !media-gfx/scantailor -" - -PATCHES=( "${FILESDIR}"/${P}-tests.patch ) - -src_test() { - cd "${CMAKE_BUILD_DIR}" || die - virtx cmake_src_test -} - -src_install() { - cmake_src_install - - newicon resources/appicon.svg ${PN}.svg - make_desktop_entry ${PN} "Scan Tailor Advanced" -} |