[gnome-software: 14/18] odrs: Drop the ODRS plugin

[Philip Withnall <pwithnall src gnome org>]

commit b248a8f855a482a1acc4bd754021561015c1a79c
Author: Philip Withnall <pwithnall endlessos org>
Date:   Wed May 19 12:13:18 2021 +0100

    odrs: Drop the ODRS plugin
    
    Its functionality has now been fully integrated into the main
    gnome-software code. This is one more step towards eliminating
    interaction between plugins.
    
    The ODRS functionality can still be disabled at runtime by setting the
    `review-server` GSettings key to the empty string.
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>

 contrib/gnome-software.spec.in                     |  2 -
 meson_options.txt                                  |  1 -
 plugins/dummy/gs-plugin-dummy.c                    |  1 -
 plugins/meson.build                                |  3 -
 plugins/odrs/gs-plugin-odrs.c                      | 99 ----------------------
 plugins/odrs/meson.build                           | 24 ------
 .../org.gnome.Software.Plugin.Odrs.metainfo.xml.in | 12 ---
 po/POTFILES.in                                     |  2 -
 8 files changed, 144 deletions(-)
---
diff --git a/contrib/gnome-software.spec.in b/contrib/gnome-software.spec.in
index 3d770d330..6bc8c0180 100644
--- a/contrib/gnome-software.spec.in
+++ b/contrib/gnome-software.spec.in
@@ -150,7 +150,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/metainfo/org.gnome.Software.appdata.xml
 %{_datadir}/metainfo/org.gnome.Software.Plugin.Flatpak.metainfo.xml
 %{_datadir}/metainfo/org.gnome.Software.Plugin.Fwupd.metainfo.xml
-%{_datadir}/metainfo/org.gnome.Software.Plugin.Odrs.metainfo.xml
 %dir %{gs_plugin_dir}
 %{gs_plugin_dir}/libgs_plugin_appstream.so
 %{gs_plugin_dir}/libgs_plugin_dummy.so
@@ -163,7 +162,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{gs_plugin_dir}/libgs_plugin_hardcoded-popular.so
 %{gs_plugin_dir}/libgs_plugin_icons.so
 %{gs_plugin_dir}/libgs_plugin_modalias.so
-%{gs_plugin_dir}/libgs_plugin_odrs.so
 %{gs_plugin_dir}/libgs_plugin_os-release.so
 %{gs_plugin_dir}/libgs_plugin_packagekit-history.so
 %{gs_plugin_dir}/libgs_plugin_packagekit-local.so
diff --git a/meson_options.txt b/meson_options.txt
index f8ffcdb69..7da9da130 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -10,7 +10,6 @@ option('fwupd', type : 'boolean', value : true, description : 'enable fwupd supp
 option('flatpak', type : 'boolean', value : true, description : 'enable Flatpak support')
 option('malcontent', type : 'boolean', value : true, description : 'enable parental controls support using 
libmalcontent')
 option('rpm_ostree', type : 'boolean', value : false, description : 'enable rpm-ostree support')
-option('odrs', type : 'boolean', value : true, description : 'enable ODRS support')
 option('gudev', type : 'boolean', value : true, description : 'enable GUdev support')
 option('apt', type : 'boolean', value : false, description : 'enable apt: URL handler in the .desktop file')
 option('snap', type : 'boolean', value : false, description : 'enable Snap support')
diff --git a/plugins/dummy/gs-plugin-dummy.c b/plugins/dummy/gs-plugin-dummy.c
index a5640b49e..3813c4b8f 100644
--- a/plugins/dummy/gs-plugin-dummy.c
+++ b/plugins/dummy/gs-plugin-dummy.c
@@ -81,7 +81,6 @@ gs_plugin_initialize (GsPlugin *plugin)
        /* need help from appstream */
        gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "appstream");
        gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "os-release");
-       gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_CONFLICTS, "odrs");
 }
 
 void
diff --git a/plugins/meson.build b/plugins/meson.build
index 7245ef51a..3c6b68dd3 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -30,9 +30,6 @@ endif
 if get_option('malcontent')
   subdir('malcontent')
 endif
-if get_option('odrs')
-  subdir('odrs')
-endif
 if get_option('packagekit')
   subdir('packagekit')
 endif
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f6fc33671..660a91250 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -95,7 +95,5 @@ plugins/flatpak/gs-plugin-flatpak.c
 plugins/fwupd/gs-fwupd-app.c
 plugins/fwupd/gs-plugin-fwupd.c
 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/snap/gs-plugin-snap.c
 plugins/snap/org.gnome.Software.Plugin.Snap.metainfo.xml.in