diff options
| author | Richard Hughes <richard@hughsie.com> | 2017-08-13 14:06:58 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2017-08-13 16:41:29 +0100 |
| commit | a3615ef3db3d5ee919a3e78c93accbb4167ee574 (patch) | |
| tree | cc8ce70851b5503ac471e1e247be29543bffa9cf | |
| parent | d438e3847e4bf5221fb30802d3e6a51a68148fd1 (diff) | |
| download | colord-a3615ef3db3d5ee919a3e78c93accbb4167ee574.tar.gz | |
trivial: Enable Vala in CI and the Fedora package
| -rw-r--r-- | contrib/ci/Dockerfile-debian | 1 | ||||
| -rwxr-xr-x | contrib/ci/build_and_test.sh | 2 | ||||
| -rw-r--r-- | contrib/colord.spec.in | 4 | ||||
| -rw-r--r-- | lib/colord/meson.build | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/contrib/ci/Dockerfile-debian b/contrib/ci/Dockerfile-debian index 1ef4015..4eecc8f 100644 --- a/contrib/ci/Dockerfile-debian +++ b/contrib/ci/Dockerfile-debian @@ -27,6 +27,7 @@ RUN apt-get install -yq --no-install-recommends \ shared-mime-info \ systemd \ udev \ + valac \ valgrind RUN mkdir /build WORKDIR /build diff --git a/contrib/ci/build_and_test.sh b/contrib/ci/build_and_test.sh index c82ffe5..5ae9515 100755 --- a/contrib/ci/build_and_test.sh +++ b/contrib/ci/build_and_test.sh @@ -4,7 +4,7 @@ export LC_ALL=C.UTF-8 mkdir -p build && cd build rm * -rf meson .. \ - -Denable-vala=false \ + -Denable-vala=true \ -Denable-print-profiles=false \ -Denable-argyllcms-sensor=false \ -Denable-sane=true \ diff --git a/contrib/colord.spec.in b/contrib/colord.spec.in index b3ffe0b..16e5282 100644 --- a/contrib/colord.spec.in +++ b/contrib/colord.spec.in @@ -116,7 +116,7 @@ This may be useful for CMYK soft-proofing or for extra device support. ulimit -Sv 2000000 %meson \ - -Denable-vala=false \ + -Denable-vala=true \ %if 0%{?build_print_profiles} -Denable-print-profiles=true \ %else @@ -272,7 +272,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_libdir}/libcolorhug.so %{_libdir}/pkgconfig/*.pc %{_datadir}/gir-1.0/*.gir -#%{_datadir}/vala/vapi/colord.vapi +%{_datadir}/vala/vapi/colord.vapi %files devel-docs %dir %{_datadir}/gtk-doc/html/colord diff --git a/lib/colord/meson.build b/lib/colord/meson.build index 1ad6cd7..b55d827 100644 --- a/lib/colord/meson.build +++ b/lib/colord/meson.build @@ -203,7 +203,7 @@ libcolord_gir = libcolord_girtarget[0] libcolord_typelib = libcolord_girtarget[1] if get_option('enable-vala') -libfoo_vapi = gnome.generate_vapi('colord', +gnome.generate_vapi('colord', sources: libcolord_girtarget[0], packages: ['gio-2.0'], install: true, |