[gentoo-commits] repo/gentoo:master commit in: media-gfx/scantailor-advanced/

2023-09-04 Thread Andreas Sturmlechner 
commit: 8b1c8f283c6e23170a8bcf2cff3103a79d30ec47
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Sep  4 19:19:12 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Sep  4 21:24:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1c8f28

media-gfx/scantailor-advanced: update EAPI 7 -> 8

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../scantailor-advanced/scantailor-advanced-1.0.16-r3.ebuild | 12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

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
index bfe062bf98c2..e2b8291c9681 100644
--- a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16-r3.ebuild
+++ b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake virtualx xdg
 
@@ -14,9 +14,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
-BDEPEND="
-   dev-qt/linguist-tools:5
-"
 COMMON_DEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -34,6 +31,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
dev-qt/qtsvg:5
 "
+BDEPEND="dev-qt/linguist-tools:5"
 
 PATCHES=(
"${FILESDIR}"/${P}-tests.patch # bug 662004
@@ -42,10 +40,6 @@ PATCHES=(
"${FILESDIR}"/${P}-bogus-dep.patch
 )
 
-src_prepare() {
-   cmake_src_prepare
-}
-
 src_test() {
cd "${CMAKE_BUILD_DIR}" || die
virtx cmake_src_test

[gentoo-commits] repo/gentoo:master commit in: media-gfx/scantailor-advanced/

2022-09-10 Thread Arthur Zamarin 
commit: 6ee085dba3c7be505c7e6bdbbeb836113b3ecb1b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Sep 10 18:45:21 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Sep 10 18:45:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ee085db

media-gfx/scantailor-advanced: Keyword 1.0.16-r1 arm64, #869533

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/scantailor-advanced/scantailor-advanced-1.0.16-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16-r1.ebuild 
b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16-r1.ebuild
index f5fe9384bafb..331690cdee2b 100644
--- a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16-r1.ebuild
+++ b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-gfx/scantailor-advanced/, media-gfx/scantailor-advanced/files/

2020-05-30 Thread Andreas Sturmlechner 
commit: 2dc5ae6f903df23fbf51fb8611fde9df09400aac
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May 30 23:05:05 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May 30 23:45:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dc5ae6f

media-gfx/scantailor-advanced: Fix build with Qt 5.15

- Move dev-qt/linguist-tools:5 to BDEPEND where it belongs
- Add missing RDEPEND, drop bogus DEPEND (already fixed upstream)
- Add missing xdg.eclass and drop unused desktop.eclass
- Fix QA warning wrt upstream .desktop file
- Drop obsolete src_install
- Switch HOMEPAGE to https

Bug: https://bugs.gentoo.org/662004
Closes: https://bugs.gentoo.org/726066
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../scantailor-advanced-1.0.16-bogus-dep.patch | 37 +
 .../scantailor-advanced-1.0.16-desktopfile.patch   | 23 ++
 .../files/scantailor-advanced-1.0.16-qt-5.15.patch | 87 ++
 .../scantailor-advanced-1.0.16-r1.ebuild   | 52 +
 4 files changed, 199 insertions(+)

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 000..553c108c19c
--- /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 000..cececbb84f4
--- /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 <4le...@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 000..4ed35702562
--- /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.0 
+0200
 b/filters/output/OutputGenerator.cpp   2020-05-29 12:15:28.759822806 
+0200
+@@ -25,6 +25,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include "DebugImages.h"
+@@ -2666,4 +2667,4 @@
+  posterizationOptions.isForceBlackAndWhite(), 0, 
qRound(background_color.lightnessF() * 255))
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/scantailor-advanced/, media-gfx/scantailor-advanced/files/

2020-05-30 Thread Andreas Sturmlechner 
commit: 62258a84ab78a668a3b5d6f96af4e77957fc8032
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May 30 23:23:49 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May 30 23:45:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62258a84

media-gfx/scantailor-advanced: Drop 1.0.14 and 1.0.16 (r0)

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/scantailor-advanced/Manifest |   1 -
 .../files/scantailor-advanced-1.0.14-qt-5.11.patch | 182 -
 .../scantailor-advanced-1.0.14.ebuild  |  48 --
 .../scantailor-advanced-1.0.16.ebuild  |  48 --
 4 files changed, 279 deletions(-)

diff --git a/media-gfx/scantailor-advanced/Manifest 
b/media-gfx/scantailor-advanced/Manifest
index 7637dbe5e66..d232d4b589e 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 6443809c102..000
--- 
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 
-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 
--#include 
--#include 
- #include "ui_DefaultParamsDialog.h"
- #include "OrthogonalRotation.h"
- #include "DefaultParamsProfileManager.h"
- #include "DefaultParams.h"
- 
-+#include 
-+#include 
-+
-+#include 
-+#include 
-+
- 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 
-+#include 
-+
- 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 
- #include 
-+
- #include 
- 
- 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 
- #include 
-+
- #include 
- #include 
- 
-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 
- #include 
-+
- #include 
- 
- 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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/scantailor-advanced/files/, media-gfx/scantailor-advanced/

2019-07-03 Thread Tim Harder 
commit: e3dd8622b02d8d7ab44689e6a06e11fee9bfdfbc
Author: Tim Harder  gentoo  org>
AuthorDate: Thu Jul  4 03:57:29 2019 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu Jul  4 03:57:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3dd8622

media-gfx/scantailor-advanced: version bump to 1.0.16

Closes: https://bugs.gentoo.org/662004

Signed-off-by: Tim Harder  gentoo.org>

 media-gfx/scantailor-advanced/Manifest |  1 +
 .../files/scantailor-advanced-1.0.16-tests.patch   | 11 +
 .../scantailor-advanced-1.0.16.ebuild  | 48 ++
 3 files changed, 60 insertions(+)

diff --git a/media-gfx/scantailor-advanced/Manifest 
b/media-gfx/scantailor-advanced/Manifest
index acf584a8247..7637dbe5e66 100644
--- a/media-gfx/scantailor-advanced/Manifest
+++ b/media-gfx/scantailor-advanced/Manifest
@@ -1 +1,2 @@
 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.16-tests.patch 
b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.16-tests.patch
new file mode 100644
index 000..71243077281
--- /dev/null
+++ b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.16-tests.patch
@@ -0,0 +1,11 @@
+Skip failing test until it can be properly diagnosed/fixed.
+
+--- scantailor-advanced-1.0.16/imageproc/tests/CMakeLists.txt
 scantailor-advanced-1.0.16/imageproc/tests/CMakeLists.txt
+@@ -39,5 +39,5 @@
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
+ )
+ 
+-add_test(NAME imageproc_tests COMMAND imageproc_tests --log_level=message)
++#add_test(NAME imageproc_tests COMMAND imageproc_tests --log_level=message)
+ 

