gentoo resync : 28.04.2019

3 files changed, 130 insertions, 1 deletions

diff --git a/media-libs/libchamplain/Manifest b/media-libs/libchamplain/Manifest
index 631ab6d30c91..963eedeb00d4 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -1,5 +1,6 @@
+AUX 0.12.19-gdk-meson-fixes.patch 4022 BLAKE2B 55d1c2710ae8fca1e0befeedc87fc49c5776cfd2eaf34f6a544ac668ead2475eae4761b2c28caa513f26e92401c89f0c9464d928710b5612516d935b847eb8f9 SHA512 e67cdfef9025d00e5be8786cce71f4fd4caac06c48cc117a40827d70e759c5150ff8965dc395f7165f3ae705c36e8075f714fb571d4d9fc2dd54aaaa0982e358
 DIST libchamplain-0.12.16.tar.xz 623912 BLAKE2B fcdf351e5b264cc31e2ce2954e05abd9f9aaaa9ad622eb015e2267b24a8c281cd9fc79d0e5081f80b8805e0b9329b6c463d04e18d5704d75ab45139d86896e62 SHA512 78db380d87bd6437cab84b546af7f6505a8aaed7e8d9e8a06f3fdab1896b06a3bf1d11201384e4daedd2c78e528221e1d7e40665557e78251efec5fa036f4137
 DIST libchamplain-0.12.19.tar.xz 233084 BLAKE2B b46ef4b1ceaef3d3b7d52652e825de30a11d7b8f5a68b5a08abcec7111c58443ba76b9aea6b350007ccd91bfc86a4062079c51416fc4e63795318269045ce509 SHA512 3fc03c123859b078f1c4f5062706c95446146a7ed2352306cea3f72f3fbf95099afd2a99f61182e3cb7c47e546de6501ff3ed6ff17614f23dc2e4139ba5e4902
 EBUILD libchamplain-0.12.16.ebuild 1627 BLAKE2B 5b27437597ad463e41c731ad01aca90a9280bdcd8164bc500fc8870cef5770a391c8cd66d4467d2e7f1a784d2a854378be6d0b5976cf585c4c3ecef7366451dc SHA512 121df5c8fa295c833f5ea2b66df4a70944ab4fb0c1e1eb9e44eafc872c97860580546ef839696bf91fd5bc12add81d419130d02d707e2576b9d72b6b8c1947aa
-EBUILD libchamplain-0.12.19-r1.ebuild 1656 BLAKE2B ba6110dbf4d34c105e31921eb6e007dadb9d3bd11367824ee0c6baaa30eb5b2e05bcbd453f689177cf66c9eaa3d22cc83114a73a77f4b2496d4382bcac4bb075 SHA512 ad0a999e320cb11e4cd7845365afd1cfef09c20ccfaec421b6e6ec3687cece4b6b26b958108f14d5944c92bf6c8eb57ec608fb2124c208e64214db5a75cf7284
+EBUILD libchamplain-0.12.19-r1.ebuild 1816 BLAKE2B d06c23591b0349db7109d532f06fba85ed1110493096c7b15c14e191cc50da746824fb58493f4c006c6a6db4ba2bd67de6ef23e7218a721fb6a1edf5c20191c8 SHA512 3c234d13e602f99fe61ccdfe3b3126acf4559184d53a7b383c13ea4fa9dd810faa09650e72f6e932ea3de3cd0598a939eff3b4c502067ba82232a5f33c008b61
 MISC metadata.xml 621 BLAKE2B ff31085e2b6cee6e64d64161505ae026d3d6896964a0e5aa055b6052b6bc242396db2bc1bb603cfdd3b66300d65e39fa57a8556ac3cea2454ac52048eedea61e SHA512 6d2214f5f62f6deace80db56fee500efed4713be2087b6a9159594a36c503b534b8f50e728ceccfe13f17ce79614ec97baf5b56342680b9283e03096df644a64
