diff options
| author | Jiří Techet <techet@gmail.com> | 2019-04-23 19:49:48 +0200 |
|---|---|---|
| committer | Jiří Techet <techet@gmail.com> | 2019-04-23 19:49:48 +0200 |
| commit | b5ffed6a72e61e0358171bf46e2d95ba6383ef58 (patch) | |
| tree | 30e220446f9ad4d7022cc757309330c2957048c6 | |
| parent | 1ffbaeb0b67878b60f020ddde7a85fcc89f0717f (diff) | |
| parent | d938cb13fb13f28d18856e343ad3ee269e3cc0d9 (diff) | |
| download | libchamplain-b5ffed6a72e61e0358171bf46e2d95ba6383ef58.tar.gz | |
Merge branch 'mraudsepp/libchamplain-gdk-dep-fix'
| -rw-r--r-- | champlain/champlain-error-tile-renderer.c | 1 | ||||
| -rw-r--r-- | champlain/champlain-image-renderer.c | 1 | ||||
| -rw-r--r-- | champlain/champlain-memphis-renderer.c | 2 | ||||
| -rw-r--r-- | champlain/champlain-network-tile-source.c | 1 | ||||
| -rw-r--r-- | champlain/champlain-tile.c | 1 | ||||
| -rw-r--r-- | champlain/meson.build | 1 | ||||
| -rw-r--r-- | meson.build | 1 |
7 files changed, 4 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> 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) |