GNOME.org
 

[gnome-software/wip/kalev/drop-snap-support: 1/2] Drop snap support

commit d1b110ee523051be9d35f9d75e2fe1e084582236
Author: Kalev Lember <klember redhat com>
Date:   Tue Jul 9 18:19:51 2019 +0300

    Drop snap support
    
    Ubuntu is switching to a new snap-store app for installing and removing
    snaps. This commit drops the snap backend from gnome-software to avoid
    maintenance overhead.

 README.md                                          |    2 +-
 contrib/gnome-software.spec.in                     |   25 -
 meson.build                                        |    4 -
 meson_options.txt                                  |    1 -
 plugins/dummy/gs-plugin-dummy.c                    |    2 +-
 plugins/meson.build                                |    3 -
 plugins/snap/gs-plugin-snap.c                      | 1151 --------------------
 plugins/snap/gs-self-test.c                        |  329 ------
 plugins/snap/meson.build                           |   54 -
 .../org.gnome.Software.Plugin.Snap.metainfo.xml.in |   12 -
 po/POTFILES.in                                     |    2 -
 src/gnome-software-local-file.desktop.in           |    2 +-
 src/gs-updates-section.c                           |    2 +-
 src/org.gnome.Software.desktop.in                  |    2 +-
 14 files changed, 5 insertions(+), 1586 deletions(-)
---
diff --git a/README.md b/README.md
index c40a273c..1e63c7f9 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 A plugin system is used to access software from different sources.
 Plugins are provided for:
  - Traditional package installation via PackageKit (e.g. Debian package, RPM).
