[gnome-builder] fix various build flags

[Christian Hergert <chergert src gnome org>]

commit 35fd53e4a27d2a8bf7cee8f6f400f3b5f1b59c7f
Author: Christian Hergert <chergert redhat com>
Date:   Tue Mar 12 22:27:59 2019 -0700

    fix various build flags

 .gitlab-ci.yml              | 10 +++++-----
 meson.build                 |  8 ++++----
 src/libide/core/meson.build |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11c9eb08c..5ccd08e40 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,11 +23,11 @@ flatpak:
           --buildtype=debugoptimized
           -Dctags_path=/app/bin/ctags
           -Dfusermount_wrapper=true
-          -Dwith_tcmalloc=true
-          -Denable_tracing=true
-          -Dwith_help=true
-          -Dwith_channel=flatpak-nightly
-          -Dwith_deviced=true
+          -Dtcmalloc=true
+          -Dtracing=true
+          -Dhelp=true
+          -Dchannel=flatpak-nightly
+          -Dplugin_deviced=true
 
     script:
         - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
diff --git a/meson.build b/meson.build
index 1c991143b..398a9950b 100644
--- a/meson.build
+++ b/meson.build
@@ -1,11 +1,11 @@
 project('gnome-builder', 'c',
           license: 'GPL3+',
           version: '3.31.92',
-    meson_version: '>= 0.49.0',
+    meson_version: '>= 0.49.2',
   default_options: [ 'c_std=gnu11',
                      'cpp_std=c++11',
                      'warning_level=2',
-                     'with_channel=other',
+                     'channel=other',
                    ],
 )
 
@@ -43,7 +43,7 @@ endif
 
 status = [
   '', '',
-  'gnome-builder @0@ (@1@)'.format(meson.project_version(), get_option('with_channel')),
+  'gnome-builder @0@ (@1@)'.format(meson.project_version(), get_option('channel')),
   '', '',
 ]
 
@@ -59,7 +59,7 @@ endif
 
 status += [
   'Version ............... : @0@'.format(meson.project_version()),
-  'Channel ............... : @0@'.format(get_option('with_channel')),
+  'Channel ............... : @0@'.format(get_option('channel')),
   'Build Type ............ : @0@'.format(get_option('buildtype')),
   '',
   'Prefix ................ : @0@'.format(get_option('prefix')),
diff --git a/src/libide/core/meson.build b/src/libide/core/meson.build
index 155d9ea6c..4713ca157 100644
--- a/src/libide/core/meson.build
+++ b/src/libide/core/meson.build
@@ -11,7 +11,7 @@ version_data.set('MAJOR_VERSION', MAJOR_VERSION)
 version_data.set('MINOR_VERSION', MINOR_VERSION)
 version_data.set('MICRO_VERSION', MICRO_VERSION)
 version_data.set('VERSION', meson.project_version())
-version_data.set_quoted('BUILD_CHANNEL', get_option('with_channel'))
+version_data.set_quoted('BUILD_CHANNEL', get_option('channel'))
 version_data.set_quoted('BUILD_TYPE', get_option('buildtype'))
 
 libide_core_version_h = configure_file(