diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -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-- | docs/reference/champlain-docs.xml | 2 | ||||
| -rw-r--r-- | docs/reference/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 1 |
10 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a60637e..9f68909 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ build-champlain: - meson -Dwidgetry=true -Ddemos=true -Dgtk_doc=true -Dintrospection=true -Dvapi=true _build . - ninja -C _build - ninja -C _build test - - ninja -C _build champlain-doc + - ninja -C _build champlain-0.12-doc - ccache --show-stats artifacts: name: "champlain-doc" 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/docs/reference/champlain-docs.xml b/docs/reference/champlain-docs.xml index 785235a..c1eaf34 100644 --- a/docs/reference/champlain-docs.xml +++ b/docs/reference/champlain-docs.xml @@ -10,7 +10,7 @@ for libchamplain &version; <para> The latest version of this documentation can be found on-line at - <ulink role="online-location" url="http://library.gnome.org/devel/libchamplain/unstable/">http://library.gnome.org/devel/libchamplain/unstable/</ulink>. + <ulink role="online-location" url="https://gnome.pages.gitlab.gnome.org/libchamplain/champlain/">https://gnome.pages.gitlab.gnome.org/libchamplain/champlain/</ulink>. </para> </releaseinfo> <copyright> diff --git a/docs/reference/meson.build b/docs/reference/meson.build index 781205a..8642ed5 100644 --- a/docs/reference/meson.build +++ b/docs/reference/meson.build @@ -61,7 +61,7 @@ libchamplain_reference_fixxref_args = [ ] gnome.gtkdoc( - package_name, + package_string, main_xml: 'champlain-docs.xml', mode: 'xml', gobject_typesfile: files('champlain.types'), 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) |