[gnome-initial-setup] Remove obsolete Software page



commit 7451f79ec7d9dac266ee51674166b072083f7e92
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Thu Dec 20 16:00:41 2018 -0500

    Remove obsolete Software page
    
    Closes: https://gitlab.gnome.org/GNOME/gnome-initial-setup/issues/59

 gnome-initial-setup/gnome-initial-setup.c          |   2 -
 gnome-initial-setup/meson.build                    |   1 -
 gnome-initial-setup/pages/meson.build              |   1 -
 .../pages/software/gis-software-page.c             | 271 ---------------------
 .../pages/software/gis-software-page.h             |  58 -----
 .../pages/software/gis-software-page.ui            | 156 ------------
 gnome-initial-setup/pages/software/meson.build     |  10 -
 .../pages/software/software.gresource.xml          |   6 -
 meson.build                                        |   6 -
 meson_options.txt                                  |   6 -
 po/POTFILES.in                                     |   2 -
 11 files changed, 519 deletions(-)
---
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index 409b4b6..c6d57e6 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -39,7 +39,6 @@
 #include "pages/network/gis-network-page.h"
 #include "pages/timezone/gis-timezone-page.h"
 #include "pages/privacy/gis-privacy-page.h"
-#include "pages/software/gis-software-page.h"
 #include "pages/goa/gis-goa-page.h"
 #include "pages/account/gis-account-pages.h"
 #include "pages/password/gis-password-page.h"
@@ -74,7 +73,6 @@ static PageData page_table[] = {
   PAGE (network,  FALSE),
   PAGE (privacy,  FALSE),
   PAGE (timezone, TRUE),
-  PAGE (software, TRUE),
   PAGE (goa,      FALSE),
   PAGE (account,  TRUE),
   PAGE (password, TRUE),
diff --git a/gnome-initial-setup/meson.build b/gnome-initial-setup/meson.build
index 927ae8a..3a7a8b8 100644
--- a/gnome-initial-setup/meson.build
+++ b/gnome-initial-setup/meson.build
@@ -50,7 +50,6 @@ dependencies = [
     dependency ('webkit2gtk-4.0'),
     cheese_dep,
     cheese_gtk_dep,
-    pkgkit_dep,
     ibus_dep,
 ]
 
diff --git a/gnome-initial-setup/pages/meson.build b/gnome-initial-setup/pages/meson.build
index 7366385..de15c2c 100644
--- a/gnome-initial-setup/pages/meson.build
+++ b/gnome-initial-setup/pages/meson.build
@@ -9,7 +9,6 @@ pages = [
    'goa',
    'password',
    'summary',
-   'software'
 ]
 
 if get_option('region-page')
diff --git a/meson.build b/meson.build
index 1ed2e98..d892c8a 100644
--- a/meson.build
+++ b/meson.build
@@ -52,12 +52,6 @@ cheese_gtk_dep = dependency ('cheese-gtk',
                          required: get_option('cheese'))
 conf.set('HAVE_CHEESE', cheese_dep.found() and cheese_gtk_dep.found())
 
-# Needed for the 'software' page
-pkgkit_dep = dependency ('packagekit-glib2',
-                         version: '>= 1.1.4',
-                         required: get_option('software-sources'))
-conf.set('ENABLE_SOFTWARE_SOURCES', pkgkit_dep.found())
-
 # Needed for the 'keyboard' page
 ibus_dep = dependency ('ibus-1.0',
                        version: '>= 1.4.99',
diff --git a/meson_options.txt b/meson_options.txt
index fc01864..b127c18 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -15,12 +15,6 @@ option('cheese',
        value: 'auto'
 )
 
-option('software-sources',
-       description: 'enable the Software Sources page',
-       type: 'feature',
-       value: 'auto'
-)
-
 option('ibus',
        description: 'enable support for IBus',
        type: 'feature',
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ba16a54..a38e6e7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -36,8 +36,6 @@ 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/software/gis-software-page.c
-gnome-initial-setup/pages/software/gis-software-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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]