Hello community, here is the log from the commit of package skanlite for openSUSE:Factory checked in at 2020-07-17 20:46:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skanlite (Old) and /work/SRC/openSUSE:Factory/.skanlite.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skanlite" Fri Jul 17 20:46:31 2020 rev:43 rq:821095 version:2.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/skanlite/skanlite.changes 2018-04-06 17:42:04.595681742 +0200 +++ /work/SRC/openSUSE:Factory/.skanlite.new.3592/skanlite.changes 2020-07-17 20:47:08.632686526 +0200 @@ -1,0 +2,13 @@ +Wed Jul 15 09:24:50 UTC 2020 - [email protected] + +- Update to version 2.2.0: + * Saving is moved to a thread to not freeze the interface while + saving + * D-Bus interface for hotkeys and controlling scanning + * Bug fixes +- Add Fix-compilation-with-Qt-before-5.14.patch to fix build on + Leap 15.2 +- Switch Qt5/KF5 BuildRequires to cmake() notation +- Run spec-cleaner + +------------------------------------------------------------------- @@ -187 +200 @@ -Tue Mar 31 20:41:06 CET 2009 - [email protected] +Tue Mar 31 20:41:06 CEST 2009 - [email protected] Old: ---- skanlite-2.1.0.1.tar.xz New: ---- Fix-compilation-with-Qt-before-5.14.patch skanlite-2.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skanlite.spec ++++++ --- /var/tmp/diff_new_pack.WJKJ3F/_old 2020-07-17 20:47:12.260690392 +0200 +++ /var/tmp/diff_new_pack.WJKJ3F/_new 2020-07-17 20:47:12.264690396 +0200 @@ -1,7 +1,7 @@ # # spec file for package skanlite # -# 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,32 +12,33 @@ # 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/ # Name: skanlite -Version: 2.1.0.1 +Version: 2.2.0 Release: 0 Summary: Image Scanner Application -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Hardware/Scanner -Url: https://www.kde.org/applications/graphics/skanlite/ -Source0: http://download.kde.org/stable/%{name}/2.1/%{name}-%{version}.tar.xz +URL: https://www.kde.org/applications/graphics/skanlite/ +Source0: http://download.kde.org/stable/%{name}/2.2/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: Fix-compilation-with-Qt-before-5.14.patch BuildRequires: extra-cmake-modules -BuildRequires: kcoreaddons-devel -BuildRequires: kdoctools-devel -BuildRequires: ki18n-devel -BuildRequires: kio-devel -BuildRequires: kxmlgui-devel -BuildRequires: libksane-devel BuildRequires: libpng-devel -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Test) -BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5Sane) >= 5.55.0 +BuildRequires: cmake(KF5XmlGui) +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5Test) +BuildRequires: cmake(Qt5Widgets) Recommends: %{name}-lang = %{version} Obsoletes: %{name}-doc < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Skanlite is an image scanner application by KDE. @@ -46,6 +47,7 @@ %prep %setup -q +%autopatch -p1 %build %cmake_kf5 -d build @@ -58,7 +60,6 @@ chmod 644 %{buildroot}%{_kf5_applicationsdir}/org.kde.skanlite.desktop %files -%defattr(-,root,root,-) %license src/COPYING %doc src/TODO %{_kf5_applicationsdir}/org.kde.skanlite.desktop @@ -68,7 +69,6 @@ %doc %{_kf5_htmldir}/en/ %files lang -f %{name}.lang -%defattr(-,root,root) %doc %{_kf5_htmldir} %exclude %{_kf5_htmldir}/en/ ++++++ Fix-compilation-with-Qt-before-5.14.patch ++++++ >From b110846fadeb4f8fab48e0f488a335de7e16a7be Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer <[email protected]> Date: Wed, 15 Jul 2020 09:11:43 +0000 Subject: [PATCH] Fix compilation with Qt before 5.14 This line has been forgotten to be changed in commit 823abcd2, resulting in a compiler error when e.g. building with Qt 5.12 LTS. --- src/SaveLocation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SaveLocation.cpp b/src/SaveLocation.cpp index 9709d49..d210be8 100644 --- a/src/SaveLocation.cpp +++ b/src/SaveLocation.cpp @@ -42,7 +42,7 @@ SaveLocation::SaveLocation(QWidget *parent) connect(m_ui->u_urlRequester, &KUrlRequester::textChanged, this, &SaveLocation::updateGui); connect(m_ui->u_imgPrefix, &QLineEdit::textChanged, this, &SaveLocation::updateGui); #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - connect(u_imgFormat, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::activated), this, &SaveLocation::updateGui); + connect(m_ui->u_imgFormat, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::activated), this, &SaveLocation::updateGui); #else connect(m_ui->u_imgFormat, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::textActivated), this, &SaveLocation::updateGui); #endif -- GitLab ++++++ skanlite-2.1.0.1.tar.xz -> skanlite-2.2.0.tar.xz ++++++ ++++ 25400 lines of diff (skipped)
