Hello community, here is the log from the commit of package scantailor for openSUSE:Factory checked in at 2020-06-05 20:21:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scantailor (Old) and /work/SRC/openSUSE:Factory/.scantailor.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scantailor" Fri Jun 5 20:21:16 2020 rev:9 rq:811661 version:1.0.16 Changes: -------- --- /work/SRC/openSUSE:Factory/scantailor/scantailor.changes 2018-09-19 14:29:08.735478396 +0200 +++ /work/SRC/openSUSE:Factory/.scantailor.new.3606/scantailor.changes 2020-06-05 20:27:40.345068700 +0200 @@ -1,0 +2,7 @@ +Thu Jun 4 20:20:03 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Add upstream patch: + * 0001-Fix-build-with-Qt-5.15-missing-QPainterPath-includes.patch +- Spec cleanup + +------------------------------------------------------------------- New: ---- 0001-Fix-build-with-Qt-5.15-missing-QPainterPath-includes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scantailor.spec ++++++ --- /var/tmp/diff_new_pack.SS6IqX/_old 2020-06-05 20:27:41.993073845 +0200 +++ /var/tmp/diff_new_pack.SS6IqX/_new 2020-06-05 20:27:41.997073858 +0200 @@ -1,7 +1,7 @@ # # spec file for package scantailor # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,9 +22,11 @@ Summary: Interactive post-processing tool for scanned pages License: GPL-3.0-or-later Group: Productivity/Graphics/Other -Url: http://scantailor.sourceforge.net/ +URL: http://scantailor.sourceforge.net/ Source0: https://github.com/4lex4/%{name}-advanced/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}-icons.tar.bz2 +# PATCH-FIX-UPSTREAM +Patch0: 0001-Fix-build-with-Qt-5.15-missing-QPainterPath-includes.patch BuildRequires: cmake >= 3.9.0 BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme @@ -44,9 +46,7 @@ %if 0%{?suse_version} >= 1500 BuildRequires: libboost_test-devel >= 1.65.0 %else -BuildRequires: boost-devel => 1.65.0 -Requires(post): hicolor-icon-theme -Requires(postun): hicolor-icon-theme +BuildRequires: boost-devel >= 1.65.0 %endif %description @@ -58,10 +58,11 @@ %prep %setup -q -a 1 -n %{name}-advanced-%{version} cp -p resources/icons/{COPYING,COPYING.icons} +%patch0 -p1 %build -%cmake .. -make %{?_smp_mflags} VERBOSE=1 +%cmake +%cmake_build %install %cmake_install @@ -89,15 +90,6 @@ EOF %suse_update_desktop_file -i %{name} -%if 0%{?suse_version} < 1500 - -%post -%icon_theme_cache_post - -%postun -%icon_theme_cache_postun -%endif - %files %license LICENSE resources/icons/COPYING.icons %{_bindir}/%{name} ++++++ 0001-Fix-build-with-Qt-5.15-missing-QPainterPath-includes.patch ++++++ >From c22c5a86f8ae88272c8443de8728c423837907b2 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Sun, 31 May 2020 00:52:14 +0200 Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath includes) Thanks-to: Petr Zima <[email protected]> --- ImageViewBase.cpp | 2 ++ filters/output/OutputGenerator.cpp | 3 ++- filters/page_layout/ImageView.cpp | 3 ++- filters/select_content/ContentBoxFinder.cpp | 3 ++- zones/ZoneContextMenuInteraction.cpp | 1 + zones/ZoneDefaultInteraction.cpp | 1 + 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ImageViewBase.cpp b/ImageViewBase.cpp index 6863f13..bdfebd4 100644 --- a/ImageViewBase.cpp +++ b/ImageViewBase.cpp @@ -21,6 +21,8 @@ #include <QGLWidget> #include <QMouseEvent> #include <QPaintEngine> +#include <QPainter> +#include <QPainterPath> #include <QPointer> #include <QScrollBar> #include <QSettings> diff --git a/filters/output/OutputGenerator.cpp b/filters/output/OutputGenerator.cpp index 91c43dc..ca5f1ae 100644 --- a/filters/output/OutputGenerator.cpp +++ b/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& image, const QColor& backgr posterizationOptions.isForceBlackAndWhite(), 0, qRound(background_color.lightnessF() * 255)) .getImage(); } -} // namespace output \ No newline at end of file +} // namespace output diff --git a/filters/page_layout/ImageView.cpp b/filters/page_layout/ImageView.cpp index eb1f78f..d060d77 100644 --- a/filters/page_layout/ImageView.cpp +++ b/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 state) { 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/filters/select_content/ContentBoxFinder.cpp b/filters/select_content/ContentBoxFinder.cpp index 7c0d62e..d8f24e7 100644 --- a/filters/select_content/ContentBoxFinder.cpp +++ b/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/zones/ZoneContextMenuInteraction.cpp b/zones/ZoneContextMenuInteraction.cpp index 0cfbb28..0bedb41 100644 --- a/zones/ZoneContextMenuInteraction.cpp +++ b/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/zones/ZoneDefaultInteraction.cpp b/zones/ZoneDefaultInteraction.cpp index f1f3eb8..5fd1aa9 100644 --- a/zones/ZoneDefaultInteraction.cpp +++ b/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" -- 2.26.2
