commit: 1ebf3a3e9f77c278a9c4f4f2639eeee34b06aa97 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Oct 12 12:57:35 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Oct 12 12:58:47 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ebf3a3e
media-gfx/scantailor-advanced: add 1.0.19 Closes: https://bugs.gentoo.org/955175 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-gfx/scantailor-advanced/Manifest | 1 + .../scantailor-advanced-1.0.19-bogus-dep.patch | 86 ++++++++++++++++++++++ ...scantailor-advanced-1.0.19-missing-header.patch | 21 ++++++ .../scantailor-advanced-1.0.19.ebuild | 42 +++++++++++ 4 files changed, 150 insertions(+) diff --git a/media-gfx/scantailor-advanced/Manifest b/media-gfx/scantailor-advanced/Manifest index d232d4b589eb..50d35ff95321 100644 --- a/media-gfx/scantailor-advanced/Manifest +++ b/media-gfx/scantailor-advanced/Manifest @@ -1 +1,2 @@ DIST scantailor-advanced-1.0.16.tar.gz 2792788 BLAKE2B d695f9e62bc83569a320f81d2aee5f77064b791f8d59208ca55b0f4a5f25350552a673adce23ab03b92d893bd57815eb6990c91a33c12cd3652c54998d15e29c SHA512 76f103afa44f5fa03f218d237dfe4565abe1d84937ec2ea5e64662c62d073e93d7b25f1e4f66dcfe13ad36bb08abd081b5d52c092f2f54f12f0bc6cdb4340e85 +DIST scantailor-advanced-1.0.19.tar.gz 988881 BLAKE2B 1b006b2f82450f4e2b36d8d50048063586a133689f96f312778653629eecbadbffb1691ccdd92586cac0e09e56ff1728c73bfe2b8c61b815c00c6860bb164490 SHA512 a84b90739bb1d2a631135c136ce87c3756ca25c28b561c46eab5b96651a581b880d34a08a18ae68595c852da938c1815f0ed72ef9da450744aefd94f4971c585 diff --git a/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.19-bogus-dep.patch b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.19-bogus-dep.patch new file mode 100644 index 000000000000..6e72de1b0bdf --- /dev/null +++ b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.19-bogus-dep.patch @@ -0,0 +1,86 @@ +From a587f513440e3acb1070f3c4a75642f20343cd63 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Sun, 12 Oct 2025 14:42:30 +0200 +Subject: [PATCH] Drop bogus Qt Network dependency + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + CMakeLists.txt | 10 ++++------ + src/core/CMakeLists.txt | 4 ++-- + 2 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2b17c36..50ae9f0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -210,13 +210,13 @@ set(qt_min_version 5.9) + + find_package( + Qt6 +- COMPONENTS Core Gui Widgets Xml Network LinguistTools OpenGL Svg OpenGLWidgets ++ COMPONENTS Core Gui Widgets Xml LinguistTools OpenGL Svg OpenGLWidgets + CONFIG) + if (Qt6_FOUND) + set(QT_BINDIR "${QT6_INSTALL_PREFIX}/bin") + else() + find_package(Qt5 ${qt_min_version} +- COMPONENTS Core Gui Widgets Xml Network LinguistTools OpenGL Svg ++ COMPONENTS Core Gui Widgets Xml LinguistTools OpenGL Svg + CONFIG REQUIRED) + set(QT_BINDIR "${QT5_INSTALL_PREFIX}/bin") + endif() +@@ -224,7 +224,6 @@ endif() + if(Qt6_FOUND) + set(Qt_Core_lib Qt::Core) + set(Qt_Gui_lib Qt::Gui) +- set(Qt_Network_lib Qt::Network) + set(Qt_OpenGL_lib Qt::OpenGL) + set(Qt_Svg_lib Qt::Svg) + set(Qt_Widgets_lib Qt::Widgets) +@@ -233,7 +232,6 @@ if(Qt6_FOUND) + else() + set(Qt_Core_lib Qt5::Core) + set(Qt_Gui_lib Qt5::Gui) +- set(Qt_Network_lib Qt5::Network) + set(Qt_OpenGL_lib Qt5::OpenGL) + set(Qt_Svg_lib Qt5::Svg) + set(Qt_Widgets_lib Qt5::Widgets) +@@ -365,12 +363,12 @@ if (WIN32) + set(dep_libs + JPEG::JPEG PNG::PNG ZLIB::ZLIB TIFF::TIFF + Qt::Core Qt::Gui Qt::Widgets Qt::Xml +- Qt::Network Qt::OpenGL Qt::Svg Qt6::OpenGLWidgets) ++ Qt::OpenGL Qt::Svg Qt6::OpenGLWidgets) + else() + set(dep_libs + JPEG::JPEG PNG::PNG ZLIB::ZLIB TIFF::TIFF + Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml +- Qt5::Network Qt5::OpenGL Qt5::Svg) ++ Qt5::OpenGL Qt5::Svg) + endif() + + foreach (_target ${dep_libs}) +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index b701c10..74cbdd3 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -123,14 +123,14 @@ if(Qt6_FOUND) + target_link_libraries( + core + PRIVATE TIFF::TIFF PNG::PNG ZLIB::ZLIB JPEG::JPEG +- PUBLIC Qt::Core Qt::Gui Qt::Widgets Qt::Xml Qt::Network Qt::OpenGL Qt::Svg Qt::OpenGLWidgets ++ PUBLIC Qt::Core Qt::Gui Qt::Widgets Qt::Xml Qt::OpenGL Qt::Svg Qt::OpenGLWidgets + imageproc zones + fix_orientation page_split deskew select_content page_layout output) + else() + target_link_libraries( + core + PRIVATE TIFF::TIFF PNG::PNG ZLIB::ZLIB JPEG::JPEG +- PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml Qt5::Network Qt5::OpenGL Qt5::Svg ++ PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml Qt5::OpenGL Qt5::Svg + imageproc zones + fix_orientation page_split deskew select_content page_layout output) + endif() +-- +2.51.0 + diff --git a/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.19-missing-header.patch b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.19-missing-header.patch new file mode 100644 index 000000000000..ab68facbf33d --- /dev/null +++ b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.19-missing-header.patch @@ -0,0 +1,21 @@ +From 70c9f1e09f332bb43c0c04d591cde36df592b20b Mon Sep 17 00:00:00 2001 +From: Aldo Bleeker <[email protected]> +Date: Wed, 28 Feb 2024 20:27:31 +0100 +Subject: [PATCH] This lets scantailor-advanced for Qt6 compile with MSVC. + +--- + src/core/Utils.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/core/Utils.h b/src/core/Utils.h +index 7b7646c2e..8018f4006 100644 +--- a/src/core/Utils.h ++++ b/src/core/Utils.h +@@ -5,6 +5,7 @@ + #define SCANTAILOR_CORE_UTILS_H_ + + #include <QString> ++#include <QObject> + #include <map> + #include <unordered_map> + diff --git a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.19.ebuild b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.19.ebuild new file mode 100644 index 000000000000..b30e203607ac --- /dev/null +++ b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.19.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +DESCRIPTION="Interactive post-processing tool for scanned pages" +HOMEPAGE="https://github.com/ScanTailor-Advanced/scantailor-advanced"; +SRC_URI="https://github.com/ScanTailor-Advanced/${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/qtbase:6[gui,opengl,widgets,xml] + 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:6 +" +BDEPEND="dev-qt/qttools:6[linguist]" + +PATCHES=( + "${FILESDIR}"/${P}-missing-header.patch # git master + "${FILESDIR}"/${P}-bogus-dep.patch # TODO: upstream +) + +CMAKE_SKIP_TESTS=( imageproc_tests ) # bug 662004 + +src_test() { + local -x QT_QPA_PLATFORM=offscreen + cmake_src_test +}