diff --git a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16.ebuild 
b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16.ebuild
new file mode 100644
index 000..13b68abef36
--- /dev/null
+++ b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}-tests.patch )
+
+src_test() {
+   cd "${CMAKE_BUILD_DIR}" || die
+   virtx cmake-utils_src_test
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   newicon resources/appicon.svg ${PN}.svg
+   make_desktop_entry ${PN} "Scan Tailor Advanced"
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/scantailor-advanced/

2018-04-10 Thread Andreas Sturmlechner 
commit: a2a14a428e8a06e1118bc591df4ce90edd46267c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr 10 11:47:57 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr 10 11:47:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2a14a42

media-gfx/scantailor-advanced: Fix blocker

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild 
b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild
index 42307b19fa0..902fbb1a391 100644
--- a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild
+++ b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
dev-libs/boost
dev-qt/linguist-tools:5
-   !media-gfx/scantailor:4
+   !media-gfx/scantailor
 "
 
 PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )

[gentoo-commits] repo/gentoo:master commit in: media-gfx/scantailor-advanced/files/, media-gfx/scantailor-advanced/

2018-04-10 Thread Andreas Sturmlechner 
commit: e1ccf755ecf9f36b554198e5bc6c5316b90d1279
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr 10 10:46:05 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr 10 11:42:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ccf755

media-gfx/scantailor-advanced: New package (scantailor fork)

This bump is switching to scantailor-advanced, as the original
project is nowhere near a Qt5-port, and stalled at this point.

See also: https://github.com/scantailor/scantailor/issues/121

Bug: https://bugs.gentoo.org/644398
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 media-gfx/scantailor-advanced/Manifest |   1 +
 .../files/scantailor-advanced-1.0.14-qt-5.11.patch | 182 +
 media-gfx/scantailor-advanced/metadata.xml |  11 ++
 .../scantailor-advanced-1.0.14.ebuild  |  48 ++
 4 files changed, 242 insertions(+)

diff --git a/media-gfx/scantailor-advanced/Manifest 
b/media-gfx/scantailor-advanced/Manifest
new file mode 100644
index 000..acf584a8247
--- /dev/null
+++ b/media-gfx/scantailor-advanced/Manifest
@@ -0,0 +1 @@
+DIST scantailor-advanced-1.0.14.tar.gz 926267 BLAKE2B 
2d901afebf3d9b405365ba71868f7aa29c23c537af72679a89a29351557a1a12692223b961dfd0ced3ea540c45f90dde8ea13bcd1667aa355e90a1c24a21e932
 SHA512 
113723b8a62da1b7141e03b5ad8ac7c426a2943f882cd229c9c51d10de75ee85d019ac21fc2d9eb4cc0d5bfb9ce66a4c41cf523698adc5a9a5d99da02369baf7

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
new file mode 100644
index 000..6443809c102
--- /dev/null
+++ 
b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.14-qt-5.11.patch
@@ -0,0 +1,182 @@
+From 64a151a3795013f58880d2a5f4ce4688ecb88838 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+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 
+-#include 
+-#include 
+ #include "ui_DefaultParamsDialog.h"
+ #include "OrthogonalRotation.h"
+ #include "DefaultParamsProfileManager.h"
+ #include "DefaultParams.h"
+ 
++#include 
++#include 
++
++#include 
++#include 
++
+ 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 
++#include 
++
+ 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 
+ #include 
++
+ #include 
+ 
+ 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 
+ #include 
++
+ #include 
+ #include 
+ 
+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 
+ #include 
++
+ #include 
+ 
+ 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 
+ #include 
+ #include 
++
+ #include 
+