gentoo resync : 18.05.2019

3 files changed, 39 insertions, 2 deletions

diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index 495769b09c3b..81d8d6afe223 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,6 +1,7 @@
 AUX gwenview-18.12.1-exiv2-0.27.patch 19132 BLAKE2B a0f390fa9a6f7037a46a8c2e53897e2290bee8284b5fc120c24445c2f37c16c4efb4dbd6d272e2df821ca70e49e74af86cf8a949176bd22e8ef6adbcd539db7a SHA512 327cf77dad47824321f62443a88f64bb519c9f8dfc850fbea5fbcfa1ea7ac0a596d925e2aa79f610f6d76118d9064d89ab106ea880972a5c31853a62ce9d9a87
+AUX gwenview-19.04.1-exiv2-0.27.1.patch 978 BLAKE2B f83aebfb9c938166bed94cca7f6c2069a2f518a4ae680af1be7ed06f1a0a65953ba4ba015a8d841dc1ca9b6bf45adfd12272eea7eb7a03c91b60964a1950d9c8 SHA512 5d21c782ec69c1e929e2723ccf6dc44bd5d354eebb8cbf0b362d2dffba782717a987f3c3d467e818e25305f346e24ffdbe020225d93dbb47f6eddb0c7d044c97
 DIST gwenview-18.12.3.tar.xz 5714316 BLAKE2B 911a1ab5950f63382fdda471bea5160241ce579a5dd9c925a0cdd6f729188a8d52a41653bc9a746d3f3a692f087bd22faaa815c824f4422cbaf640cbb0773d11 SHA512 4105ef3529170e7c92cbbdca4bfb31f0fa4220979ce808f86d23aac0a2fdd9f59d927f87a7909e2d1641defd97bd31e1142075f30d526c7d1b29e8afe314fd51
-DIST gwenview-19.04.0.tar.xz 5717548 BLAKE2B 51bb0e16535bfeded3c521aa8dd217062eadc694e8004afb3d50c44650aea2cd2935bb3c83ba8529c48741ef51cf9f2b1578c63d986196e42b02a407a775cb5c SHA512 bacc6e5e1702b7653c31164d57440944ecab13331b02babd6a45a3e4637b5f13cc8347d2073cf99be1811d61f666529495afac0131307696c504dc9f82dbb9e4
+DIST gwenview-19.04.1.tar.xz 5714236 BLAKE2B f14b801a1651dcd52f48b7f137d00ac621d5b35942d6b9e79a6901bb9fa291829ffb0aba45dd966eb3d15342c8d1831ee1e9f3ae76c21fc9170e99de0d4fc301 SHA512 593db6ca0bc765d45ed6691c71d12bf06a9ff5dcf2fe23d7e839dde1ebd11ae60f466bb8af1e0b577df7fc7ba3cd9bf6ec0d51642eb75e6d4d50b3b8c42c5863
 EBUILD gwenview-18.12.3.ebuild 2718 BLAKE2B b96a85f6198df8b4eea738a7421b455d5803da0d40425d98c2481fe730ac01484038ca3f774db3b6e91c86c9bb8dc6daa5975ffff53d91c09a50808ac7561db6 SHA512 1a852d8192de77269841983cd2a6fa8b9942261a0dbfba60b56c58fcf406e27d94494d1a58560d46f54385abb336ece7f402866d7694ffa65911ca59fbf77e7e
-EBUILD gwenview-19.04.0.ebuild 2658 BLAKE2B 30c8ed92280dcb8547264ab6473d750fda08ef439d0bb135b7c023aa6475e5ae1d7627085e2e20b92bd6a153d98a940db51e3aef0be96f3bb96a7785472eb0e5 SHA512 0609997c27206ed9d8bc9045c37f470de715d8ed688d6ee707a0d561f1fbc70668fede06dd5e0a878cce24c1543fdb55499e19e374a81ae84dbe3b2c87ab5bba
+EBUILD gwenview-19.04.1.ebuild 2709 BLAKE2B e589159d3561a529f0e74d368926b687eaadda506aa91d7903ffea9fb8cfa53f0820b554d914901b28e3291e06953b5a97ce822c492e75018087a07cee42ec9e SHA512 42d5d4b166b52f6b8973eb0d87321831e1cce0dde8a543b50a4e70b914f1678ee40d18e9b7f4294e7d3a26c90b03951c2e434aab1052e68ea734d578b23c4e2d
 MISC metadata.xml 608 BLAKE2B 19b5fd4798750b2efd9d68a6271cb7c0c1c63e82075f2ac68fdf12bf57c5e695d3d9ee08f49d7cc22e0b15931eed086690b3af478486a858c4c233ee23b34ab0 SHA512 bc0c98d5420300aa4f17b0f544bc9cd44d8755ac716c099a5787769705e72eab9aae5d4b9a653434234dc605362f3c0d3d362121ab8c75978cdbde8f5fc774de
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
new file mode 100644
index 000000000000..f95f26c68bda
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-19.04.1-exiv2-0.27.1.patch
@@ -0,0 +1,34 @@
+From 3f3e9a546fa5e9a335ad3dc9afc805fd4d2809fd Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+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 <KFormat>
+ 
+ // Exiv2
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/iptc.hpp>
++#include <exiv2/exiv2.hpp>
+ 
+ // Local
+ #ifdef HAVE_FITS
+-- 
+2.21.0
+
diff --git a/kde-apps/gwenview/gwenview-19.04.0.ebuild b/kde-apps/gwenview/gwenview-19.04.1.ebuild
index 4bc3b01ee806..d4b54e523ffb 100644
--- a/kde-apps/gwenview/gwenview-19.04.0.ebuild
+++ b/kde-apps/gwenview/gwenview-19.04.1.ebuild
@@ -71,6 +71,8 @@ RDEPEND="${COMMON_DEPEND}
 	kipi? ( media-plugins/kipi-plugins:5 )
 "
 
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1.patch" )
+
 src_prepare() {
 	kde5_src_prepare
 	if ! use mpris; then