From 2891d29af8907ce881662f4a02844926d7a293c7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 Dec 2018 13:43:35 +0000 Subject: gentoo resync : 31.12.2018 --- kde-apps/gwenview/Manifest | 3 +- .../files/gwenview-18.12.0-exiv2-0.27.patch | 216 +++++++++++++++++++++ kde-apps/gwenview/gwenview-18.12.0.ebuild | 1 + 3 files changed, 219 insertions(+), 1 deletion(-) create 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 cb60cd4c2294..93da9283cb9e 100644 --- a/kde-apps/gwenview/Manifest +++ b/kde-apps/gwenview/Manifest @@ -1,6 +1,7 @@ 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 DIST gwenview-18.08.3.tar.xz 6178192 BLAKE2B 0b25bdd64398f7ef1310598daad07374ca56383578fd67a8e36e348e78e1d818335fe4d630cc733e7a1eb13eaafca268426aea5afbb44195106742c50587c74d SHA512 0889b3388311b8c2b5a2ff98eea55dbae69ec6a27b5f27defc884077d937006d184c08a9daf31df0d9fb096b1a53fc70e844d46c4e3577d21e8f6ab83cca06ce DIST gwenview-18.12.0.tar.xz 6178072 BLAKE2B 4066165db148987c606e85c47cb6a47f236c07938d3819ca76ce6c083764874360cbba82c6b9cbe9a7d72771269a8b66a7894634a55f3d9a2d6db027c982aa2e SHA512 ef7f706c3c3278ca4f826518824f7457948b5fdac2d49cdb55977d55829cc90852745833fd86b94a5ce2cc7b55286c864b05f9a51d546e29538bf0f32bec2ec4 EBUILD gwenview-18.08.3.ebuild 2788 BLAKE2B c77ccacf146ac431a6e604c6a69107c54a5af2c50c907dafcdad900527aa5dbfdc4cc1405920d7502feff53309bbfce8cbbd244483a8c7842862839367518759 SHA512 4652f7225a398412bfe6737adf2fc437376640cdaff0d3976ebaaca8de15eacb9c9e99b0f950e0a589bce01ea38fdafbd3ddef3dc09b5a07c0d24688179a4b8c -EBUILD gwenview-18.12.0.ebuild 2646 BLAKE2B 8608898cf943791816ed3cc3010276258bc3a259a829173b5ec43854c80da12ebb03e4958303588928995df5e607fad28df18fc0056565fed385c850adc56c09 SHA512 651a53414e2c9d6cb35283fe99eb469ab3e30a148a67f984dd82a812e79ab8b7dea5d4f030b8fb60f9d3cca6ace9cfd3297d01b4f3294b612a3b6bf9e7355a30 +EBUILD gwenview-18.12.0.ebuild 2730 BLAKE2B 571bd16dafbdb7b345c0964306b2290bac34c6c0255316c6d76303493808d896bb615d0d96743aa022e4e7b38631d9c856e2ceb02003fe032ff90c75deb8a075 SHA512 078b12f52f70efb981259da4d54de975f8fb59579e8fa4233ebf7198ba5de5cd850dfdeb02ce5bb612d55ad7376a5d8f279d40adff74319cd2d17fd861652e92 MISC metadata.xml 608 BLAKE2B 19b5fd4798750b2efd9d68a6271cb7c0c1c63e82075f2ac68fdf12bf57c5e695d3d9ee08f49d7cc22e0b15931eed086690b3af478486a858c4c233ee23b34ab0 SHA512 bc0c98d5420300aa4f17b0f544bc9cd44d8755ac716c099a5787769705e72eab9aae5d4b9a653434234dc605362f3c0d3d362121ab8c75978cdbde8f5fc774de 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 new file mode 100644 index 000000000000..fa0d62d84b74 --- /dev/null +++ b/kde-apps/gwenview/files/gwenview-18.12.0-exiv2-0.27.patch @@ -0,0 +1,216 @@ +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 + diff --git a/kde-apps/gwenview/gwenview-18.12.0.ebuild b/kde-apps/gwenview/gwenview-18.12.0.ebuild index a580d5a58ccd..22f5b406075b 100644 --- a/kde-apps/gwenview/gwenview-18.12.0.ebuild +++ b/kde-apps/gwenview/gwenview-18.12.0.ebuild @@ -73,6 +73,7 @@ RDEPEND="${COMMON_DEPEND} src_prepare() { kde5_src_prepare + has_version ">=media-gfx/exiv2-0.27" && eapply "${FILESDIR}/${P}-exiv2-0.27.patch" if ! use mpris; then # FIXME: upstream a better solution sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die -- cgit v1.2.3