[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/files/
commit: d7091303920e6e28ce14fe0cd4fb10102a6d7744 Author: Michael Mair-Keimberger gmail com> AuthorDate: Sun Jun 16 15:28:27 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 16 21:50:54 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7091303 kde-apps/gwenview: remove unused patch Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/12269 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/gwenview-19.04.1-exiv2-0.27.1.patch | 34 -- 1 file changed, 34 deletions(-) diff --git a/kde-apps/gwenview/files/gwenview-19.04.1-exiv2-0.27.1.patch b/kde-apps/gwenview/files/gwenview-19.04.1-exiv2-0.27.1.patch deleted file mode 100644 index f95f26c68bd..000 --- a/kde-apps/gwenview/files/gwenview-19.04.1-exiv2-0.27.1.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3f3e9a546fa5e9a335ad3dc9afc805fd4d2809fd Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 12 May 2019 08:40:53 +0200 -Subject: [PATCH] Fix build with exiv2-0.27.1 - -Summary: Upstream is moving things around between headers. While they are busy doing that, they recommend including exiv2.hpp. - -Reviewers: #gwenview - -Tags: #gwenview - -Differential Revision: https://phabricator.kde.org/D21148 - lib/imagemetainfomodel.cpp | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -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 --- -2.21.0 -
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/files/, kde-apps/gwenview/
commit: 498bb8f66868ec99e1a971fb4815edb2781d226d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Feb 6 22:51:42 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Feb 7 12:59:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=498bb8f6
kde-apps/gwenview: Backport exiv2-0.27 support to 18.08.3
Refresh patch for 18.12.x as well.
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/gwenview-18.12.1-exiv2-0.27.patch| 142 ++---
kde-apps/gwenview/gwenview-18.08.3-r1.ebuild | 112
2 files changed, 237 insertions(+), 17 deletions(-)
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
index 66ed9ed8345..3e528e49285 100644
--- 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
@@ -1,7 +1,7 @@
-From 61543b42289fc986e580f2e3443719f3334f17b5 Mon Sep 17 00:00:00 2001
+From 3637438dd1a772ee65e6b3091087bde89dc91db0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?=
Date: Sun, 30 Dec 2018 02:46:28 +0100
-Subject: [PATCH 1/2] Use forward declaration for Exiv2::Image, port to
+Subject: [PATCH 1/4] Use forward declaration for Exiv2::Image, port to
std::unique_ptr
Summary:
@@ -104,7 +104,7 @@ index d841ae5f..d3d0002c 100644
void AbstractDocumentImpl::setDocumentDownSampledImage(const QImage& image,
int invertedZoom)
diff --git a/lib/document/abstractdocumentimpl.h
b/lib/document/abstractdocumentimpl.h
-index 1f427e60..86e6bfd2 100644
+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.
@@ -129,7 +129,7 @@ index 1f427e60..86e6bfd2 100644
void setDocumentCmsProfile(Cms::Profile::Ptr profile);
void setDocumentErrorString(const QString&);
diff --git a/lib/document/document.cpp b/lib/document/document.cpp
-index 18756700..afa9ed03 100644
+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.
@@ -155,7 +155,7 @@ index 18756700..afa9ed03 100644
emit metaInfoUpdated();
}
diff --git a/lib/document/document.h b/lib/document/document.h
-index c0bb454b..4b40a6e1 100644
+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.
@@ -191,7 +191,7 @@ index c0bb454b..4b40a6e1 100644
void switchToImpl(AbstractDocumentImpl* impl);
void setErrorString(const QString&);
diff --git a/lib/document/document_p.h b/lib/document/document_p.h
-index 78e0ac6e..4de25f15 100644
+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
@@ -226,7 +226,7 @@ index 78e0ac6e..4de25f15 100644
QByteArray mFormat;
ImageMetaInfoModel mImageMetaInfoModel;
diff --git a/lib/document/loadingdocumentimpl.cpp
b/lib/document/loadingdocumentimpl.cpp
-index 07675783..766a1831 100644
+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.
@@ -248,7 +248,7 @@ index 07675783..766a1831 100644
std::unique_ptr mJpegContent;
QImage mImage;
Cms::Profile::Ptr mCmsProfile;
-@@ -486,7 +489,7 @@ void LoadingDocumentImpl::slotMetaInfoLoaded()
+@@ -488,7 +491,7 @@ void LoadingDocumentImpl::slotMetaInfoLoaded()
setDocumentFormat(d->mFormat);
setDocumentImageSize(d->mImageSize);
@@ -258,7 +258,7 @@ index 07675783..766a1831 100644
d->mMetaInfoLoaded = true;
diff --git a/lib/exiv2imageloader.cpp b/lib/exiv2imageloader.cpp
-index f2830f81..f13dff7a 100644
+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.
@@ -288,7 +288,7 @@ index f2830f81..f13dff7a 100644
+
d->mImage.reset(Exiv2::ImageFactory::open(filePathByteArray.constData()).release());
d->mImage->readMetadata();
} catch (const Exiv2::Error& error) {
- d->mErrorMessage = QString::fromUtf8(error.what());
+ d->mErrorMessage = error.what();
@@ -69,7 +68,7 @@ bool Exiv2ImageLoader::load(const QString& filePath)
bool Exiv2ImageLoader::load(const QByteArray& data)
{
@@ -297,7 +297,7 @@ index f2830f81..f13dff7a 100644
+d->mImage.reset(Exiv2::ImageFactory::open((unsigned
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/files/
commit: e9e00e80e356314a68de6fc555730d38c3392a5b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jan 16 22:25:42 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 17 00:36:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9e00e80
kde-apps/gwenview: Drop unused patch
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/gwenview-18.12.0-exiv2-0.27.patch| 216 -
1 file changed, 216 deletions(-)
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 fa0d62d84b7..000
--- 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
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/files/
commit: 4ba1b2e31f26bb8b31890fc3ce6eb7ef0aaf8b9b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Sep 8 12:50:51 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 8 12:51:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba1b2e3
kde-apps/gwenview: Add missing patch
Package-Manager: Portage-2.3.49, Repoman-2.3.10
.../gwenview-18.07.90-activities-optional.patch| 160 +
1 file changed, 160 insertions(+)
diff --git
a/kde-apps/gwenview/files/gwenview-18.07.90-activities-optional.patch
b/kde-apps/gwenview/files/gwenview-18.07.90-activities-optional.patch
new file mode 100644
index 000..bf66688a6b9
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-18.07.90-activities-optional.patch
@@ -0,0 +1,160 @@
+From a00eecc78507f48843f719f32e80ae8805a34c15 Mon Sep 17 00:00:00 2001
+From: Alexander Volkov
+Date: Tue, 7 Aug 2018 23:59:15 +0300
+Subject: Make dependency on KActivities optional
+
+Reviewers: #gwenview, rkflx
+
+Reviewed By: #gwenview, rkflx
+
+Subscribers: asturmlechner, rkflx
+
+Differential Revision: https://phabricator.kde.org/D14512
+---
+ CMakeLists.txt | 4 +++-
+ app/CMakeLists.txt | 5 -
+ app/viewmainpage.cpp| 19 ---
+ config-gwenview.h.cmake | 1 +
+ 4 files changed, 24 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e3e412..810813a 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -71,7 +71,6 @@ add_definitions(-DPHONON_LIB_SONAME=\"${PHONON_LIB_SONAME}\")
+
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+ KIO
+-Activities
+ ItemModels
+ I18n
+ DocTools
+@@ -80,6 +79,9 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+ IconThemes
+ Notifications
+ )
++find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS
++Activities
++)
+
+ ## Dependencies
+ find_package(JPEG)
+diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
+index 5fe34d6..0d24360 100644
+--- a/app/CMakeLists.txt
b/app/CMakeLists.txt
+@@ -78,11 +78,14 @@ add_executable(gwenview ${gwenview_SRCS})
+
+ target_link_libraries(gwenview
+ KF5::ItemModels
+-KF5::Activities
+ KF5::Notifications
+ gwenviewlib
+ )
+
++if (KF5Activities_FOUND)
++target_link_libraries(gwenview KF5::Activities)
++endif()
++
+ target_link_libraries(gwenview LINK_INTERFACE_LIBRARIES KF5::KIOCore
Qt5::Core)
+
+ if (KF5Kipi_FOUND)
+diff --git a/app/viewmainpage.cpp b/app/viewmainpage.cpp
+index fa06e80..480d3c2 100644
+--- a/app/viewmainpage.cpp
b/app/viewmainpage.cpp
+@@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
+
+ */
+ #include "viewmainpage.h"
++#include "config-gwenview.h"
+
+ // Qt
+ #include
+@@ -35,8 +36,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
+ #include
+ #include
+ #include
+-#include
+ #include
++#ifdef KF5Activities_FOUND
++#include
++#endif
+
+ // Local
+ #include "fileoperations.h"
+@@ -132,7 +135,9 @@ struct ViewMainPagePrivate
+ // Activity Resource events reporting needs to be above KPart,
+ // in the shell itself, to avoid problems with other MDI applications
+ // that use this KPart
++#ifdef KF5Activities_FOUND
+ QHash mActivityResources;
++#endif
+
+ bool mCompareMode;
+ ZoomMode::Enum mZoomMode;
+@@ -250,7 +255,9 @@ struct ViewMainPagePrivate
+ QObject::connect(view, ::videoFinished, mSlideShow,
::resumeAndGoToNextUrl);
+
+ mDocumentViews << view;
++#ifdef KF5Activities_FOUND
+ mActivityResources.insert(view, new
KActivities::ResourceInstance(q->window()->winId(), view));
++#endif
+
+ return view;
+ }
+@@ -269,7 +276,9 @@ struct ViewMainPagePrivate
+ QObject::disconnect(view, nullptr, mSlideShow, nullptr);
+
+ mDocumentViews.removeOne(view);
++#ifdef KF5Activities_FOUND
+ mActivityResources.remove(view);
++#endif
+ mDocumentViewContainer->deleteView(view);
+ }
+
+@@ -344,8 +353,10 @@ struct ViewMainPagePrivate
+ }
+ if (oldView) {
+ oldView->setCurrent(false);
++#ifdef KF5Activities_FOUND
+ Q_ASSERT(mActivityResources.contains(oldView));
+ mActivityResources.value(oldView)->notifyFocusedOut();
++#endif
+ }
+ view->setCurrent(true);
+ mDocumentViewController->setView(view);
+@@ -358,10 +369,10 @@ struct ViewMainPagePrivate
+ // *before* listing /foo (because it matters less to the user)
+ mThumbnailBar->selectionModel()->setCurrentIndex(index,
QItemSelectionModel::Current);
+ }
+-
++#ifdef KF5Activities_FOUND
+ Q_ASSERT(mActivityResources.contains(view));
+ mActivityResources.value(view)->notifyFocusedIn();
+-
++#endif
+ QObject::connect(view, ::currentToolChanged,
+ q, ::updateFocus);
+ }
+@@
