1 |
commit: 3d680c6ca69cc2acd7a4578c64087d6a93372ee9 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 30 19:59:49 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 1 07:36:43 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d680c6c |
7 |
|
8 |
kde-misc/skanlite: Drop 2.1.0.1-r1 |
9 |
|
10 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
kde-misc/skanlite/Manifest | 1 - |
14 |
.../skanlite/files/skanlite-2.1.0.1-cmake.patch | 97 ---------------------- |
15 |
.../skanlite/files/skanlite-2.1.0.1-hidpi.patch | 67 --------------- |
16 |
kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild | 40 --------- |
17 |
4 files changed, 205 deletions(-) |
18 |
|
19 |
diff --git a/kde-misc/skanlite/Manifest b/kde-misc/skanlite/Manifest |
20 |
index 5a47c9ad8d2..19b40567aff 100644 |
21 |
--- a/kde-misc/skanlite/Manifest |
22 |
+++ b/kde-misc/skanlite/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST skanlite-2.1.0.1.tar.xz 2151312 BLAKE2B c03ace256fd4159e36c7eb871f4f88a11142e36e427120560a09a0d0516f91450d350d4ae5db2004da6493d3a2a0aaaf5d45b4a688f3943cf92b76a71fb5f937 SHA512 8eb1a32994259010d4a134c1b25b74b8cc03ba4fa6ce70ee2026a3070c675c2b11f38770453d197008fbe12df976cc653362eb44d6ef89a7f0173c3a2cef3658 |
25 |
DIST skanlite-2.2.0.tar.xz 2415104 BLAKE2B 4ae5d909cdfdf55a552c11346ac689190aa67fd960e2af98ccc02cbf834ec6668e2926a5ab8a07ff6c4a4ef375dc1979250686c5ba05f1a94be4c59026f44f1a SHA512 cbf4c85894c742f025147950f1586252b92e0b3ad9f51b917649c449d46387a4673141e7645cd7f0b005b4c50dd671f2217d35e64ac84e97afa7a6562a961b20 |
26 |
|
27 |
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 |
28 |
deleted file mode 100644 |
29 |
index 7b7daae11ea..00000000000 |
30 |
--- a/kde-misc/skanlite/files/skanlite-2.1.0.1-cmake.patch |
31 |
+++ /dev/null |
32 |
@@ -1,97 +0,0 @@ |
33 |
-From 7c155671b5ea1a7ed1244510e79e094fc6f8ff4e Mon Sep 17 00:00:00 2001 |
34 |
-From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
35 |
-Date: Mon, 2 Apr 2018 21:27:52 +0200 |
36 |
-Subject: [PATCH] Cleanup CMakeLists.txt |
37 |
- |
38 |
-Summary: |
39 |
-Cleanup duplicate find Qt5 and move all below #Dependencies block. |
40 |
-Sort dependencies. |
41 |
-KF5Sane is not an actual framework, so separate it from KF5 modules. |
42 |
- |
43 |
-Make use of FeatureSummary |
44 |
- |
45 |
-Reviewers: sars |
46 |
- |
47 |
-Reviewed By: sars |
48 |
- |
49 |
-Subscribers: ltoscano |
50 |
- |
51 |
-Differential Revision: https://phabricator.kde.org/D11861 |
52 |
---- |
53 |
- CMakeLists.txt | 32 +++++++++++++++----------------- |
54 |
- 1 file changed, 15 insertions(+), 17 deletions(-) |
55 |
- |
56 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
57 |
-index 2c23351..6b326df 100644 |
58 |
---- a/CMakeLists.txt |
59 |
-+++ b/CMakeLists.txt |
60 |
-@@ -17,44 +17,40 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) |
61 |
- include(KDECMakeSettings) |
62 |
- include(GenerateExportHeader) |
63 |
- |
64 |
--find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets) |
65 |
-- |
66 |
- # be not so strict with the poor developer who just wants to use strings |
67 |
- remove_definitions(-DQT_NO_URL_CAST_FROM_STRING) |
68 |
- remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) |
69 |
- |
70 |
--set(KF5_VERSION "5.1.0") |
71 |
-+set(REQUIRED_QT_VERSION "5.2.0") |
72 |
-+set(KF5_MIN_VERSION "5.1.0") |
73 |
- |
74 |
- ecm_setup_version( |
75 |
-- ${KF5_VERSION} |
76 |
-+ ${KF5_MIN_VERSION} |
77 |
- VARIABLE_PREFIX SKANLITE |
78 |
- VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/skanlite_version.h" |
79 |
- PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/src/version.h.cmake" |
80 |
- ) |
81 |
- |
82 |
-+set(SKANLITE_VERSION_STRING "2.1.0.1") |
83 |
-+ |
84 |
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h) |
85 |
-+ |
86 |
- # Dependencies |
87 |
--set(REQUIRED_QT_VERSION "5.2.0") |
88 |
-+find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets) |
89 |
- |
90 |
--# Required Qt5 components to build this framework |
91 |
--find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core) |
92 |
- find_package(PNG REQUIRED) |
93 |
-- |
94 |
- include_directories(${PNG_INCLUDE_DIRS}) |
95 |
- |
96 |
--set(SKANLITE_VERSION_STRING "2.1.0.1") |
97 |
-- |
98 |
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h) |
99 |
-- |
100 |
--find_package(KF5 ${KF5_VERSION} REQUIRED |
101 |
-- COMPONENTS # alias to find_package(KFGuiAddons ${KF5_VERSION} REQUIRED) |
102 |
-+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS |
103 |
- CoreAddons # KAboutData |
104 |
-+ DocTools # yields kdoctools_create_handbook |
105 |
- I18n |
106 |
-- XmlGui # KAboutApplicationDialog |
107 |
- KIO # contains the KIOWidgets which we use in target_link_libraries |
108 |
-- DocTools # yields kdoctools_create_handbook |
109 |
-- Sane # will find KF5Sane |
110 |
-+ XmlGui # KAboutApplicationDialog |
111 |
- ) |
112 |
- |
113 |
-+find_package(KF5Sane ${KF5_MIN_VERSION} REQUIRED) |
114 |
-+ |
115 |
- add_definitions(-DQT_NO_URL_CAST_FROM_STRING) |
116 |
- |
117 |
- # Subdirectories |
118 |
-@@ -62,6 +58,8 @@ add_subdirectory(src) |
119 |
- add_subdirectory(doc) |
120 |
- add_subdirectory(autotests) |
121 |
- add_subdirectory(tests) |
122 |
-+ |
123 |
-+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) |
124 |
- |
125 |
- find_package(KF5I18n CONFIG REQUIRED) |
126 |
- ki18n_install(po) |
127 |
--- |
128 |
-2.16.3 |
129 |
- |
130 |
|
131 |
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 |
132 |
deleted file mode 100644 |
133 |
index 563f5950063..00000000000 |
134 |
--- a/kde-misc/skanlite/files/skanlite-2.1.0.1-hidpi.patch |
135 |
+++ /dev/null |
136 |
@@ -1,67 +0,0 @@ |
137 |
-From cb382f87d63bdc3736696ee289875bde2ecee9e5 Mon Sep 17 00:00:00 2001 |
138 |
-From: Alexander Volkov <a.volkov@×××××××××.ru> |
139 |
-Date: Thu, 25 Apr 2019 18:09:59 +0300 |
140 |
-Subject: Add HiDPI support |
141 |
- |
142 |
-Reviewers: sars, davidedmundson, ngraham |
143 |
- |
144 |
-Reviewed By: sars |
145 |
- |
146 |
-Differential Revision: https://phabricator.kde.org/D20821 |
147 |
---- |
148 |
- src/ImageViewer.cpp | 14 +++++++++++--- |
149 |
- src/main.cpp | 1 + |
150 |
- 2 files changed, 12 insertions(+), 3 deletions(-) |
151 |
- |
152 |
-diff --git a/src/ImageViewer.cpp b/src/ImageViewer.cpp |
153 |
-index 09f9b3d..5cf1439 100644 |
154 |
---- a/src/ImageViewer.cpp |
155 |
-+++ b/src/ImageViewer.cpp |
156 |
-@@ -87,14 +87,19 @@ void ImageViewer::setQImage(QImage *img) |
157 |
- } |
158 |
- |
159 |
- d->img = img; |
160 |
-- d->scene->setSceneRect(0, 0, img->width(), img->height()); |
161 |
-+ const auto dpr = devicePixelRatioF(); |
162 |
-+ d->img->setDevicePixelRatio(dpr); |
163 |
-+ d->scene->setSceneRect(0, 0, img->width() / dpr, img->height() / dpr); |
164 |
- } |
165 |
- |
166 |
- // ------------------------------------------------------------------------ |
167 |
- void ImageViewer::drawBackground(QPainter *painter, const QRectF &rect) |
168 |
- { |
169 |
- painter->fillRect(rect, QColor(0x70, 0x70, 0x70)); |
170 |
-- painter->drawImage(rect, *d->img, rect); |
171 |
-+ QRectF r = rect & sceneRect(); |
172 |
-+ const auto dpr = d->img->devicePixelRatio(); |
173 |
-+ QRectF srcRect = QRectF(r.topLeft() * dpr, r.size() * dpr); |
174 |
-+ painter->drawImage(r, *d->img, srcRect); |
175 |
- } |
176 |
- |
177 |
- // ------------------------------------------------------------------------ |
178 |
-@@ -118,7 +123,10 @@ void ImageViewer::zoomActualSize() |
179 |
- // ------------------------------------------------------------------------ |
180 |
- void ImageViewer::zoom2Fit() |
181 |
- { |
182 |
-- fitInView(d->img->rect(), Qt::KeepAspectRatio); |
183 |
-+ QRectF r = d->img->rect(); |
184 |
-+ const auto dpr = d->img->devicePixelRatio(); |
185 |
-+ r = QRectF(r.topLeft() / dpr, r.size() / dpr); |
186 |
-+ fitInView(r, Qt::KeepAspectRatio); |
187 |
- } |
188 |
- |
189 |
- // ------------------------------------------------------------------------ |
190 |
-diff --git a/src/main.cpp b/src/main.cpp |
191 |
-index aa704be..ae0d9b6 100644 |
192 |
---- a/src/main.cpp |
193 |
-+++ b/src/main.cpp |
194 |
-@@ -34,6 +34,7 @@ |
195 |
- |
196 |
- int main(int argc, char *argv[]) |
197 |
- { |
198 |
-+ QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); |
199 |
- QApplication app(argc, argv); |
200 |
- |
201 |
- Kdelibs4ConfigMigrator migrate(QLatin1String("Skanlite")); |
202 |
--- |
203 |
-cgit v1.1 |
204 |
|
205 |
diff --git a/kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild b/kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild |
206 |
deleted file mode 100644 |
207 |
index 1a7a7c968a1..00000000000 |
208 |
--- a/kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild |
209 |
+++ /dev/null |
210 |
@@ -1,40 +0,0 @@ |
211 |
-# Copyright 1999-2019 Gentoo Authors |
212 |
-# Distributed under the terms of the GNU General Public License v2 |
213 |
- |
214 |
-EAPI=7 |
215 |
- |
216 |
-ECM_HANDBOOK="forceoptional" |
217 |
-ECM_TEST="forceoptional" |
218 |
-KFMIN=5.60.0 |
219 |
-QTMIN=5.12.3 |
220 |
-inherit ecm kde.org |
221 |
- |
222 |
-DESCRIPTION="Simple image scanning application based on libksane and KDE Frameworks" |
223 |
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.skanlite" |
224 |
-SRC_URI="mirror://kde/stable/${PN}/2.1/${P}.tar.xz" |
225 |
- |
226 |
-LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )" |
227 |
-SLOT="5" |
228 |
-KEYWORDS="amd64 x86" |
229 |
-IUSE="" |
230 |
- |
231 |
-DEPEND=" |
232 |
- >=dev-qt/qtgui-${QTMIN}:5 |
233 |
- >=dev-qt/qtwidgets-${QTMIN}:5 |
234 |
- >=kde-apps/libksane-19.04.0:5 |
235 |
- >=kde-frameworks/kconfig-${KFMIN}:5 |
236 |
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
237 |
- >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
238 |
- >=kde-frameworks/ki18n-${KFMIN}:5 |
239 |
- >=kde-frameworks/kio-${KFMIN}:5 |
240 |
- >=kde-frameworks/kjobwidgets-${KFMIN}:5 |
241 |
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
242 |
- >=kde-frameworks/kxmlgui-${KFMIN}:5 |
243 |
- media-libs/libpng:0= |
244 |
-" |
245 |
-RDEPEND="${DEPEND}" |
246 |
- |
247 |
-PATCHES=( |
248 |
- "${FILESDIR}/${P}-cmake.patch" |
249 |
- "${FILESDIR}/${P}-hidpi.patch" |
250 |
-) |