[gnome-software] Drop the ostree and rpm plugins
- From: Kalev Lember <klember src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] Drop the ostree and rpm plugins
- Date: Tue, 23 Jan 2018 23:19:55 +0000 (UTC)
commit 5bff591f21fb35b69b8ac86b54820a722568d058
Author: Kalev Lember <klember redhat com>
Date: Wed Jan 24 00:11:33 2018 +0100
Drop the ostree and rpm plugins
They are superseded by the rpm-ostree plugin.
meson.build | 8 -
meson_options.txt | 2 -
plugins/meson.build | 3 -
plugins/ostree/gs-plugin-ostree.c | 131 -----------------
plugins/ostree/gs-plugin-rpm.c | 162 ----------------------
plugins/ostree/meson.build | 29 ----
plugins/packagekit/gs-plugin-packagekit-refine.c | 3 -
7 files changed, 0 insertions(+), 338 deletions(-)
---
diff --git a/meson.build b/meson.build
index c5b083b..d20fc86 100644
--- a/meson.build
+++ b/meson.build
@@ -133,10 +133,6 @@ if get_option('enable-polkit')
conf.set('HAVE_POLKIT', 1)
endif
-if get_option('enable-ostree')
- ostree = dependency('ostree-1')
-endif
-
if get_option('enable-packagekit')
packagekit = dependency('packagekit-glib2', version : '>= 1.1.0')
conf.set('HAVE_PACKAGEKIT', '1')
@@ -156,10 +152,6 @@ if get_option('enable-limba')
limba = dependency('limba', version : '>= 0.5.6')
endif
-if get_option('enable-rpm')
- rpm = dependency('rpm')
-endif
-
if get_option('enable-rpm-ostree')
ostree = dependency('ostree-1')
rpm_ostree = dependency('rpm-ostree-1')
diff --git a/meson_options.txt b/meson_options.txt
index 37864e8..5072241 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -6,9 +6,7 @@ option('enable-packagekit', type : 'boolean', value : true, description : 'enabl
option('enable-polkit', type : 'boolean', value : true, description : 'enable PolKit support')
option('enable-fwupd', type : 'boolean', value : true, description : 'enable fwupd support')
option('enable-flatpak', type : 'boolean', value : true, description : 'enable Flatpak support')
-option('enable-ostree', type : 'boolean', value : true, description : 'enable OSTree support')
option('enable-limba', type : 'boolean', value : false, description : 'enable Limba support')
-option('enable-rpm', type : 'boolean', value : true, description : 'enable RPM support')
option('enable-rpm-ostree', type : 'boolean', value : false, description : 'enable rpm-ostree support')
option('enable-steam', type : 'boolean', value : true, description : 'enable Steam support')
option('enable-shell-extensions', type : 'boolean', value : true, description : 'enable shell extensions
support')
diff --git a/plugins/meson.build b/plugins/meson.build
index c71ab26..af753e7 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -28,9 +28,6 @@ endif
if get_option('enable-odrs')
subdir('odrs')
endif
-if get_option('enable-ostree')
- subdir('ostree')
-endif
if get_option('enable-packagekit')
subdir('packagekit')
endif
diff --git a/plugins/packagekit/gs-plugin-packagekit-refine.c
b/plugins/packagekit/gs-plugin-packagekit-refine.c
index d4de99d..f274638 100644
--- a/plugins/packagekit/gs-plugin-packagekit-refine.c
+++ b/plugins/packagekit/gs-plugin-packagekit-refine.c
@@ -62,9 +62,6 @@ gs_plugin_initialize (GsPlugin *plugin)
pk_client_set_background (priv->client, FALSE);
pk_client_set_cache_age (priv->client, G_MAXUINT);
- /* we can get better results than the RPM plugin */
- gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_CONFLICTS, "rpm");
-
/* need pkgname and ID */
gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "appstream");
gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "packagekit");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]