gentoo resync : 25.08.2020

4 files changed, 4 insertions, 175 deletions

diff --git a/kde-misc/skanlite/Manifest b/kde-misc/skanlite/Manifest
index e5a9e1338403..22c8e7d8d38b 100644
--- a/kde-misc/skanlite/Manifest
+++ b/kde-misc/skanlite/Manifest
@@ -1,5 +1,3 @@
-AUX skanlite-2.1.0.1-cmake.patch 2978 BLAKE2B 68d39415f4199b018028b16727f734117a7499be83904e80b9aeb2837a835141363516e0b452d81ddaab8b874de75e869168c9215babb3230c9a02a33b7f33e7 SHA512 7a7ee0f6b7b82a2b8e90ac58d632c92eb7c0992195f104ed794d14c451a21fefb7a3621bc22c14948b83b8e9aa86d9868ebd97d780a8d31f01186485d507d3ce
-AUX skanlite-2.1.0.1-hidpi.patch 2234 BLAKE2B c2867f5d6251b2258097e1682e2cc8a8263631000f32701802940d84d63e657d12a45b326932d3bb087c571928b08529d2e050cf5298addcb9749d38337a3635 SHA512 d5c559a8d057acce73db1252d52299a72788554845dd0a00fb000c15b7d0a4ba8d20f72a24dddd032c2cb8cf84ff6bef9b2d365cbb70e98f7003523d479e9e92
-DIST skanlite-2.1.0.1.tar.xz 2151312 BLAKE2B c03ace256fd4159e36c7eb871f4f88a11142e36e427120560a09a0d0516f91450d350d4ae5db2004da6493d3a2a0aaaf5d45b4a688f3943cf92b76a71fb5f937 SHA512 8eb1a32994259010d4a134c1b25b74b8cc03ba4fa6ce70ee2026a3070c675c2b11f38770453d197008fbe12df976cc653362eb44d6ef89a7f0173c3a2cef3658
-EBUILD skanlite-2.1.0.1-r1.ebuild 1040 BLAKE2B 68f0e4f91e43a3e5b2acd4b9c7d809fcce8d8136fd1cd1ede94f36943b21da2d0339efd6775c4d2cc4b96e2a80f23b8d1511bb2614c2178adb28eb5976dc39e4 SHA512 0066e2f8de64404fac44075e2a9c67d4c77e24f62b2d39039ae42de5cfe310041d1edd8f7c3c5cb1cb3143b91edcef27a6884c2fadefa9612cec7b83c1cf3748
+DIST skanlite-2.2.0.tar.xz 2415104 BLAKE2B 4ae5d909cdfdf55a552c11346ac689190aa67fd960e2af98ccc02cbf834ec6668e2926a5ab8a07ff6c4a4ef375dc1979250686c5ba05f1a94be4c59026f44f1a SHA512 cbf4c85894c742f025147950f1586252b92e0b3ad9f51b917649c449d46387a4673141e7645cd7f0b005b4c50dd671f2217d35e64ac84e97afa7a6562a961b20
+EBUILD skanlite-2.2.0.ebuild 963 BLAKE2B ed5ce6f331c0919afb9885e92ec305bdefc1adc7f9d54ee6c70fdb38a283447797f628392786f8e1de286dd56e28e1764fcc4fab1f34be7d12c7503c163fe99c SHA512 081d96ae41052eb8b8755eebb6c3cf6e34fb629a83de74f4dedea41e94d90de63347058760616a1d25859286881aa5c757f0ad7d93875f3646c65a93a303e14e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/skanlite/files/skanlite-2.1.0.1-cmake.patch b/kde-misc/skanlite/files/skanlite-2.1.0.1-cmake.patch
deleted file mode 100644
index 7b7daae11eac..000000000000
--- a/kde-misc/skanlite/files/skanlite-2.1.0.1-cmake.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 7c155671b5ea1a7ed1244510e79e094fc6f8ff4e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Mon, 2 Apr 2018 21:27:52 +0200
-Subject: [PATCH] Cleanup CMakeLists.txt
-
-Summary:
-Cleanup duplicate find Qt5 and move all below #Dependencies block.
-Sort dependencies.
-KF5Sane is not an actual framework, so separate it from KF5 modules.
-
-Make use of FeatureSummary
-
-Reviewers: sars
-
-Reviewed By: sars
-
-Subscribers: ltoscano
-
-Differential Revision: https://phabricator.kde.org/D11861
----
- CMakeLists.txt | 32 +++++++++++++++-----------------
- 1 file changed, 15 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2c23351..6b326df 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -17,44 +17,40 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
- include(KDECMakeSettings)
- include(GenerateExportHeader)
- 
--find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets)
--
- # be not so strict with the poor developer who just wants to use strings
- remove_definitions(-DQT_NO_URL_CAST_FROM_STRING)
- remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
- 
--set(KF5_VERSION "5.1.0")
-+set(REQUIRED_QT_VERSION "5.2.0")
-+set(KF5_MIN_VERSION "5.1.0")
- 
- ecm_setup_version(
--  ${KF5_VERSION}
-+  ${KF5_MIN_VERSION}
-   VARIABLE_PREFIX SKANLITE
-   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/skanlite_version.h"
-   PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/src/version.h.cmake"
- )
- 
-+set(SKANLITE_VERSION_STRING "2.1.0.1")
-+
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h)
-+
- # Dependencies
--set(REQUIRED_QT_VERSION "5.2.0")
-+find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets)
- 
--# Required Qt5 components to build this framework
--find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core)
- find_package(PNG REQUIRED)
--
- include_directories(${PNG_INCLUDE_DIRS})
- 
--set(SKANLITE_VERSION_STRING "2.1.0.1")
--
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h)
--
--find_package(KF5 ${KF5_VERSION} REQUIRED
--    COMPONENTS # alias to find_package(KFGuiAddons ${KF5_VERSION} REQUIRED)
-+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-         CoreAddons # KAboutData
-+        DocTools # yields kdoctools_create_handbook
-         I18n
--        XmlGui # KAboutApplicationDialog
-         KIO # contains the KIOWidgets which we use in target_link_libraries
--        DocTools # yields kdoctools_create_handbook
--        Sane # will find KF5Sane
-+        XmlGui # KAboutApplicationDialog
- )
- 
-+find_package(KF5Sane ${KF5_MIN_VERSION} REQUIRED)
-+
- add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
- 
- # Subdirectories
-@@ -62,6 +58,8 @@ add_subdirectory(src)
- add_subdirectory(doc)
- add_subdirectory(autotests)
- add_subdirectory(tests)
-+
-+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
- 
- find_package(KF5I18n CONFIG REQUIRED)
- ki18n_install(po)
--- 
-2.16.3
-
diff --git a/kde-misc/skanlite/files/skanlite-2.1.0.1-hidpi.patch b/kde-misc/skanlite/files/skanlite-2.1.0.1-hidpi.patch
deleted file mode 100644
index 563f5950063a..000000000000
--- a/kde-misc/skanlite/files/skanlite-2.1.0.1-hidpi.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From cb382f87d63bdc3736696ee289875bde2ecee9e5 Mon Sep 17 00:00:00 2001
-From: Alexander Volkov <a.volkov@rusbitech.ru>
-Date: Thu, 25 Apr 2019 18:09:59 +0300
-Subject: Add HiDPI support
-
-Reviewers: sars, davidedmundson, ngraham
-
-Reviewed By: sars
-
-Differential Revision: https://phabricator.kde.org/D20821
----
- src/ImageViewer.cpp | 14 +++++++++++---
- src/main.cpp        |  1 +
- 2 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/src/ImageViewer.cpp b/src/ImageViewer.cpp
-index 09f9b3d..5cf1439 100644
---- a/src/ImageViewer.cpp
-+++ b/src/ImageViewer.cpp
-@@ -87,14 +87,19 @@ void ImageViewer::setQImage(QImage *img)
-     }
- 
-     d->img = img;
--    d->scene->setSceneRect(0, 0, img->width(), img->height());
-+    const auto dpr = devicePixelRatioF();
-+    d->img->setDevicePixelRatio(dpr);
-+    d->scene->setSceneRect(0, 0, img->width() / dpr, img->height() / dpr);
- }
- 
- // ------------------------------------------------------------------------
- void ImageViewer::drawBackground(QPainter *painter, const QRectF &rect)
- {
-     painter->fillRect(rect, QColor(0x70, 0x70, 0x70));
--    painter->drawImage(rect, *d->img, rect);
-+    QRectF r = rect & sceneRect();
-+    const auto dpr = d->img->devicePixelRatio();
-+    QRectF srcRect = QRectF(r.topLeft() * dpr, r.size() * dpr);
-+    painter->drawImage(r, *d->img, srcRect);
- }
- 
- // ------------------------------------------------------------------------
-@@ -118,7 +123,10 @@ void ImageViewer::zoomActualSize()
- // ------------------------------------------------------------------------
- void ImageViewer::zoom2Fit()
- {
--    fitInView(d->img->rect(), Qt::KeepAspectRatio);
-+    QRectF r = d->img->rect();
-+    const auto dpr = d->img->devicePixelRatio();
-+    r = QRectF(r.topLeft() / dpr, r.size() / dpr);
-+    fitInView(r, Qt::KeepAspectRatio);
- }
- 
- // ------------------------------------------------------------------------
-diff --git a/src/main.cpp b/src/main.cpp
-index aa704be..ae0d9b6 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -34,6 +34,7 @@
- 
- int main(int argc, char *argv[])
- {
-+    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-     QApplication app(argc, argv);
- 
-     Kdelibs4ConfigMigrator migrate(QLatin1String("Skanlite"));
--- 
-cgit v1.1
diff --git a/kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild b/kde-misc/skanlite/skanlite-2.2.0.ebuild
index 1a7a7c968a19..a79b4e6c1ead 100644
--- a/kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild
+++ b/kde-misc/skanlite/skanlite-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Simple image scanning application based on libksane and KDE Frameworks"
 HOMEPAGE="https://kde.org/applications/graphics/org.kde.skanlite"
-SRC_URI="mirror://kde/stable/${PN}/2.1/${P}.tar.xz"
+SRC_URI="mirror://kde/stable/${PN}/2.2/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
 SLOT="5"
@@ -33,8 +33,3 @@ DEPEND="
 	media-libs/libpng:0=
 "
 RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-hidpi.patch"
-)