- - Next generation packages: [Flatpak](https://flatpak.org/) and [Snap](https://snapcraft.io/).
+ - Next generation packages: [Flatpak](https://flatpak.org/).
  - Firmware updates.
  - Ratings and reviews using [ODRS](https://odrs.gnome.org/).
 
diff --git a/contrib/gnome-software.spec.in b/contrib/gnome-software.spec.in
index aeb9b552..576f33de 100644
--- a/contrib/gnome-software.spec.in
+++ b/contrib/gnome-software.spec.in
@@ -46,9 +46,6 @@ BuildRequires: rpm-ostree-devel
 BuildRequires: libgudev1-devel
 BuildRequires: valgrind-devel
 BuildRequires: liboauth-devel
-%if 0%{?fedora}
-BuildRequires: snapd-glib-devel >= 1.42
-%endif
 
 Requires: appstream-data
 %if 0%{?fedora}
@@ -93,27 +90,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %description editor
 Editor for designing banners for GNOME Software.
 
-%if 0%{?fedora}
-%package snap
-Summary: Support for Ubuntu Snap packages
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: snapd-login-service
-Supplements: (gnome-software%{?_isa} and snapd%{?_isa})
-
-%description snap
-Adds support for Snap packages from the Snap store.
-%endif
-
 %prep
 %autosetup -p1
 
 %build
 %meson \
-%if 0%{?fedora}
-    -Dsnap=true \
-%else
-    -Dsnap=false \
-%endif
     -Dgudev=true \
     -Dpackagekit=true \
     -Dexternal_appstream=false \
@@ -205,12 +186,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_libexecdir}/gnome-software-cmd
 %{_libexecdir}/gnome-software-restarter
 
-%if 0%{?fedora}
-%files snap
-%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_snap.so
-%{_datadir}/metainfo/org.gnome.Software.Plugin.Snap.metainfo.xml
-%endif
-
 %files devel
 %{_libdir}/pkgconfig/gnome-software.pc
 %dir %{_includedir}/gnome-software
diff --git a/meson.build b/meson.build
index 51c5648a..db2bcd03 100644
--- a/meson.build
+++ b/meson.build
@@ -172,10 +172,6 @@ if get_option('gudev')
   gudev = dependency('gudev-1.0')
 endif
 
-if get_option('snap')
-  snap = dependency('snapd-glib', version : '>= 1.48')
-endif
-
 gnome = import('gnome')
 i18n = import('i18n')
 
diff --git a/meson_options.txt b/meson_options.txt
index 0f961d9a..11549231 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -13,7 +13,6 @@ option('shell_extensions', type : 'boolean', value : true, description : 'enable
 option('odrs', type : 'boolean', value : true, description : 'enable ODRS support')
 option('webapps', type : 'boolean', value : true, description : 'enable webapps support')
 option('gudev', type : 'boolean', value : true, description : 'enable GUdev support')
-option('snap', type : 'boolean', value : false, description : 'enable Snap support')
 option('external_appstream', type : 'boolean', value : false, description : 'enable external AppStream 
support')
 option('valgrind', type : 'boolean', value : true, description : 'enable Valgrind debugging integration')
 option('gtk_doc', type : 'boolean', value : true, description : 'enable API reference')
diff --git a/plugins/dummy/gs-plugin-dummy.c b/plugins/dummy/gs-plugin-dummy.c
index bb3b1b12..1b70c085 100644
--- a/plugins/dummy/gs-plugin-dummy.c
+++ b/plugins/dummy/gs-plugin-dummy.c
@@ -495,7 +495,7 @@ gs_plugin_add_popular (GsPlugin *plugin,
        /* add again, this time with a prefix so it gets deduplicated */
        app2 = gs_app_new ("zeus.desktop");
        gs_app_set_scope (app2, AS_APP_SCOPE_USER);
-       gs_app_set_bundle_kind (app2, AS_BUNDLE_KIND_SNAP);
+       gs_app_set_bundle_kind (app2, AS_BUNDLE_KIND_FLATPAK);
        gs_app_set_metadata (app2, "GnomeSoftware::Creator",
                             gs_plugin_get_name (plugin));
        gs_app_list_add (list, app2);
diff --git a/plugins/meson.build b/plugins/meson.build
index c941fef1..d37dd702 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -39,9 +39,6 @@ endif
 if get_option('shell_extensions')
   subdir('shell-extensions')
 endif
-if get_option('snap')
-  subdir('snap')
-endif
 if get_option('external_appstream')
   subdir('external-appstream')
 endif
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cf7dafed..e9e41ea1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -94,5 +94,3 @@ plugins/fwupd/org.gnome.Software.Plugin.Fwupd.metainfo.xml.in
 plugins/odrs/gs-plugin-odrs.c
 plugins/odrs/org.gnome.Software.Plugin.Odrs.metainfo.xml.in
 plugins/shell-extensions/gs-plugin-shell-extensions.c
-plugins/snap/gs-plugin-snap.c
-plugins/snap/org.gnome.Software.Plugin.Snap.metainfo.xml.in
diff --git a/src/gnome-software-local-file.desktop.in b/src/gnome-software-local-file.desktop.in
index 1126b7b7..7179aeec 100644
--- a/src/gnome-software-local-file.desktop.in
+++ b/src/gnome-software-local-file.desktop.in
@@ -9,4 +9,4 @@ Type=Application
 Icon=system-software-install
 StartupNotify=true
 NoDisplay=true
-MimeType=application/x-rpm;application/x-redhat-package-manager;application/x-deb;application/x-app-package;application/vnd.ms-cab-compressed;application/vnd.flatpak;application/vnd.flatpak.repo;application/vnd.flatpak.ref;application/vnd.snap;
+MimeType=application/x-rpm;application/x-redhat-package-manager;application/x-deb;application/x-app-package;application/vnd.ms-cab-compressed;application/vnd.flatpak;application/vnd.flatpak.repo;application/vnd.flatpak.ref;
diff --git a/src/gs-updates-section.c b/src/gs-updates-section.c
index 5806371a..60289913 100644
--- a/src/gs-updates-section.c
+++ b/src/gs-updates-section.c
@@ -415,7 +415,7 @@ _build_section_header (GsUpdatesSection *self)
                label = gtk_label_new (_("Requires Restart"));
        } else if (self->kind == GS_UPDATES_SECTION_KIND_ONLINE) {
                /* TRANSLATORS: This is the header for online runtime and
-                * app updates, typically flatpaks or snaps */
+                * app updates, typically flatpaks */
                label = gtk_label_new (_("Application Updates"));
        } else if (self->kind == GS_UPDATES_SECTION_KIND_ONLINE_FIRMWARE) {
                /* TRANSLATORS: This is the header for device firmware that can
diff --git a/src/org.gnome.Software.desktop.in b/src/org.gnome.Software.desktop.in
index dde6bad1..b50a1b19 100644
--- a/src/org.gnome.Software.desktop.in
+++ b/src/org.gnome.Software.desktop.in
@@ -10,7 +10,7 @@ Categories=GNOME;GTK;System;PackageManager;
 # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 Keywords=Updates;Upgrade;Sources;Repositories;Preferences;Install;Uninstall;Program;Software;App;Store;
 StartupNotify=true
-MimeType=x-scheme-handler/appstream;x-scheme-handler/apt;x-scheme-handler/snap;
+MimeType=x-scheme-handler/appstream;x-scheme-handler/apt;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-software
 X-GNOME-Bugzilla-Component=gnome-software
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]