diff options
Diffstat (limited to 'kde-apps/gwenview')
-rw-r--r-- | kde-apps/gwenview/Manifest | 5 | ||||
-rw-r--r-- | kde-apps/gwenview/files/gwenview-18.12.1-exiv2-0.27.patch | 631 | ||||
-rw-r--r-- | kde-apps/gwenview/gwenview-18.12.3.ebuild | 108 | ||||
-rw-r--r-- | kde-apps/gwenview/gwenview-19.04.3.ebuild | 2 |
4 files changed, 2 insertions, 744 deletions
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest index 4c91d440f55e..311ed0f65231 100644 --- a/kde-apps/gwenview/Manifest +++ b/kde-apps/gwenview/Manifest @@ -1,6 +1,3 @@ -AUX gwenview-18.12.1-exiv2-0.27.patch 19132 BLAKE2B a0f390fa9a6f7037a46a8c2e53897e2290bee8284b5fc120c24445c2f37c16c4efb4dbd6d272e2df821ca70e49e74af86cf8a949176bd22e8ef6adbcd539db7a SHA512 327cf77dad47824321f62443a88f64bb519c9f8dfc850fbea5fbcfa1ea7ac0a596d925e2aa79f610f6d76118d9064d89ab106ea880972a5c31853a62ce9d9a87 -DIST gwenview-18.12.3.tar.xz 5714316 BLAKE2B 911a1ab5950f63382fdda471bea5160241ce579a5dd9c925a0cdd6f729188a8d52a41653bc9a746d3f3a692f087bd22faaa815c824f4422cbaf640cbb0773d11 SHA512 4105ef3529170e7c92cbbdca4bfb31f0fa4220979ce808f86d23aac0a2fdd9f59d927f87a7909e2d1641defd97bd31e1142075f30d526c7d1b29e8afe314fd51 DIST gwenview-19.04.3.tar.xz 5713352 BLAKE2B b56cf65e76e7c2e580f615c995d636476e50478d7b53ca9814bd103a887eb94a12f26a78bd1fed6058dd596ad0a213a648cebba99cac5eabf6bcef16bf70e497 SHA512 03368de984dba8125d7cb1c49fb643bc313684621bf3e06ffc34258591673fdb180769657a5318412acc68c33b219df04148a8b4271640adca621a844f3b8103 -EBUILD gwenview-18.12.3.ebuild 2713 BLAKE2B e8a86c0508c1165801d1d00429a6ab1e3d783065cd75c33bd656df8cf1937294736f058e9f86f941038ed690622818de7b79d7c8a7756d89d06f9987d6dd0016 SHA512 75d19f175ec6ff3caaa4be1382ab06ca76108a6ecfd29f0942e7116381148720b8afa999489fbbd8b944638279a49d2b12e4a18c0322a95bc0b18f805a5cfe91 -EBUILD gwenview-19.04.3.ebuild 2653 BLAKE2B ddf6c65198cf86b3545a8a82e1178fe753f1cea4b8ae2dbd6a6849d26ddbded5055bbb6651395d36e33ad54e04eb9d0bb26175e8c0b685eefce0f12456782073 SHA512 ff63ebcd4e87b6bb613ca15912e756a7b3fe0cfa9c31bfbd91a6d909e6a35c0acc56af155c270ea2cc6ee59a4160aa825010adedc75eb63b84dde4c3d89e9591 +EBUILD gwenview-19.04.3.ebuild 2650 BLAKE2B 48bdc918dc36909120525b6c28e74df867d7fdac161e5195da77e2dfc4b4d9b0a47da22c51584f458ee729971b24724a12b3693c41538ae18123d5f507ac4630 SHA512 d261ccab4612aa8e5fbdfc2d536776bebd08d36bb0df34b99d30e24635955071ff3442986b67c01986e37c297d6e1e3d732e15e0a0bfe37ab8b8058110b9727a MISC metadata.xml 608 BLAKE2B 19b5fd4798750b2efd9d68a6271cb7c0c1c63e82075f2ac68fdf12bf57c5e695d3d9ee08f49d7cc22e0b15931eed086690b3af478486a858c4c233ee23b34ab0 SHA512 bc0c98d5420300aa4f17b0f544bc9cd44d8755ac716c099a5787769705e72eab9aae5d4b9a653434234dc605362f3c0d3d362121ab8c75978cdbde8f5fc774de diff --git a/kde-apps/gwenview/files/gwenview-18.12.1-exiv2-0.27.patch b/kde-apps/gwenview/files/gwenview-18.12.1-exiv2-0.27.patch deleted file mode 100644 index 3e528e492852..000000000000 --- a/kde-apps/gwenview/files/gwenview-18.12.1-exiv2-0.27.patch +++ /dev/null @@ -1,631 +0,0 @@ -From 3637438dd1a772ee65e6b3091087bde89dc91db0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de> -Date: Sun, 30 Dec 2018 02:46:28 +0100 -Subject: [PATCH 1/4] Use forward declaration for Exiv2::Image, port to - std::unique_ptr - -Summary: -Instead of the Exiv2::Image::AutoPtr typedef just use a forward declaration -for Exiv2::Image, and use std::unique_ptr instead of std::auto_ptr. - -The forward declaration avoids pulling in Exiv2 declarations everywhere, -e.g. via document.h. - -Although it would be possible to use std::auto_ptr, unique_ptr is -preferable for two reasons: -- ownership transfer is explicit (std::move, release()/reset()) -- Exiv2 0.28 will use std::unique_ptr as well, i.e. the code is forward -compatible. - -Reviewers: #gwenview, cfeck, ngraham - -Reviewed By: #gwenview, ngraham - -Subscribers: lbeltrame, ngraham, asturmlechner, shubham - -Tags: #gwenview - -Differential Revision: https://phabricator.kde.org/D17872 ---- - lib/cms/cmsprofile.cpp | 3 +++ - lib/cms/cmsprofile.h | 8 +++++--- - lib/document/abstractdocumentimpl.cpp | 5 +++-- - lib/document/abstractdocumentimpl.h | 7 ++++++- - lib/document/document.cpp | 7 +++++-- - lib/document/document.h | 11 ++++++++--- - lib/document/document_p.h | 10 +++++++++- - lib/document/loadingdocumentimpl.cpp | 7 +++++-- - lib/exiv2imageloader.cpp | 13 ++++++------- - lib/exiv2imageloader.h | 11 ++++++++--- - lib/jpegcontent.cpp | 10 +++++----- - lib/timeutils.cpp | 8 +++++--- - tests/auto/cmsprofiletest.cpp | 4 ++-- - tests/auto/imagemetainfomodeltest.cpp | 9 +++++++-- - 14 files changed, 77 insertions(+), 36 deletions(-) - -diff --git a/lib/cms/cmsprofile.cpp b/lib/cms/cmsprofile.cpp -index 188b90a4..7d2b753e 100644 ---- a/lib/cms/cmsprofile.cpp -+++ b/lib/cms/cmsprofile.cpp -@@ -42,6 +42,9 @@ extern "C" { - // lcms - #include <lcms2.h> - -+// Exiv2 -+#include <exiv2/exiv2.hpp> -+ - // X11 - #ifdef HAVE_X11 - #include <X11/Xlib.h> -diff --git a/lib/cms/cmsprofile.h b/lib/cms/cmsprofile.h -index a2a38a87..06c7672d 100644 ---- a/lib/cms/cmsprofile.h -+++ b/lib/cms/cmsprofile.h -@@ -29,12 +29,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA - #include <QExplicitlySharedDataPointer> - #include <QSharedData> - --// Exiv2 --#include <exiv2/image.hpp> -- - class QByteArray; - class QString; - -+namespace Exiv2 -+{ -+ class Image; -+} -+ - typedef void* cmsHPROFILE; - - namespace Gwenview -diff --git a/lib/document/abstractdocumentimpl.cpp b/lib/document/abstractdocumentimpl.cpp -index d841ae5f..d3d0002c 100644 ---- a/lib/document/abstractdocumentimpl.cpp -+++ b/lib/document/abstractdocumentimpl.cpp -@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - // Self - #include "abstractdocumentimpl.h" - -+#include <exiv2/exiv2.hpp> - // Qt - - // KDE -@@ -77,9 +78,9 @@ void AbstractDocumentImpl::setDocumentKind(MimeTypeUtils::Kind kind) - d->mDocument->setKind(kind); - } - --void AbstractDocumentImpl::setDocumentExiv2Image(Exiv2::Image::AutoPtr image) -+void AbstractDocumentImpl::setDocumentExiv2Image(std::unique_ptr<Exiv2::Image> image) - { -- d->mDocument->setExiv2Image(image); -+ d->mDocument->setExiv2Image(std::move(image)); - } - - void AbstractDocumentImpl::setDocumentDownSampledImage(const QImage& image, int invertedZoom) -diff --git a/lib/document/abstractdocumentimpl.h b/lib/document/abstractdocumentimpl.h -index 5d6862b8..6c6be825 100644 ---- a/lib/document/abstractdocumentimpl.h -+++ b/lib/document/abstractdocumentimpl.h -@@ -34,6 +34,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - class QImage; - class QRect; - -+namespace Exiv2 -+{ -+ class Image; -+} -+ - namespace Gwenview - { - -@@ -108,7 +113,7 @@ protected: - void setDocumentImageSize(const QSize& size); - void setDocumentKind(MimeTypeUtils::Kind); - void setDocumentFormat(const QByteArray& format); -- void setDocumentExiv2Image(Exiv2::Image::AutoPtr); -+ void setDocumentExiv2Image(std::unique_ptr<Exiv2::Image>); - void setDocumentDownSampledImage(const QImage&, int invertedZoom); - void setDocumentCmsProfile(Cms::Profile::Ptr profile); - void setDocumentErrorString(const QString&); -diff --git a/lib/document/document.cpp b/lib/document/document.cpp -index c760be96..27003b3e 100644 ---- a/lib/document/document.cpp -+++ b/lib/document/document.cpp -@@ -31,6 +31,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - #include <KLocalizedString> - #include <KJobUiDelegate> - -+// Exiv2 -+#include <exiv2/exiv2.hpp> -+ - // Local - #include "documentjob.h" - #include "emptydocumentimpl.h" -@@ -388,9 +391,9 @@ AbstractDocumentEditor* Document::editor() - return d->mImpl->editor(); - } - --void Document::setExiv2Image(Exiv2::Image::AutoPtr image) -+void Document::setExiv2Image(std::unique_ptr<Exiv2::Image> image) - { -- d->mExiv2Image = image; -+ d->mExiv2Image = std::move(image); - d->mImageMetaInfoModel.setExiv2Image(d->mExiv2Image.get()); - emit metaInfoUpdated(); - } -diff --git a/lib/document/document.h b/lib/document/document.h -index 782111d9..4b2b3d48 100644 ---- a/lib/document/document.h -+++ b/lib/document/document.h -@@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - #include <lib/gwenviewlib_export.h> - --#include <string.h> --#include <exiv2/image.hpp> -+// STL -+#include <memory> - - // Qt - #include <QObject> -@@ -43,6 +43,11 @@ class QUndoStack; - class KJob; - class QUrl; - -+namespace Exiv2 -+{ -+ class Image; -+} -+ - namespace Gwenview - { - -@@ -235,7 +240,7 @@ private: - void setKind(MimeTypeUtils::Kind); - void setFormat(const QByteArray&); - void setSize(const QSize&); -- void setExiv2Image(Exiv2::Image::AutoPtr); -+ void setExiv2Image(std::unique_ptr<Exiv2::Image>); - void setDownSampledImage(const QImage&, int invertedZoom); - void switchToImpl(AbstractDocumentImpl* impl); - void setErrorString(const QString&); -diff --git a/lib/document/document_p.h b/lib/document/document_p.h -index 00c6f7ff..2701440f 100644 ---- a/lib/document/document_p.h -+++ b/lib/document/document_p.h -@@ -21,6 +21,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA - #ifndef DOCUMENT_P_H - #define DOCUMENT_P_H - -+// STL -+#include <memory> -+ - // Local - #include <imagemetainfomodel.h> - #include <document/documentjob.h> -@@ -34,6 +37,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA - #include <QUndoStack> - #include <QPointer> - -+namespace Exiv2 -+{ -+ class Image; -+} -+ - namespace Gwenview - { - -@@ -54,7 +62,7 @@ struct DocumentPrivate - QSize mSize; - QImage mImage; - QMap<int, QImage> mDownSampledImageMap; -- Exiv2::Image::AutoPtr mExiv2Image; -+ std::unique_ptr<Exiv2::Image> mExiv2Image; - MimeTypeUtils::Kind mKind; - QByteArray mFormat; - ImageMetaInfoModel mImageMetaInfoModel; -diff --git a/lib/document/loadingdocumentimpl.cpp b/lib/document/loadingdocumentimpl.cpp -index 713ef32c..3bcf613a 100644 ---- a/lib/document/loadingdocumentimpl.cpp -+++ b/lib/document/loadingdocumentimpl.cpp -@@ -24,6 +24,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - // STL - #include <memory> - -+// Exiv2 -+#include <exiv2/exiv2.hpp> -+ - // Qt - #include <QBuffer> - #include <QByteArray> -@@ -100,7 +103,7 @@ struct LoadingDocumentImplPrivate - QByteArray mData; - QByteArray mFormat; - QSize mImageSize; -- Exiv2::Image::AutoPtr mExiv2Image; -+ std::unique_ptr<Exiv2::Image> mExiv2Image; - std::unique_ptr<JpegContent> mJpegContent; - QImage mImage; - Cms::Profile::Ptr mCmsProfile; -@@ -488,7 +491,7 @@ void LoadingDocumentImpl::slotMetaInfoLoaded() - - setDocumentFormat(d->mFormat); - setDocumentImageSize(d->mImageSize); -- setDocumentExiv2Image(d->mExiv2Image); -+ setDocumentExiv2Image(std::move(d->mExiv2Image)); - setDocumentCmsProfile(d->mCmsProfile); - - d->mMetaInfoLoaded = true; -diff --git a/lib/exiv2imageloader.cpp b/lib/exiv2imageloader.cpp -index c298c9c3..49bdf2c8 100644 ---- a/lib/exiv2imageloader.cpp -+++ b/lib/exiv2imageloader.cpp -@@ -29,8 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - // KDE - - // Exiv2 --#include <exiv2/error.hpp> --#include <exiv2/types.hpp> -+#include <exiv2/exiv2.hpp> - - // Local - -@@ -39,7 +38,7 @@ namespace Gwenview - - struct Exiv2ImageLoaderPrivate - { -- Exiv2::Image::AutoPtr mImage; -+ std::unique_ptr<Exiv2::Image> mImage; - QString mErrorMessage; - }; - -@@ -57,7 +56,7 @@ bool Exiv2ImageLoader::load(const QString& filePath) - { - QByteArray filePathByteArray = QFile::encodeName(filePath); - try { -- d->mImage = Exiv2::ImageFactory::open(filePathByteArray.constData()); -+ d->mImage.reset(Exiv2::ImageFactory::open(filePathByteArray.constData()).release()); - d->mImage->readMetadata(); - } catch (const Exiv2::Error& error) { - d->mErrorMessage = error.what(); -@@ -69,7 +68,7 @@ bool Exiv2ImageLoader::load(const QString& filePath) - bool Exiv2ImageLoader::load(const QByteArray& data) - { - try { -- d->mImage = Exiv2::ImageFactory::open((unsigned char*)data.constData(), data.size()); -+ d->mImage.reset(Exiv2::ImageFactory::open((unsigned char*)data.constData(), data.size()).release()); - d->mImage->readMetadata(); - } catch (const Exiv2::Error& error) { - d->mErrorMessage = error.what(); -@@ -83,9 +82,9 @@ QString Exiv2ImageLoader::errorMessage() const - return d->mErrorMessage; - } - --Exiv2::Image::AutoPtr Exiv2ImageLoader::popImage() -+std::unique_ptr<Exiv2::Image> Exiv2ImageLoader::popImage() - { -- return d->mImage; -+ return std::move(d->mImage); - } - - } // namespace -diff --git a/lib/exiv2imageloader.h b/lib/exiv2imageloader.h -index 57ef24d2..12a45b68 100644 ---- a/lib/exiv2imageloader.h -+++ b/lib/exiv2imageloader.h -@@ -23,13 +23,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - #include <lib/gwenviewlib_export.h> - -+// STL -+#include <memory> -+ - // Qt - - // KDE - - // Exiv2 --#include <string.h> --#include <exiv2/image.hpp> -+namespace Exiv2 -+{ -+ class Image; -+} - - // Local - -@@ -54,7 +59,7 @@ public: - bool load(const QString&); - bool load(const QByteArray&); - QString errorMessage() const; -- Exiv2::Image::AutoPtr popImage(); -+ std::unique_ptr<Exiv2::Image> popImage(); - - private: - Exiv2ImageLoaderPrivate* const d; -diff --git a/lib/jpegcontent.cpp b/lib/jpegcontent.cpp -index d203da5a..989a1a54 100644 ---- a/lib/jpegcontent.cpp -+++ b/lib/jpegcontent.cpp -@@ -42,8 +42,7 @@ extern "C" { - #include <KLocalizedString> - - // Exiv2 --#include <exiv2/exif.hpp> --#include <exiv2/image.hpp> -+#include <exiv2/exiv2.hpp> - - // Local - #include "jpegerrormanager.h" -@@ -216,12 +215,12 @@ bool JpegContent::load(const QString& path) - - bool JpegContent::loadFromData(const QByteArray& data) - { -- Exiv2::Image::AutoPtr image; -+ std::unique_ptr<Exiv2::Image> image; - Exiv2ImageLoader loader; - if (!loader.load(data)) { - qCritical() << "Could not load image with Exiv2, reported error:" << loader.errorMessage(); - } -- image = loader.popImage(); -+ image.reset(loader.popImage().release()); - - return loadFromData(data, image.get()); - } -@@ -603,7 +602,8 @@ bool JpegContent::save(QIODevice* device) - d->mPendingTransformation = false; - } - -- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open((unsigned char*)d->mRawData.data(), d->mRawData.size()); -+ std::unique_ptr<Exiv2::Image> image; -+ image.reset(Exiv2::ImageFactory::open((unsigned char*)d->mRawData.data(), d->mRawData.size()).release()); - - // Store Exif info - image->setExifData(d->mExifData); -diff --git a/lib/timeutils.cpp b/lib/timeutils.cpp -index 1fcecc98..ecce3891 100644 ---- a/lib/timeutils.cpp -+++ b/lib/timeutils.cpp -@@ -21,6 +21,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA - // Self - #include "timeutils.h" - -+// STL -+#include <memory> -+ - // Qt - #include <QFile> - #include <QDateTime> -@@ -30,8 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA - #include <KFileItem> - - // Exiv2 --#include <exiv2/exif.hpp> --#include <exiv2/image.hpp> -+#include <exiv2/exiv2.hpp> - - // Local - #include <lib/exiv2imageloader.h> -@@ -92,7 +94,7 @@ struct CacheItem - if (!loader.load(path)) { - return false; - } -- Exiv2::Image::AutoPtr img = loader.popImage(); -+ std::unique_ptr<Exiv2::Image> img(loader.popImage().release()); - try { - Exiv2::ExifData exifData = img->exifData(); - if (exifData.empty()) { -diff --git a/tests/auto/cmsprofiletest.cpp b/tests/auto/cmsprofiletest.cpp -index 4efc441b..f4c7f9e5 100644 ---- a/tests/auto/cmsprofiletest.cpp -+++ b/tests/auto/cmsprofiletest.cpp -@@ -69,7 +69,7 @@ void CmsProfileTest::testLoadFromImageData_data() - void CmsProfileTest::testLoadFromExiv2Image() - { - QFETCH(QString, fileName); -- Exiv2::Image::AutoPtr image; -+ std::unique_ptr<Exiv2::Image> image; - { - QByteArray data; - QString path = pathForTestFile(fileName); -@@ -80,7 +80,7 @@ void CmsProfileTest::testLoadFromExiv2Image() - - Exiv2ImageLoader loader; - QVERIFY(loader.load(data)); -- image = loader.popImage(); -+ image.reset(loader.popImage().release()); - } - Cms::Profile::Ptr ptr = Cms::Profile::loadFromExiv2Image(image.get()); - QVERIFY(!ptr.isNull()); -diff --git a/tests/auto/imagemetainfomodeltest.cpp b/tests/auto/imagemetainfomodeltest.cpp -index e3ec8d30..5a286b00 100644 ---- a/tests/auto/imagemetainfomodeltest.cpp -+++ b/tests/auto/imagemetainfomodeltest.cpp -@@ -17,6 +17,10 @@ along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - */ -+ -+// STL -+#include <memory> -+ - // Qt - - // KDE -@@ -28,7 +32,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - #include "../lib/imagemetainfomodel.h" - #include "testutils.h" - --#include <exiv2/exif.hpp> -+// Exiv2 -+#include <exiv2/exiv2.hpp> - - #include "imagemetainfomodeltest.h" - -@@ -46,7 +51,7 @@ void ImageMetaInfoModelTest::testCatchExiv2Errors() - data = file.readAll(); - } - -- Exiv2::Image::AutoPtr image; -+ std::unique_ptr<Exiv2::Image> image; - { - Exiv2ImageLoader loader; - QVERIFY(loader.load(data)); --- -2.20.1 - - -From fa287bfbd0bc95856c6a98bab2d81199a1618526 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de> -Date: Sat, 29 Dec 2018 23:39:30 +0100 -Subject: [PATCH 2/4] Compile more files with enabled exceptions, required for - exiv2 0.27 - -Summary: -The (exception based) error handling is now pulled in by e.g. image.hpp, -so more files require enabled exception handling. - -Depends on D17872 - -Test Plan: build - -Reviewers: #gwenview, ngraham, cfeck, asturmlechner - -Reviewed By: #gwenview, ngraham - -Subscribers: wbauer, lbeltrame - -Tags: #gwenview - -Differential Revision: https://phabricator.kde.org/D17873 ---- - lib/CMakeLists.txt | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 5f135a4d..365bcb86 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -227,6 +227,11 @@ kde_source_files_enable_exceptions( - exiv2imageloader.cpp - imagemetainfomodel.cpp - timeutils.cpp -+ cms/cmsprofile.cpp -+ document/abstractdocumentimpl.cpp -+ document/document.cpp -+ document/loadingdocumentimpl.cpp -+ jpegcontent.cpp - ) - - ki18n_wrap_ui(gwenviewlib_SRCS --- -2.20.1 - - -From 6b3407024e1d297ed8466d1e7710a9f7804dc265 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Wed, 6 Feb 2019 22:38:55 +0100 -Subject: [PATCH 4/4] Switch to FindLibExiv2 in ECM 5.54 - ---- - CMakeLists.txt | 3 +- - app/CMakeLists.txt | 2 +- - cmake/FindExiv2.cmake | 117 -------------------------------------- - importer/CMakeLists.txt | 2 +- - lib/CMakeLists.txt | 4 +- - part/CMakeLists.txt | 2 +- - tests/auto/CMakeLists.txt | 2 +- - 7 files changed, 7 insertions(+), 125 deletions(-) - delete mode 100644 cmake/FindExiv2.cmake - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f8bb85e7..7181f6c9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -97,8 +97,7 @@ set_package_properties(JPEG PROPERTIES URL "http://libjpeg.sourceforge.net/" DES - find_package(PNG) - set_package_properties(PNG PROPERTIES URL "http://www.libpng.org" DESCRIPTION "PNG image manipulation support" TYPE REQUIRED) - --find_package(Exiv2) --set_package_properties(Exiv2 PROPERTIES URL "http://www.exiv2.org" DESCRIPTION "image metadata support" TYPE REQUIRED) -+find_package(LibExiv2) - - find_package(CFitsio) - set_package_properties(CFitsio PROPERTIES URL "http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html" DESCRIPTION "FITS format support" TYPE OPTIONAL) -diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt -index 5fe34d69..eabd494d 100644 ---- a/app/CMakeLists.txt -+++ b/app/CMakeLists.txt -@@ -1,6 +1,6 @@ - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/.. -- ${EXIV2_INCLUDE_DIR} -+ ${LibExiv2_INCLUDE_DIRS} - ) - - # For lib/gwenviewconfig.h and config-gwenview.h -diff --git a/importer/CMakeLists.txt b/importer/CMakeLists.txt -index 81e585c1..39e219b7 100644 ---- a/importer/CMakeLists.txt -+++ b/importer/CMakeLists.txt -@@ -3,7 +3,7 @@ project(importer) - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/.. - ${CMAKE_CURRENT_BINARY_DIR}/.. -- ${EXIV2_INCLUDE_DIR} -+ ${LibExiv2_INCLUDE_DIRS} - ) - - set(importer_SRCS -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 365bcb86..dcf9757c 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -53,7 +53,7 @@ include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/${GV_JPEG_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/.. - ${CMAKE_CURRENT_BINARY_DIR} -- ${EXIV2_INCLUDE_DIR} -+ ${LibExiv2_INCLUDE_DIRS} - ${JPEG_INCLUDE_DIR} - ${PNG_INCLUDE_DIRS} - ) -@@ -265,7 +265,7 @@ target_link_libraries(gwenviewlib - KF5::WindowSystem - KF5::IconThemes - ${JPEG_LIBRARY} -- ${EXIV2_LIBRARIES} -+ LibExiv2::LibExiv2 - ${PNG_LIBRARIES} - ${LCMS2_LIBRARIES} - ${PHONON_LIBRARY} -diff --git a/part/CMakeLists.txt b/part/CMakeLists.txt -index 9d17eed2..03dcf92f 100644 ---- a/part/CMakeLists.txt -+++ b/part/CMakeLists.txt -@@ -2,7 +2,7 @@ add_definitions(-DTRANSLATION_DOMAIN="gwenview") - - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/.. -- ${EXIV2_INCLUDE_DIR} -+ ${LibExiv2_INCLUDE_DIRS} - ) - - set(gvpart_SRCS -diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt -index d5d3f015..9cc0e3b5 100644 ---- a/tests/auto/CMakeLists.txt -+++ b/tests/auto/CMakeLists.txt -@@ -14,7 +14,7 @@ endmacro(gv_add_unit_test) - include_directories( - ${gwenview_SOURCE_DIR} - ${importer_SOURCE_DIR} -- ${EXIV2_INCLUDE_DIR} -+ ${LibExiv2_INCLUDE_DIRS} - ) - - # For config-gwenview.h --- -2.20.1 - diff --git a/kde-apps/gwenview/gwenview-18.12.3.ebuild b/kde-apps/gwenview/gwenview-18.12.3.ebuild deleted file mode 100644 index 8fab8ae52e80..000000000000 --- a/kde-apps/gwenview/gwenview-18.12.3.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="true" -inherit kde5 - -DESCRIPTION="Image viewer by KDE" -HOMEPAGE=" - https://www.kde.org/applications/graphics/gwenview/ - https://userbase.kde.org/Gwenview -" - -LICENSE="GPL-2+ handbook? ( FDL-1.2 )" -KEYWORDS="amd64 ~arm64 x86" -IUSE="activities fits kipi +mpris raw semantic-desktop X" - -# requires running environment -RESTRICT+=" test" - -COMMON_DEPEND=" - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_qt_dep qtgui) - $(add_qt_dep qtopengl) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - media-gfx/exiv2:= - media-libs/lcms:2 - media-libs/libpng:0= - media-libs/phonon[qt5(+)] - virtual/jpeg:0 - activities? ( $(add_frameworks_dep kactivities) ) - fits? ( sci-libs/cfitsio ) - kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') ) - mpris? ( $(add_qt_dep qtdbus) ) - raw? ( $(add_kdeapps_dep libkdcraw) ) - semantic-desktop? ( - $(add_frameworks_dep baloo) - $(add_frameworks_dep kfilemetadata) - ) - X? ( - $(add_qt_dep qtx11extras) - x11-libs/libX11 - ) -" -DEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kwindowsystem) - $(add_qt_dep qtconcurrent) -" -RDEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kimageformats) - $(add_qt_dep qtimageformats) - kipi? ( kde-apps/kipi-plugins:5 ) -" - -PATCHES=( "${FILESDIR}/${PN}-18.12.1-exiv2-0.27.patch" ) - -src_prepare() { - kde5_src_prepare - if ! use mpris; then - # FIXME: upstream a better solution - sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package activities KF5Activities) - $(cmake-utils_use_find_package fits CFitsio) - $(cmake-utils_use_find_package kipi KF5Kipi) - $(cmake-utils_use_find_package raw KF5KDcraw) - $(cmake-utils_use_find_package X X11) - ) - - if use semantic-desktop; then - mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=Baloo ) - else - mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=None ) - fi - - kde5_src_configure -} - -pkg_postinst() { - kde5_pkg_postinst - - if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version kde-apps/svgpart:${SLOT} ; then - elog "For SVG support, install kde-apps/svgpart:${SLOT}" - fi -} diff --git a/kde-apps/gwenview/gwenview-19.04.3.ebuild b/kde-apps/gwenview/gwenview-19.04.3.ebuild index 8efbfa05fdcb..029d4b2f353f 100644 --- a/kde-apps/gwenview/gwenview-19.04.3.ebuild +++ b/kde-apps/gwenview/gwenview-19.04.3.ebuild @@ -14,7 +14,7 @@ HOMEPAGE=" " LICENSE="GPL-2+ handbook? ( FDL-1.2 )" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 x86" IUSE="activities fits kipi +mpris raw semantic-desktop X" # requires running environment |