summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-04-10 12:46:05 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-04-10 13:42:43 +0200
commite1ccf755ecf9f36b554198e5bc6c5316b90d1279 (patch)
tree083765fc193786a6c0e42a4f8ad5ddb8d755e8d0
parentprofiles: Remove obsolete libguess package.mask (diff)
downloadgentoo-e1ccf755ecf9f36b554198e5bc6c5316b90d1279.tar.gz
gentoo-e1ccf755ecf9f36b554198e5bc6c5316b90d1279.tar.bz2
gentoo-e1ccf755ecf9f36b554198e5bc6c5316b90d1279.zip
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
-rw-r--r--media-gfx/scantailor-advanced/Manifest1
-rw-r--r--media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.14-qt-5.11.patch182
-rw-r--r--media-gfx/scantailor-advanced/metadata.xml11
-rw-r--r--media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild48
4 files changed, 242 insertions, 0 deletions
diff --git a/media-gfx/scantailor-advanced/Manifest b/media-gfx/scantailor-advanced/Manifest
new file mode 100644
index 00000000000..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 00000000000..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 <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/metadata.xml b/media-gfx/scantailor-advanced/metadata.xml
new file mode 100644
index 00000000000..ac1f5ba3f48
--- /dev/null
+++ b/media-gfx/scantailor-advanced/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">4lex4/scantailor-advanced</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild
new file mode 100644
index 00000000000..42307b19fa0
--- /dev/null
+++ b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild
@@ -0,0 +1,48 @@
+# 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:4
+"
+
+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"
+}