[gnome-software] Remove the unused xdg-app plugin
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] Remove the unused xdg-app plugin
- Date: Mon, 23 May 2016 13:24:28 +0000 (UTC)
commit b1cf8a350b629c3de0f46a2f6a1b7a832b0e5f08
Author: Richard Hughes <richard hughsie com>
Date: Mon May 23 14:17:26 2016 +0100
Remove the unused xdg-app plugin
configure.ac | 23 -
src/plugins/Makefile.am | 15 -
src/plugins/gs-appstream.c | 2 +-
src/plugins/gs-plugin-flatpak.c | 3 -
src/plugins/gs-plugin-odrs.c | 1 -
src/plugins/gs-plugin-xdg-app.c | 1375 ---------------------------------------
6 files changed, 1 insertions(+), 1418 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c1d0da9..3f89d83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,28 +163,6 @@ AS_IF([test "x$have_firmware" = "xyes"], [
])
AM_CONDITIONAL(HAVE_FIRMWARE, test x$have_firmware = xyes)
-# xdg-app
-AC_ARG_ENABLE(xdg-app,
- [AS_HELP_STRING([--enable-xdg-app],
- [enable xdg-app support [default=auto]])],,
- enable_xdg_app=maybe)
-AS_IF([test "x$enable_xdg_app" != "xno"], [
- PKG_CHECK_MODULES(XDG_APP,
- [xdg-app >= 0.4.14],
- [have_xdg_app=yes],
- [have_xdg_app=no])
-], [
- have_xdg_app=no
-])
-AS_IF([test "x$have_xdg_app" = "xyes"], [
- AC_DEFINE(HAVE_XDG_APP,1,[Build xdg-app support])
-], [
- AS_IF([test "x$enable_xdg_app" = "xyes"], [
- AC_MSG_ERROR([xdg-app support requested but 'xdg-app' was not found])
- ])
-])
-AM_CONDITIONAL(HAVE_XDG_APP, test "$have_xdg_app" != no)
-
# flatpak
AC_ARG_ENABLE(flatpak,
[AS_HELP_STRING([--enable-flatpak],
@@ -359,7 +337,6 @@ echo "
PolicyKit support: ${have_polkit}
Firmware support: ${have_firmware}
Limba support: ${have_limba}
- XDG-APP support: ${have_xdg_app}
Flatpak support: ${have_flatpak}
OSTree support: ${have_ostree}
RPM support: ${have_rpm}
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 756d706..49c1677 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -13,7 +13,6 @@ AM_CPPFLAGS = \
$(JSON_GLIB_CFLAGS) \
$(LIMBA_CFLAGS) \
$(OSTREE_CFLAGS) \
- $(XDG_APP_CFLAGS) \
$(FLATPAK_CFLAGS) \
$(RPM_CFLAGS) \
-DI_KNOW_THE_GNOME_SOFTWARE_API_IS_SUBJECT_TO_CHANGE \
@@ -69,10 +68,6 @@ if HAVE_FIRMWARE
plugin_LTLIBRARIES += libgs_plugin_fwupd.la
endif
-if HAVE_XDG_APP
-plugin_LTLIBRARIES += libgs_plugin_xdg-app.la
-endif
-
if HAVE_FLATPAK
plugin_LTLIBRARIES += libgs_plugin_flatpak.la
endif
@@ -164,16 +159,6 @@ libgs_plugin_limba_la_LDFLAGS = -module -avoid-version
libgs_plugin_limba_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
endif
-if HAVE_XDG_APP
-libgs_plugin_xdg_app_la_SOURCES = \
- gs-appstream.c \
- gs-appstream.h \
- gs-plugin-xdg-app.c
-libgs_plugin_xdg_app_la_LIBADD = $(GS_PLUGIN_LIBS) $(XDG_APP_LIBS)
-libgs_plugin_xdg_app_la_LDFLAGS = -module -avoid-version
-libgs_plugin_xdg_app_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
-endif
-
if HAVE_FLATPAK
libgs_plugin_flatpak_la_SOURCES = \
gs-appstream.c \
diff --git a/src/plugins/gs-appstream.c b/src/plugins/gs-appstream.c
index b6411b8..f17360c 100644
--- a/src/plugins/gs-appstream.c
+++ b/src/plugins/gs-appstream.c
@@ -277,7 +277,7 @@ gs_refine_item_management_plugin (GsApp *app, AsApp *item)
gs_app_add_source (app, as_bundle_get_id (bundle));
/* automatically add runtime */
- if (kind == AS_BUNDLE_KIND_XDG_APP) {
+ if (kind == AS_BUNDLE_KIND_FLATPAK) {
runtime = as_bundle_get_runtime (bundle);
if (runtime != NULL) {
g_autoptr(GsApp) app2 = NULL;
diff --git a/src/plugins/gs-plugin-flatpak.c b/src/plugins/gs-plugin-flatpak.c
index 9cc9e85..cc30d2c 100644
--- a/src/plugins/gs-plugin-flatpak.c
+++ b/src/plugins/gs-plugin-flatpak.c
@@ -50,9 +50,6 @@ gs_plugin_initialize (GsPlugin *plugin)
/* getting app properties from appstream is quicker */
gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "appstream");
-
- /* this is the old name */
- gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_CONFLICTS, "xdg-app");
}
void
diff --git a/src/plugins/gs-plugin-odrs.c b/src/plugins/gs-plugin-odrs.c
index 91dff81..2332dd1 100644
--- a/src/plugins/gs-plugin-odrs.c
+++ b/src/plugins/gs-plugin-odrs.c
@@ -72,7 +72,6 @@ gs_plugin_initialize (GsPlugin *plugin)
/* need application IDs and version */
gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "appstream");
- gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "xdg-app");
gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "flatpak");
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]