Drop libgsystem dependency

2016-08-22 16:00:33 +02:00 · 2016-08-22 16:00:33 +02:00 · 6578d37984
parent 467932e418
commit 6578d37984
39 changed files with 2 additions and 39 deletions
--- a/app/flatpak-builtins-add-remote.c
+++ b/app/flatpak-builtins-add-remote.c
@ -29,7 +29,6 @@

 #include <gio/gunixinputstream.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-build-bundle.c
+++ b/app/flatpak-builtins-build-bundle.c
@ -29,7 +29,6 @@

 #include <gio/gunixinputstream.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-build-commit-from.c
+++ b/app/flatpak-builtins-build-commit-from.c
@ -27,7 +27,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-build-export.c
+++ b/app/flatpak-builtins-build-export.c
@ -27,7 +27,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-build-finish.c
+++ b/app/flatpak-builtins-build-finish.c
@ -28,7 +28,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-build-import-bundle.c
+++ b/app/flatpak-builtins-build-import-bundle.c
@ -27,7 +27,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-build-init.c
+++ b/app/flatpak-builtins-build-init.c
@ -27,7 +27,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-build-sign.c
+++ b/app/flatpak-builtins-build-sign.c
@ -27,7 +27,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-build.c
+++ b/app/flatpak-builtins-build.c
@ -28,7 +28,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-delete-remote.c
+++ b/app/flatpak-builtins-delete-remote.c
@ -27,7 +27,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-document-export.c
+++ b/app/flatpak-builtins-document-export.c
@ -28,7 +28,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"
 #include "document-portal/xdp-dbus.h"

--- a/app/flatpak-builtins-document-info.c
+++ b/app/flatpak-builtins-document-info.c
@ -28,7 +28,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"
 #include "document-portal/xdp-dbus.h"

--- a/app/flatpak-builtins-document-list.c
+++ b/app/flatpak-builtins-document-list.c
@ -28,7 +28,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"
 #include "document-portal/xdp-dbus.h"

--- a/app/flatpak-builtins-document-unexport.c
+++ b/app/flatpak-builtins-document-unexport.c
@ -28,7 +28,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"
 #include "document-portal/xdp-dbus.h"

--- a/app/flatpak-builtins-enter.c
+++ b/app/flatpak-builtins-enter.c
@ -29,7 +29,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-info.c
+++ b/app/flatpak-builtins-info.c
@ -27,7 +27,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-install.c
+++ b/app/flatpak-builtins-install.c
@ -29,7 +29,6 @@

 #include <gio/gunixinputstream.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-list-remotes.c
+++ b/app/flatpak-builtins-list-remotes.c
@ -27,7 +27,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-list.c
+++ b/app/flatpak-builtins-list.c
@ -27,7 +27,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-ls-remote.c
+++ b/app/flatpak-builtins-ls-remote.c
@ -27,7 +27,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-make-current.c
+++ b/app/flatpak-builtins-make-current.c
@ -27,7 +27,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-override.c
+++ b/app/flatpak-builtins-override.c
@ -29,7 +29,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-repo-update.c
+++ b/app/flatpak-builtins-repo-update.c
@ -27,7 +27,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-run.c
+++ b/app/flatpak-builtins-run.c
@ -29,7 +29,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-uninstall.c
+++ b/app/flatpak-builtins-uninstall.c
@ -27,7 +27,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-builtins-update.c
+++ b/app/flatpak-builtins-update.c
@ -27,7 +27,6 @@

 #include <glib/gi18n.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-builtins.h"
--- a/app/flatpak-main.c
+++ b/app/flatpak-main.c
@ -29,7 +29,6 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include "libglnx/libglnx.h"
-#include "libgsystem.h"

 #include "flatpak-builtins.h"
 #include "flatpak-utils.h"
--- a/builder/builder-cache.c
+++ b/builder/builder-cache.c
@ -30,7 +30,6 @@
 #include <gio/gio.h>
 #include <ostree.h>
 #include "libglnx/libglnx.h"
-#include "libgsystem.h"

 #include "flatpak-utils.h"
 #include "builder-utils.h"
--- a/builder/builder-main.c
+++ b/builder/builder-main.c
@ -27,7 +27,6 @@

 #include <gio/gio.h>
 #include "libglnx/libglnx.h"
-#include "libgsystem.h"

 #include "builder-manifest.h"
 #include "builder-utils.h"
--- 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"
--- a/builder/builder-module.c
+++ b/builder/builder-module.c
@ -29,7 +29,6 @@

 #include <gio/gio.h>
 #include "libglnx/libglnx.h"
-#include "libgsystem.h"

 #include "flatpak-utils.h"
 #include "builder-utils.h"
--- a/builder/builder-source-git.c
+++ b/builder/builder-source-git.c
@ -28,7 +28,6 @@
 #include <sys/statfs.h>

 #include "builder-utils.h"
-#include "libgsystem.h"

 #include "builder-source-git.h"
 #include "builder-utils.h"
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@ -30,7 +30,6 @@
 #include <glib/gi18n.h>

 #include <gio/gio.h>
-#include "libgsystem.h"
 #include "libglnx/libglnx.h"
 #include "lib/flatpak-error.h"

--- a/common/flatpak-run.c
+++ b/common/flatpak-run.c
@ -39,7 +39,6 @@
 #include <glib/gi18n.h>

 #include <gio/gio.h>
-#include "libgsystem.h"
 #include "libglnx/libglnx.h"

 #include "flatpak-run.h"
--- a/common/flatpak-utils.c
+++ b/common/flatpak-utils.c
@ -39,7 +39,6 @@
 #include <sys/utsname.h>

 #include <glib.h>
-#include "libgsystem.h"
 #include "libglnx/libglnx.h"
 #include <libsoup/soup.h>
 #include <gio/gunixoutputstream.h>
--- a/common/flatpak-utils.h
+++ b/common/flatpak-utils.h
@ -23,7 +23,6 @@

 #include <string.h>

-#include "libgsystem.h"
 #include "libglnx/libglnx.h"
 #include <gio/gio.h>
 #include <libsoup/soup.h>
--- 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
--- 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
--- a/lib/flatpak-installation.c
+++ b/lib/flatpak-installation.c
@ -22,7 +22,6 @@

 #include <string.h>

-#include "libgsystem.h"
 #include "flatpak-utils.h"
 #include "flatpak-installation.h"
 #include "flatpak-installed-ref-private.h"