From 6578d37984b877937d08e497e4c6a5159679cd14 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 22 Aug 2016 16:00:33 +0200 Subject: [PATCH] Drop libgsystem dependency --- app/flatpak-builtins-add-remote.c | 1 - app/flatpak-builtins-build-bundle.c | 1 - app/flatpak-builtins-build-commit-from.c | 1 - app/flatpak-builtins-build-export.c | 1 - app/flatpak-builtins-build-finish.c | 1 - app/flatpak-builtins-build-import-bundle.c | 1 - app/flatpak-builtins-build-init.c | 1 - app/flatpak-builtins-build-sign.c | 1 - app/flatpak-builtins-build.c | 1 - app/flatpak-builtins-delete-remote.c | 1 - app/flatpak-builtins-document-export.c | 1 - app/flatpak-builtins-document-info.c | 1 - app/flatpak-builtins-document-list.c | 1 - app/flatpak-builtins-document-unexport.c | 1 - app/flatpak-builtins-enter.c | 1 - app/flatpak-builtins-info.c | 1 - app/flatpak-builtins-install.c | 1 - app/flatpak-builtins-list-remotes.c | 1 - app/flatpak-builtins-list.c | 1 - app/flatpak-builtins-ls-remote.c | 1 - app/flatpak-builtins-make-current.c | 1 - app/flatpak-builtins-override.c | 1 - app/flatpak-builtins-repo-update.c | 1 - app/flatpak-builtins-run.c | 1 - app/flatpak-builtins-uninstall.c | 1 - app/flatpak-builtins-update.c | 1 - app/flatpak-main.c | 1 - builder/builder-cache.c | 1 - builder/builder-main.c | 1 - builder/builder-manifest.c | 1 - builder/builder-module.c | 1 - builder/builder-source-git.c | 1 - common/flatpak-dir.c | 1 - common/flatpak-run.c | 1 - common/flatpak-utils.c | 1 - common/flatpak-utils.h | 1 - configure.ac | 2 +- flatpak.pc.in | 2 +- lib/flatpak-installation.c | 1 - 39 files changed, 2 insertions(+), 39 deletions(-) diff --git a/app/flatpak-builtins-add-remote.c b/app/flatpak-builtins-add-remote.c index 2620bf70..c1f65fe3 100644 --- a/app/flatpak-builtins-add-remote.c +++ b/app/flatpak-builtins-add-remote.c @@ -29,7 +29,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-build-bundle.c b/app/flatpak-builtins-build-bundle.c index 502dabcd..78c6b8d7 100644 --- a/app/flatpak-builtins-build-bundle.c +++ b/app/flatpak-builtins-build-bundle.c @@ -29,7 +29,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-build-commit-from.c b/app/flatpak-builtins-build-commit-from.c index a1508b38..3e5c1e48 100644 --- a/app/flatpak-builtins-build-commit-from.c +++ b/app/flatpak-builtins-build-commit-from.c @@ -27,7 +27,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-build-export.c b/app/flatpak-builtins-build-export.c index 3e77c33f..e3f0c952 100644 --- a/app/flatpak-builtins-build-export.c +++ b/app/flatpak-builtins-build-export.c @@ -27,7 +27,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-build-finish.c b/app/flatpak-builtins-build-finish.c index d2897eae..0ed02edc 100644 --- a/app/flatpak-builtins-build-finish.c +++ b/app/flatpak-builtins-build-finish.c @@ -28,7 +28,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-build-import-bundle.c b/app/flatpak-builtins-build-import-bundle.c index ba4bca80..5f9b3e14 100644 --- a/app/flatpak-builtins-build-import-bundle.c +++ b/app/flatpak-builtins-build-import-bundle.c @@ -27,7 +27,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-build-init.c b/app/flatpak-builtins-build-init.c index 6d6a28ee..742c4c9a 100644 --- a/app/flatpak-builtins-build-init.c +++ b/app/flatpak-builtins-build-init.c @@ -27,7 +27,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-build-sign.c b/app/flatpak-builtins-build-sign.c index 1f7d3f58..dbb50585 100644 --- a/app/flatpak-builtins-build-sign.c +++ b/app/flatpak-builtins-build-sign.c @@ -27,7 +27,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-build.c b/app/flatpak-builtins-build.c index a36090c4..b32cd028 100644 --- a/app/flatpak-builtins-build.c +++ b/app/flatpak-builtins-build.c @@ -28,7 +28,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-delete-remote.c b/app/flatpak-builtins-delete-remote.c index d3fae816..9699a876 100644 --- a/app/flatpak-builtins-delete-remote.c +++ b/app/flatpak-builtins-delete-remote.c @@ -27,7 +27,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-document-export.c b/app/flatpak-builtins-document-export.c index f3be9ddd..5ea981f5 100644 --- a/app/flatpak-builtins-document-export.c +++ b/app/flatpak-builtins-document-export.c @@ -28,7 +28,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "document-portal/xdp-dbus.h" diff --git a/app/flatpak-builtins-document-info.c b/app/flatpak-builtins-document-info.c index c3bdda1d..0181ead6 100644 --- a/app/flatpak-builtins-document-info.c +++ b/app/flatpak-builtins-document-info.c @@ -28,7 +28,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "document-portal/xdp-dbus.h" diff --git a/app/flatpak-builtins-document-list.c b/app/flatpak-builtins-document-list.c index d316762c..6035cec4 100644 --- a/app/flatpak-builtins-document-list.c +++ b/app/flatpak-builtins-document-list.c @@ -28,7 +28,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "document-portal/xdp-dbus.h" diff --git a/app/flatpak-builtins-document-unexport.c b/app/flatpak-builtins-document-unexport.c index 9bcb2176..331d86b0 100644 --- a/app/flatpak-builtins-document-unexport.c +++ b/app/flatpak-builtins-document-unexport.c @@ -28,7 +28,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "document-portal/xdp-dbus.h" diff --git a/app/flatpak-builtins-enter.c b/app/flatpak-builtins-enter.c index dc2e579e..5cbc7d1b 100644 --- a/app/flatpak-builtins-enter.c +++ b/app/flatpak-builtins-enter.c @@ -29,7 +29,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-info.c b/app/flatpak-builtins-info.c index bb5ec32f..d1e1ec52 100644 --- a/app/flatpak-builtins-info.c +++ b/app/flatpak-builtins-info.c @@ -27,7 +27,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-install.c b/app/flatpak-builtins-install.c index c033529f..3ec04259 100644 --- a/app/flatpak-builtins-install.c +++ b/app/flatpak-builtins-install.c @@ -29,7 +29,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-list-remotes.c b/app/flatpak-builtins-list-remotes.c index 04bc9920..dfdcf1b4 100644 --- a/app/flatpak-builtins-list-remotes.c +++ b/app/flatpak-builtins-list-remotes.c @@ -27,7 +27,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-list.c b/app/flatpak-builtins-list.c index e23a71f3..4a9ec8b2 100644 --- a/app/flatpak-builtins-list.c +++ b/app/flatpak-builtins-list.c @@ -27,7 +27,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-ls-remote.c b/app/flatpak-builtins-ls-remote.c index 7b29669a..30a3adf2 100644 --- a/app/flatpak-builtins-ls-remote.c +++ b/app/flatpak-builtins-ls-remote.c @@ -27,7 +27,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-make-current.c b/app/flatpak-builtins-make-current.c index 348b4cdc..b13534a4 100644 --- a/app/flatpak-builtins-make-current.c +++ b/app/flatpak-builtins-make-current.c @@ -27,7 +27,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-override.c b/app/flatpak-builtins-override.c index bd807eea..27b30b04 100644 --- a/app/flatpak-builtins-override.c +++ b/app/flatpak-builtins-override.c @@ -29,7 +29,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-repo-update.c b/app/flatpak-builtins-repo-update.c index f7856a73..03846003 100644 --- a/app/flatpak-builtins-repo-update.c +++ b/app/flatpak-builtins-repo-update.c @@ -27,7 +27,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-run.c b/app/flatpak-builtins-run.c index 49f70d01..436cbb06 100644 --- a/app/flatpak-builtins-run.c +++ b/app/flatpak-builtins-run.c @@ -29,7 +29,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-uninstall.c b/app/flatpak-builtins-uninstall.c index 58fbc319..9f3540ec 100644 --- a/app/flatpak-builtins-uninstall.c +++ b/app/flatpak-builtins-uninstall.c @@ -27,7 +27,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-builtins-update.c b/app/flatpak-builtins-update.c index 78ada40a..f87c8fd0 100644 --- a/app/flatpak-builtins-update.c +++ b/app/flatpak-builtins-update.c @@ -27,7 +27,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-builtins.h" diff --git a/app/flatpak-main.c b/app/flatpak-main.c index acda460f..158b8539 100644 --- a/app/flatpak-main.c +++ b/app/flatpak-main.c @@ -29,7 +29,6 @@ #include #include #include "libglnx/libglnx.h" -#include "libgsystem.h" #include "flatpak-builtins.h" #include "flatpak-utils.h" diff --git a/builder/builder-cache.c b/builder/builder-cache.c index 4fcc7da3..20b8aaa0 100644 --- a/builder/builder-cache.c +++ b/builder/builder-cache.c @@ -30,7 +30,6 @@ #include #include #include "libglnx/libglnx.h" -#include "libgsystem.h" #include "flatpak-utils.h" #include "builder-utils.h" diff --git a/builder/builder-main.c b/builder/builder-main.c index 109de226..d3779a5d 100644 --- a/builder/builder-main.c +++ b/builder/builder-main.c @@ -27,7 +27,6 @@ #include #include "libglnx/libglnx.h" -#include "libgsystem.h" #include "builder-manifest.h" #include "builder-utils.h" diff --git a/builder/builder-manifest.c b/builder/builder-manifest.c index 9e1f7e9c..b65b362e 100644 --- a/builder/builder-manifest.c +++ b/builder/builder-manifest.c @@ -31,7 +31,6 @@ #include "builder-utils.h" #include "flatpak-utils.h" -#include "libgsystem.h" #include "libglnx/libglnx.h" #define LOCALES_SEPARATE_DIR "share/runtime/locale" diff --git a/builder/builder-module.c b/builder/builder-module.c index d02569c3..d928a4a3 100644 --- a/builder/builder-module.c +++ b/builder/builder-module.c @@ -29,7 +29,6 @@ #include #include "libglnx/libglnx.h" -#include "libgsystem.h" #include "flatpak-utils.h" #include "builder-utils.h" diff --git a/builder/builder-source-git.c b/builder/builder-source-git.c index a125cc1d..8500d9db 100644 --- a/builder/builder-source-git.c +++ b/builder/builder-source-git.c @@ -28,7 +28,6 @@ #include #include "builder-utils.h" -#include "libgsystem.h" #include "builder-source-git.h" #include "builder-utils.h" diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index 2d960c48..b461de73 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -30,7 +30,6 @@ #include #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "lib/flatpak-error.h" diff --git a/common/flatpak-run.c b/common/flatpak-run.c index d18dfd03..b457ec21 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c @@ -39,7 +39,6 @@ #include #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include "flatpak-run.h" diff --git a/common/flatpak-utils.c b/common/flatpak-utils.c index ca1590f5..a224be9c 100644 --- a/common/flatpak-utils.c +++ b/common/flatpak-utils.c @@ -39,7 +39,6 @@ #include #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include #include diff --git a/common/flatpak-utils.h b/common/flatpak-utils.h index e9f36ff1..8c96a48b 100644 --- a/common/flatpak-utils.h +++ b/common/flatpak-utils.h @@ -23,7 +23,6 @@ #include -#include "libgsystem.h" #include "libglnx/libglnx.h" #include #include diff --git a/configure.ac b/configure.ac index 3e6dc6dd..b1cf2359 100644 --- a/configure.ac +++ b/configure.ac @@ -160,7 +160,7 @@ if test "x$enable_sandboxed_triggers" = "xno"; then [Define if sandboxed triggers are disabled]) fi -PKG_CHECK_MODULES(OSTREE, [libgsystem >= 2015.1 ostree-1 >= 2016.7]) +PKG_CHECK_MODULES(OSTREE, [ostree-1 >= 2016.7]) save_LIBS=$LIBS save_CFLAGS=$CFLAGS LIBS=$OSTREE_LIBS diff --git a/flatpak.pc.in b/flatpak.pc.in index fb62da84..2ba10686 100644 --- a/flatpak.pc.in +++ b/flatpak.pc.in @@ -11,6 +11,6 @@ Name: flatpak Description: Application sandboxing framework Version: @VERSION@ Requires: glib-2.0 gio-2.0 -Requires.private: gio-unix-2.0 ostree-1 libgsystem +Requires.private: gio-unix-2.0 ostree-1 Libs: -L${libdir} -lflatpak Cflags: -I${includedir}/flatpak diff --git a/lib/flatpak-installation.c b/lib/flatpak-installation.c index 4474ceaf..ccd8ff3b 100644 --- a/lib/flatpak-installation.c +++ b/lib/flatpak-installation.c @@ -22,7 +22,6 @@ #include -#include "libgsystem.h" #include "flatpak-utils.h" #include "flatpak-installation.h" #include "flatpak-installed-ref-private.h"