diff --git a/media-libs/libchamplain/files/0.12.19-gdk-meson-fixes.patch b/media-libs/libchamplain/files/0.12.19-gdk-meson-fixes.patch
new file mode 100644
index 000000000000..41c7484e2a43
--- /dev/null
+++ b/media-libs/libchamplain/files/0.12.19-gdk-meson-fixes.patch
@@ -0,0 +1,123 @@
+From 17348668f16857296ac2caf32c4a503f1946e1a5 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Mon, 22 Apr 2019 15:03:06 +0300
+Subject: [PATCH 1/2] meson: Add missing gdk required dependency for champlain
+
+gdk/gdk.h header is included and gdk_cairo_set_source_pixbuf symbol
+is used from gdk, thus we need its header include path and link to it.
+If clutter is built with gtk support, this is implicitly included via
+clutter-1.0 dep, but it can also be built without gtk support, in
+which case the build of libchamplain fails due to no gdk/gdk.h header
+found.
+---
+ champlain/meson.build | 1 +
+ meson.build           | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/champlain/meson.build b/champlain/meson.build
+index 3285c65..0bf8ba5 100644
+--- a/champlain/meson.build
++++ b/champlain/meson.build
+@@ -95,6 +95,7 @@ libchamplain_requires = [
+ libchamplain_deps = libchamplain_requires + [
+   libm_dep,
+   gio_dep,
++  gdk_dep,
+   sqlite_dep,
+   libsoup_dep,
+ ]
+diff --git a/meson.build b/meson.build
+index 43e72e5..1e571c5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -66,6 +66,7 @@ gtk_doc_req = '>= 1.15'
+ glib_dep = dependency('glib-2.0', version: glib_req)
+ gobject_dep = dependency('gobject-2.0', version: glib_req)
+ gio_dep = dependency('gio-2.0', version: glib_req)
++gdk_dep = dependency('gdk-3.0', version: gtk_req)
+ clutter_dep = dependency('clutter-1.0', version: clutter_req)
+ cairo_dep = dependency('cairo', version: cairo_req)
+ sqlite_dep = dependency('sqlite3', version: sqlite_req)
+-- 
+2.17.0
+
+
+From d938cb13fb13f28d18856e343ad3ee269e3cc0d9 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Mon, 22 Apr 2019 15:09:24 +0300
+Subject: [PATCH 2/2] Clean up gdk.h vs gdk-pixbuf.h includes
+
+Some source files included gdk.h without any use; others included it
+instead of gdk-pixbuf/gdk-pixbuf.h
+---
+ champlain/champlain-error-tile-renderer.c | 1 -
+ champlain/champlain-image-renderer.c      | 1 +
+ champlain/champlain-memphis-renderer.c    | 2 +-
+ champlain/champlain-network-tile-source.c | 1 -
+ champlain/champlain-tile.c                | 1 -
+ 5 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/champlain/champlain-error-tile-renderer.c b/champlain/champlain-error-tile-renderer.c
+index 2b74730..f2dc67f 100644
+--- a/champlain/champlain-error-tile-renderer.c
++++ b/champlain/champlain-error-tile-renderer.c
+@@ -25,7 +25,6 @@
+  */
+ 
+ #include "champlain-error-tile-renderer.h"
+-#include <gdk/gdk.h>
+ 
+ struct _ChamplainErrorTileRendererPrivate
+ {
+diff --git a/champlain/champlain-image-renderer.c b/champlain/champlain-image-renderer.c
+index e0d9f65..ad21971 100644
+--- a/champlain/champlain-image-renderer.c
++++ b/champlain/champlain-image-renderer.c
+@@ -26,6 +26,7 @@
+  */
+ 
+ #include "champlain-image-renderer.h"
++#include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <gdk/gdk.h>
+ 
+ struct _ChamplainImageRendererPrivate
+diff --git a/champlain/champlain-memphis-renderer.c b/champlain/champlain-memphis-renderer.c
+index e62d82d..5244889 100644
+--- a/champlain/champlain-memphis-renderer.c
++++ b/champlain/champlain-memphis-renderer.c
+@@ -44,7 +44,7 @@
+ #include "champlain-memphis-renderer.h"
+ #include "champlain-bounding-box.h"
+ 
+-#include <gdk/gdk.h>
++#include <gdk-pixbuf/gdk-pixbuf.h>
+ 
+ #include <memphis/memphis.h>
+ #include <errno.h>
+diff --git a/champlain/champlain-network-tile-source.c b/champlain/champlain-network-tile-source.c
+index 873a39d..281f000 100644
+--- a/champlain/champlain-network-tile-source.c
++++ b/champlain/champlain-network-tile-source.c
+@@ -45,7 +45,6 @@
+ #include "champlain-private.h"
+ 
+ #include <errno.h>
+-#include <gdk/gdk.h>
+ #include <gio/gio.h>
+ #include <glib.h>
+ #include <glib/gstdio.h>
+diff --git a/champlain/champlain-tile.c b/champlain/champlain-tile.c
+index a218857..ea70c3f 100644
+--- a/champlain/champlain-tile.c
++++ b/champlain/champlain-tile.c
+@@ -30,7 +30,6 @@
+ 
+ #include <math.h>
+ #include <errno.h>
+-#include <gdk/gdk.h>
+ #include <libsoup/soup.h>
+ #include <gio/gio.h>
+ #include <clutter/clutter.h>
+-- 
+2.17.0
+
diff --git a/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild b/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild
index 1240a3e7c15c..c4e1ded7271a 100644
--- a/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild
@@ -41,6 +41,11 @@ BDEPEND="
 	vala? ( $(vala_depend) )
 "
 
+PATCHES=(
+	# Fix compilation against clutter[-gtk]
+	"${FILESDIR}"/${PV}-gdk-meson-fixes.patch # https://gitlab.gnome.org/GNOME/libchamplain/merge_requests/8
+)
+
 src_prepare() {
 	xdg_src_prepare
 	use vala && vala_src_prepare