1 |
commit: e9e00e80e356314a68de6fc555730d38c3392a5b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 16 22:25:42 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 17 00:36:04 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9e00e80 |
7 |
|
8 |
kde-apps/gwenview: Drop unused patch |
9 |
|
10 |
Package-Manager: Portage-2.3.56, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
.../files/gwenview-18.12.0-exiv2-0.27.patch | 216 --------------------- |
14 |
1 file changed, 216 deletions(-) |
15 |
|
16 |
diff --git a/kde-apps/gwenview/files/gwenview-18.12.0-exiv2-0.27.patch b/kde-apps/gwenview/files/gwenview-18.12.0-exiv2-0.27.patch |
17 |
deleted file mode 100644 |
18 |
index fa0d62d84b7..00000000000 |
19 |
--- a/kde-apps/gwenview/files/gwenview-18.12.0-exiv2-0.27.patch |
20 |
+++ /dev/null |
21 |
@@ -1,216 +0,0 @@ |
22 |
-From 7e4cd5e91d7434448b7227ee8cf3307435cc7d00 Mon Sep 17 00:00:00 2001 |
23 |
-From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
24 |
-Date: Sun, 30 Dec 2018 12:59:05 +0100 |
25 |
-Subject: [PATCH 1/2] Include exiv2.hpp instead of individual headers |
26 |
- |
27 |
-Headers are subject to refactoring upstream, using exiv2.hpp per recommendation. |
28 |
---- |
29 |
- lib/cms/cmsprofile.h | 2 +- |
30 |
- lib/document/document.h | 2 +- |
31 |
- lib/exiv2imageloader.cpp | 4 ---- |
32 |
- lib/exiv2imageloader.h | 2 +- |
33 |
- lib/imagemetainfomodel.cpp | 4 +--- |
34 |
- lib/jpegcontent.cpp | 4 ---- |
35 |
- lib/timeutils.cpp | 4 ---- |
36 |
- tests/auto/documenttest.cpp | 2 -- |
37 |
- tests/auto/imagemetainfomodeltest.cpp | 2 -- |
38 |
- 9 files changed, 4 insertions(+), 22 deletions(-) |
39 |
- |
40 |
-diff --git a/lib/cms/cmsprofile.h b/lib/cms/cmsprofile.h |
41 |
-index a2a38a87..bc378ff9 100644 |
42 |
---- a/lib/cms/cmsprofile.h |
43 |
-+++ b/lib/cms/cmsprofile.h |
44 |
-@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA |
45 |
- #include <QSharedData> |
46 |
- |
47 |
- // Exiv2 |
48 |
--#include <exiv2/image.hpp> |
49 |
-+#include <exiv2/exiv2.hpp> |
50 |
- |
51 |
- class QByteArray; |
52 |
- class QString; |
53 |
-diff --git a/lib/document/document.h b/lib/document/document.h |
54 |
-index c0bb454b..8e32c044 100644 |
55 |
---- a/lib/document/document.h |
56 |
-+++ b/lib/document/document.h |
57 |
-@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
58 |
- #include <lib/gwenviewlib_export.h> |
59 |
- |
60 |
- #include <string.h> |
61 |
--#include <exiv2/image.hpp> |
62 |
-+#include <exiv2/exiv2.hpp> |
63 |
- |
64 |
- // Qt |
65 |
- #include <QObject> |
66 |
-diff --git a/lib/exiv2imageloader.cpp b/lib/exiv2imageloader.cpp |
67 |
-index f2830f81..f12b7383 100644 |
68 |
---- a/lib/exiv2imageloader.cpp |
69 |
-+++ b/lib/exiv2imageloader.cpp |
70 |
-@@ -28,10 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
71 |
- |
72 |
- // KDE |
73 |
- |
74 |
--// Exiv2 |
75 |
--#include <exiv2/error.hpp> |
76 |
--#include <exiv2/types.hpp> |
77 |
-- |
78 |
- // Local |
79 |
- |
80 |
- namespace Gwenview |
81 |
-diff --git a/lib/exiv2imageloader.h b/lib/exiv2imageloader.h |
82 |
-index 57ef24d2..866e7fac 100644 |
83 |
---- a/lib/exiv2imageloader.h |
84 |
-+++ b/lib/exiv2imageloader.h |
85 |
-@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
86 |
- |
87 |
- // Exiv2 |
88 |
- #include <string.h> |
89 |
--#include <exiv2/image.hpp> |
90 |
-+#include <exiv2/exiv2.hpp> |
91 |
- |
92 |
- // Local |
93 |
- |
94 |
-diff --git a/lib/imagemetainfomodel.cpp b/lib/imagemetainfomodel.cpp |
95 |
-index d7b89ab2..58f1c13d 100644 |
96 |
---- a/lib/imagemetainfomodel.cpp |
97 |
-+++ b/lib/imagemetainfomodel.cpp |
98 |
-@@ -33,9 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
99 |
- #include <KFormat> |
100 |
- |
101 |
- // Exiv2 |
102 |
--#include <exiv2/exif.hpp> |
103 |
--#include <exiv2/image.hpp> |
104 |
--#include <exiv2/iptc.hpp> |
105 |
-+#include <exiv2/exiv2.hpp> |
106 |
- |
107 |
- // Local |
108 |
- #ifdef HAVE_FITS |
109 |
-diff --git a/lib/jpegcontent.cpp b/lib/jpegcontent.cpp |
110 |
-index bb810dd4..a628e8a8 100644 |
111 |
---- a/lib/jpegcontent.cpp |
112 |
-+++ b/lib/jpegcontent.cpp |
113 |
-@@ -41,10 +41,6 @@ extern "C" { |
114 |
- // KDE |
115 |
- #include <KLocalizedString> |
116 |
- |
117 |
--// Exiv2 |
118 |
--#include <exiv2/exif.hpp> |
119 |
--#include <exiv2/image.hpp> |
120 |
-- |
121 |
- // Local |
122 |
- #include "jpegerrormanager.h" |
123 |
- #include "iodevicejpegsourcemanager.h" |
124 |
-diff --git a/lib/timeutils.cpp b/lib/timeutils.cpp |
125 |
-index 9e8836a9..19befff5 100644 |
126 |
---- a/lib/timeutils.cpp |
127 |
-+++ b/lib/timeutils.cpp |
128 |
-@@ -29,10 +29,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA |
129 |
- // KDE |
130 |
- #include <KFileItem> |
131 |
- |
132 |
--// Exiv2 |
133 |
--#include <exiv2/exif.hpp> |
134 |
--#include <exiv2/image.hpp> |
135 |
-- |
136 |
- // Local |
137 |
- #include <lib/exiv2imageloader.h> |
138 |
- #include <lib/urlutils.h> |
139 |
-diff --git a/tests/auto/documenttest.cpp b/tests/auto/documenttest.cpp |
140 |
-index 9373641f..496346f0 100644 |
141 |
---- a/tests/auto/documenttest.cpp |
142 |
-+++ b/tests/auto/documenttest.cpp |
143 |
-@@ -39,8 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
144 |
- #include "../lib/transformimageoperation.h" |
145 |
- #include "testutils.h" |
146 |
- |
147 |
--#include <exiv2/exif.hpp> |
148 |
-- |
149 |
- #include "documenttest.h" |
150 |
- |
151 |
- QTEST_MAIN(DocumentTest) |
152 |
-diff --git a/tests/auto/imagemetainfomodeltest.cpp b/tests/auto/imagemetainfomodeltest.cpp |
153 |
-index e3ec8d30..c4467a73 100644 |
154 |
---- a/tests/auto/imagemetainfomodeltest.cpp |
155 |
-+++ b/tests/auto/imagemetainfomodeltest.cpp |
156 |
-@@ -28,8 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
157 |
- #include "../lib/imagemetainfomodel.h" |
158 |
- #include "testutils.h" |
159 |
- |
160 |
--#include <exiv2/exif.hpp> |
161 |
-- |
162 |
- #include "imagemetainfomodeltest.h" |
163 |
- |
164 |
- QTEST_MAIN(ImageMetaInfoModelTest) |
165 |
--- |
166 |
-2.20.1 |
167 |
- |
168 |
- |
169 |
-From 7d6c5d95cf4e4d7c857f5d659a58f82bdc46259c Mon Sep 17 00:00:00 2001 |
170 |
-From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
171 |
-Date: Sun, 30 Dec 2018 11:31:20 +0100 |
172 |
-Subject: [PATCH 2/2] Fix build with exiv2-0.27 |
173 |
-MIME-Version: 1.0 |
174 |
-Content-Type: text/plain; charset=UTF-8 |
175 |
-Content-Transfer-Encoding: 8bit |
176 |
- |
177 |
-Summary: |
178 |
-Include exiv2.hpp instead of individual headers |
179 |
- |
180 |
-Headers are subject to refactoring upstream, using exiv2.hpp per recommendation. |
181 |
- |
182 |
-Enable exceptions globally - otherwise, lots of the following error: |
183 |
- |
184 |
-In file included from /usr/include/exiv2/types.hpp:34, |
185 |
- from /usr/include/exiv2/image.hpp:28, |
186 |
- from gwenview-18.12.0/lib/cms/cmsprofile.h:33, |
187 |
- from gwenview-18.12.0/lib/cms/cmsprofile.cpp:22: |
188 |
-/usr/include/exiv2/slice.hpp: In constructor ‘Exiv2::Internal::SliceBase::SliceBase(size_t, size_t)’: |
189 |
-/usr/include/exiv2/slice.hpp:99:77: error: exception handling disabled, use -fexceptions to enable |
190 |
- throw std::out_of_range("Begin must be smaller than end"); |
191 |
- ^ |
192 |
- |
193 |
-Test Plan: Built fine with exiv2-0.27 |
194 |
- |
195 |
-Reviewers: #gwenview, cgiboudeaux |
196 |
- |
197 |
-Tags: #gwenview |
198 |
- |
199 |
-Differential Revision: https://phabricator.kde.org/D17869 |
200 |
---- |
201 |
- CMakeLists.txt | 2 ++ |
202 |
- lib/CMakeLists.txt | 6 ------ |
203 |
- 2 files changed, 2 insertions(+), 6 deletions(-) |
204 |
- |
205 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
206 |
-index f44f9afc..b85ba4bc 100644 |
207 |
---- a/CMakeLists.txt |
208 |
-+++ b/CMakeLists.txt |
209 |
-@@ -126,6 +126,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) |
210 |
- |
211 |
- add_definitions(-DQT_NO_URL_CAST_FROM_STRING) |
212 |
- |
213 |
-+kde_enable_exceptions() |
214 |
-+ |
215 |
- ## dirs to build |
216 |
- add_subdirectory(lib) |
217 |
- add_subdirectory(app) |
218 |
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt |
219 |
-index 169df3c6..f7e9f71f 100644 |
220 |
---- a/lib/CMakeLists.txt |
221 |
-+++ b/lib/CMakeLists.txt |
222 |
-@@ -220,12 +220,6 @@ if (GWENVIEW_SEMANTICINFO_BACKEND_BALOO) |
223 |
- ) |
224 |
- endif() |
225 |
- |
226 |
--kde_source_files_enable_exceptions( |
227 |
-- exiv2imageloader.cpp |
228 |
-- imagemetainfomodel.cpp |
229 |
-- timeutils.cpp |
230 |
-- ) |
231 |
-- |
232 |
- ki18n_wrap_ui(gwenviewlib_SRCS |
233 |
- crop/cropwidget.ui |
234 |
- documentview/messageview.ui |
235 |
--- |
236 |
-2.20.1 |
237 |
- |