[gnome-initial-setup/90-remove-or-revamp-region-page] Remove region page

[Will Thompson <wjt src gnome org>]

commit e63c5e7c0c0b1d2ce8708022214b59d54ed810da
Author: Will Thompson <will willthompson co uk>
Date:   Sun Jan 12 08:11:25 2020 +0000

    Remove region page
    
    The region page was patched out of the list of pages back in 2014
    (a3c70fd2). In mid-2018, it was made a configure-time-parameter, off by
    default (cb66d893).
    
    If compiled in, it is only displayed if only a language code (eg 'en')
    is selected on the 'language' page. But that page doesn't offer that
    option: it shows locales with language and territory (eg 'en_GB'). So
    it is never displayed, even if it's selected at compile time.
    
    Remove it. Fixes #90.

 .gitlab-ci.yml                                     |   2 +-
 gnome-initial-setup/gnome-initial-setup.c          |   4 -
 gnome-initial-setup/pages/meson.build              |   4 -
 .../pages/region/cc-region-chooser.c               | 713 ---------------------
 .../pages/region/cc-region-chooser.h               |  64 --
 gnome-initial-setup/pages/region/gis-region-page.c | 284 --------
 gnome-initial-setup/pages/region/gis-region-page.h |  57 --
 .../pages/region/gis-region-page.ui                |  33 -
 gnome-initial-setup/pages/region/meson.build       |  12 -
 gnome-initial-setup/pages/region/region-chooser.ui |  37 --
 .../pages/region/region.gresource.xml              |   9 -
 meson.build                                        |   1 -
 meson_options.txt                                  |   6 -
 po/POTFILES.in                                     |   3 -
 14 files changed, 1 insertion(+), 1228 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e765c3f..38ce3e9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ before_script:
     # In general, we would like warnings to be fatal. However, code copied from
     # gnome-control-center uses many deprecated functions. Until we have a good
     # answer to sharing that code (#68), make those warnings non-fatal.
-    - meson -Dregion-page=${EXPLICIT_FEATURES} -Dsystemd=${EXPLICIT_FEATURES}
+    - meson -Dsystemd=${EXPLICIT_FEATURES}
       --auto-features ${AUTO_FEATURES}
       -Dwerror=true -Dc_args=-Wno-error=deprecated-declarations
       _build .
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index c6d57e6..4e7e6a7 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -33,7 +33,6 @@
 #endif
 
 #include "pages/language/gis-language-page.h"
-#include "pages/region/gis-region-page.h"
 #include "pages/keyboard/gis-keyboard-page.h"
 #include "pages/eulas/gis-eula-pages.h"
 #include "pages/network/gis-network-page.h"
@@ -65,9 +64,6 @@ typedef struct {
 
 static PageData page_table[] = {
   PAGE (language, FALSE),
-#ifdef ENABLE_REGION_PAGE
-  PAGE (region,   FALSE),
-#endif /* ENABLE_REGION_PAGE */
   PAGE (keyboard, FALSE),
   PAGE (eula,     FALSE),
   PAGE (network,  FALSE),
diff --git a/gnome-initial-setup/pages/meson.build b/gnome-initial-setup/pages/meson.build
index de15c2c..2815768 100644
--- a/gnome-initial-setup/pages/meson.build
+++ b/gnome-initial-setup/pages/meson.build
@@ -11,10 +11,6 @@ pages = [
    'summary',
 ]
 
-if get_option('region-page')
-   pages += ['region']
-endif
-
 foreach page: pages
     subdir (page)
 endforeach
diff --git a/meson.build b/meson.build
index d892c8a..9af4cee 100644
--- a/meson.build
+++ b/meson.build
@@ -27,7 +27,6 @@ conf.set_quoted('VENDOR_CONF_FILE', vendor_conf_file)
 conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 conf.set_quoted('GNOMELOCALEDIR', locale_dir)
 conf.set_quoted('PKGDATADIR', pkgdata_dir)
-conf.set('ENABLE_REGION_PAGE', get_option('region-page'))
 conf.set('SECRET_API_SUBJECT_TO_CHANGE', true)
 conf.set_quoted('G_LOG_DOMAIN', 'InitialSetup')
 
diff --git a/meson_options.txt b/meson_options.txt
index b127c18..2d475e1 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,12 +3,6 @@ option('vendor-conf-file',
        description: 'points to a keyfile containing vendor customization'
 )
 
-option('region-page',
-       description: 'builds and enables the region page',
-       type: 'boolean',
-       value: false
-)
-
 option('cheese',
        description: 'enable support for Cheese',
        type: 'feature',
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a38e6e7..51cf942 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -33,9 +33,6 @@ gnome-initial-setup/pages/password/gis-password-page.ui
 gnome-initial-setup/pages/password/pw-utils.c
 gnome-initial-setup/pages/privacy/gis-privacy-page.c
 gnome-initial-setup/pages/privacy/gis-privacy-page.ui
-gnome-initial-setup/pages/region/cc-region-chooser.c
-gnome-initial-setup/pages/region/gis-region-page.c
-gnome-initial-setup/pages/region/gis-region-page.ui
 gnome-initial-setup/pages/summary/gis-summary-page.c
 gnome-initial-setup/pages/summary/gis-summary-page.ui
 gnome-initial-setup/pages/timezone/gis-timezone-page.c