From 09351e78166b5e864197c4456ebae3f89dd0bed9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 22 Jan 2019 10:09:44 +0000 Subject: gentoo resync : 22.01.2019 --- kde-apps/gwenview/Manifest | 1 - .../files/gwenview-18.12.0-exiv2-0.27.patch | 216 --------------------- 2 files changed, 217 deletions(-) delete mode 100644 kde-apps/gwenview/files/gwenview-18.12.0-exiv2-0.27.patch (limited to 'kde-apps/gwenview') diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest index 73fa445b979f..b75df413339b 100644 --- a/kde-apps/gwenview/Manifest +++ b/kde-apps/gwenview/Manifest @@ -1,5 +1,4 @@ AUX gwenview-18.07.90-activities-optional.patch 5078 BLAKE2B 692a743c319a9498de88af97b113e123ec445322f55513fcae58d4c556b29c23f0b2586e292900fb8e233c5cd2b33a7f76cf759b0c0ad119efb7daa7c290263c SHA512 2afd6fe89d1b455723d15f38866a476f8872e45d0548c36432f4b08d6404d02c4c03f78bfa60ec7dbddad022fef32283155b3ce27a9a8b16c4b753246b301106 -AUX gwenview-18.12.0-exiv2-0.27.patch 6552 BLAKE2B b57836867fe29e0d099d24b1b935ab4899909d94484a3c060e5a1ee97a2cf297c4fe444cc4b6a85d4f9727b68344013ed2292260a7e217b24d85b4debcacea13 SHA512 526fb77137cd504eb72a5bc6ba74a71efab7842f9ada3e4d7f0465284aa5d50cb6619fb54a555b8d959be3d305a302bf8d1b75162b60970523c628b09b04ca6e AUX gwenview-18.12.1-exiv2-0.27.patch 15804 BLAKE2B cabf4b2d042a2b5133ff22100fc2cd7d8e06df3b166574add355b13b7bb2e1b6a482c9bbc64a357738b0460765b3eab3303e39bc00dae2cdfb96ccb931c2e85a SHA512 238f40b55008c2de700cad637db09a824dac1cbd01d6997c4d25c4cf864b858c43b2768990eddb096086b7e549762b6d8b47ec09418e1917fa6c09ebee821043 DIST gwenview-18.08.3.tar.xz 6178192 BLAKE2B 0b25bdd64398f7ef1310598daad07374ca56383578fd67a8e36e348e78e1d818335fe4d630cc733e7a1eb13eaafca268426aea5afbb44195106742c50587c74d SHA512 0889b3388311b8c2b5a2ff98eea55dbae69ec6a27b5f27defc884077d937006d184c08a9daf31df0d9fb096b1a53fc70e844d46c4e3577d21e8f6ab83cca06ce DIST gwenview-18.12.1.tar.xz 5714244 BLAKE2B f4330290cd3230e40acc8427205c62dc99ddfe65165e03409efb8eee0a54303cf02de4a3fb308bc55d96314ed21aaf9783cd67d9a1e4aec08a2360f5e0ff7b03 SHA512 609c670bc7ff8007fbc96d1fb4de9a0686e8e8c1171c396ae00b1c96fb531855a3881c57bcdf578e1c6c29670fda58ef6eaab407d60ad7f7f419e7c92d5a4d8d 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 deleted file mode 100644 index fa0d62d84b74..000000000000 --- a/kde-apps/gwenview/files/gwenview-18.12.0-exiv2-0.27.patch +++ /dev/null @@ -1,216 +0,0 @@ -From 7e4cd5e91d7434448b7227ee8cf3307435cc7d00 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 30 Dec 2018 12:59:05 +0100 -Subject: [PATCH 1/2] Include exiv2.hpp instead of individual headers - -Headers are subject to refactoring upstream, using exiv2.hpp per recommendation. ---- - lib/cms/cmsprofile.h | 2 +- - lib/document/document.h | 2 +- - lib/exiv2imageloader.cpp | 4 ---- - lib/exiv2imageloader.h | 2 +- - lib/imagemetainfomodel.cpp | 4 +--- - lib/jpegcontent.cpp | 4 ---- - lib/timeutils.cpp | 4 ---- - tests/auto/documenttest.cpp | 2 -- - tests/auto/imagemetainfomodeltest.cpp | 2 -- - 9 files changed, 4 insertions(+), 22 deletions(-) - -diff --git a/lib/cms/cmsprofile.h b/lib/cms/cmsprofile.h -index a2a38a87..bc378ff9 100644 ---- a/lib/cms/cmsprofile.h -+++ b/lib/cms/cmsprofile.h -@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA - #include - - // Exiv2 --#include -+#include - - class QByteArray; - class QString; -diff --git a/lib/document/document.h b/lib/document/document.h -index c0bb454b..8e32c044 100644 ---- a/lib/document/document.h -+++ b/lib/document/document.h -@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - #include - - #include --#include -+#include - - // Qt - #include -diff --git a/lib/exiv2imageloader.cpp b/lib/exiv2imageloader.cpp -index f2830f81..f12b7383 100644 ---- a/lib/exiv2imageloader.cpp -+++ b/lib/exiv2imageloader.cpp -@@ -28,10 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - // KDE - --// Exiv2 --#include --#include -- - // Local - - namespace Gwenview -diff --git a/lib/exiv2imageloader.h b/lib/exiv2imageloader.h -index 57ef24d2..866e7fac 100644 ---- a/lib/exiv2imageloader.h -+++ b/lib/exiv2imageloader.h -@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - // Exiv2 - #include --#include -+#include - - // Local - -diff --git a/lib/imagemetainfomodel.cpp b/lib/imagemetainfomodel.cpp -index d7b89ab2..58f1c13d 100644 ---- a/lib/imagemetainfomodel.cpp -+++ b/lib/imagemetainfomodel.cpp -@@ -33,9 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - #include - - // Exiv2 --#include --#include --#include -+#include - - // Local - #ifdef HAVE_FITS -diff --git a/lib/jpegcontent.cpp b/lib/jpegcontent.cpp -index bb810dd4..a628e8a8 100644 ---- a/lib/jpegcontent.cpp -+++ b/lib/jpegcontent.cpp -@@ -41,10 +41,6 @@ extern "C" { - // KDE - #include - --// Exiv2 --#include --#include -- - // Local - #include "jpegerrormanager.h" - #include "iodevicejpegsourcemanager.h" -diff --git a/lib/timeutils.cpp b/lib/timeutils.cpp -index 9e8836a9..19befff5 100644 ---- a/lib/timeutils.cpp -+++ b/lib/timeutils.cpp -@@ -29,10 +29,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA - // KDE - #include - --// Exiv2 --#include --#include -- - // Local - #include - #include -diff --git a/tests/auto/documenttest.cpp b/tests/auto/documenttest.cpp -index 9373641f..496346f0 100644 ---- a/tests/auto/documenttest.cpp -+++ b/tests/auto/documenttest.cpp -@@ -39,8 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - #include "../lib/transformimageoperation.h" - #include "testutils.h" - --#include -- - #include "documenttest.h" - - QTEST_MAIN(DocumentTest) -diff --git a/tests/auto/imagemetainfomodeltest.cpp b/tests/auto/imagemetainfomodeltest.cpp -index e3ec8d30..c4467a73 100644 ---- a/tests/auto/imagemetainfomodeltest.cpp -+++ b/tests/auto/imagemetainfomodeltest.cpp -@@ -28,8 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - #include "../lib/imagemetainfomodel.h" - #include "testutils.h" - --#include -- - #include "imagemetainfomodeltest.h" - - QTEST_MAIN(ImageMetaInfoModelTest) --- -2.20.1 - - -From 7d6c5d95cf4e4d7c857f5d659a58f82bdc46259c Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 30 Dec 2018 11:31:20 +0100 -Subject: [PATCH 2/2] Fix build with exiv2-0.27 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Summary: -Include exiv2.hpp instead of individual headers - -Headers are subject to refactoring upstream, using exiv2.hpp per recommendation. - -Enable exceptions globally - otherwise, lots of the following error: - -In file included from /usr/include/exiv2/types.hpp:34, - from /usr/include/exiv2/image.hpp:28, - from gwenview-18.12.0/lib/cms/cmsprofile.h:33, - from gwenview-18.12.0/lib/cms/cmsprofile.cpp:22: -/usr/include/exiv2/slice.hpp: In constructor ‘Exiv2::Internal::SliceBase::SliceBase(size_t, size_t)’: -/usr/include/exiv2/slice.hpp:99:77: error: exception handling disabled, use -fexceptions to enable - throw std::out_of_range("Begin must be smaller than end"); - ^ - -Test Plan: Built fine with exiv2-0.27 - -Reviewers: #gwenview, cgiboudeaux - -Tags: #gwenview - -Differential Revision: https://phabricator.kde.org/D17869 ---- - CMakeLists.txt | 2 ++ - lib/CMakeLists.txt | 6 ------ - 2 files changed, 2 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f44f9afc..b85ba4bc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -126,6 +126,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) - - add_definitions(-DQT_NO_URL_CAST_FROM_STRING) - -+kde_enable_exceptions() -+ - ## dirs to build - add_subdirectory(lib) - add_subdirectory(app) -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 169df3c6..f7e9f71f 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -220,12 +220,6 @@ if (GWENVIEW_SEMANTICINFO_BACKEND_BALOO) - ) - endif() - --kde_source_files_enable_exceptions( -- exiv2imageloader.cpp -- imagemetainfomodel.cpp -- timeutils.cpp -- ) -- - ki18n_wrap_ui(gwenviewlib_SRCS - crop/cropwidget.ui - documentview/messageview.ui --- -2.20.1 - -- cgit v1.2.3