[gnome-control-center/wip/jimmac/nightly-app-icon: 12/13] flatpak: Use the Nightly variant of the application icon

[Robert Ancell <rancell src gnome org>]

commit a1c48ce477f4e83c0e58e98d705768451a97206b
Author: Felipe Borges <felipeborges gnome org>
Date:   Tue Oct 8 18:35:26 2019 +0200

    flatpak: Use the Nightly variant of the application icon
    
    For the "development" profile, lets use the Nightly variant, to
    visually indicate to users that they are running an unstable
    version of the application.

 .gitlab-ci.yml                            | 2 +-
 build-aux/flatpak/org.gnome.Settings.json | 3 ++-
 data/icons/meson.build                    | 9 +++++++++
 meson_options.txt                         | 1 +
 4 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c09ad0cd0..d60399003 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ stages:
 .Build procedure: &build_procedure
   echo "== Building ==" &&
   rm -rf _build/ &&
-  meson . _build ${BUILD_OPTS} &&
+  meson . _build ${BUILD_OPTS} -Dprofile=development &&
   ninja -C _build 2>&1 | tee compilation.log
 
 .Run Tests: &run_tests
diff --git a/build-aux/flatpak/org.gnome.Settings.json b/build-aux/flatpak/org.gnome.Settings.json
index 7a73d37b4..4572805e6 100644
--- a/build-aux/flatpak/org.gnome.Settings.json
+++ b/build-aux/flatpak/org.gnome.Settings.json
@@ -766,7 +766,8 @@
                 }
             ],
             "config-opts" : [
-                "-Dtracing=true"
+                "-Dtracing=true",
+                "-Dprofile=development"
             ]
         }
     ]
diff --git a/data/icons/meson.build b/data/icons/meson.build
index a6a6c221f..f94128956 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -2,3 +2,12 @@ install_subdir(
      'hicolor',
   install_dir : control_center_icondir
 )
+
+if get_option('profile') == 'development'
+  icondir = join_paths('hicolor', 'scalable', 'apps')
+  install_data(
+    join_paths(icondir, 'org.gnome.Settings.Devel.svg'),
+    install_dir: join_paths(control_center_icondir, icondir),
+    rename: 'org.gnome.Settings.svg'
+  )
+endif
diff --git a/meson_options.txt b/meson_options.txt
index a5cc9ec5a..78efb5885 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -5,3 +5,4 @@ option('ibus', type: 'boolean', value: true, description: 'build with IBus suppo
 option('tests', type: 'boolean', value: true, description: 'build tests')
 option('tracing', type: 'boolean', value: false, description: 'add extra debugging information')
 option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
+option('profile', type: 'combo', choices: ['default','development'], value: 'default')