From 19e764cea24464bd6f6761d35903e204a0e69422 Mon Sep 17 00:00:00 2001
From: Dan Nicholson <nicholson@endlessm.com>
Date: Fri, 26 Jul 2019 10:42:42 -0600
Subject: [PATCH] lib/kargs: Don't expose OstreeKernelArgs autoptr cleanup on
 old glib

Move the OstreeKernelArgs autoptr cleanup definition to
ostree-autocleanups.h, which will only expose the definitions when
building ostree or if glib is new enough. The include of
ostree-kernel-args.h needs to be moved before ostree-autocleanups.h in
ostree.h so that the OstreeKernelArgs type is declared when the autoptr
cleanup is defined. All the places it's used already pull in libglnx.h
first so that the compat macros are picked up if glib it too old during
the ostree build.

Closes: #1892
Approved by: jlebon
---
 src/libostree/ostree-autocleanups.h | 1 +
 src/libostree/ostree-kernel-args.h  | 2 --
 src/libostree/ostree.h              | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/libostree/ostree-autocleanups.h b/src/libostree/ostree-autocleanups.h
index 9a54aee7..c07f88a8 100644
--- a/src/libostree/ostree-autocleanups.h
+++ b/src/libostree/ostree-autocleanups.h
@@ -51,6 +51,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (OstreeAsyncProgress, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (OstreeBootconfigParser, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (OstreeDeployment, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (OstreeGpgVerifyResult, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (OstreeKernelArgs, ostree_kernel_args_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (OstreeMutableTree, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (OstreeRepo, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (OstreeRepoFile, g_object_unref)
diff --git a/src/libostree/ostree-kernel-args.h b/src/libostree/ostree-kernel-args.h
index d7beca51..3975ae5c 100644
--- a/src/libostree/ostree-kernel-args.h
+++ b/src/libostree/ostree-kernel-args.h
@@ -35,8 +35,6 @@ GPtrArray *_ostree_kernel_arg_get_key_array (OstreeKernelArgs *kargs);
 _OSTREE_PUBLIC
 void ostree_kernel_args_free (OstreeKernelArgs *kargs);
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(OstreeKernelArgs, ostree_kernel_args_free)
-
 _OSTREE_PUBLIC
 OstreeKernelArgs *ostree_kernel_args_new (void);
 
diff --git a/src/libostree/ostree.h b/src/libostree/ostree.h
index ca19bc85..49ca919c 100644
--- a/src/libostree/ostree.h
+++ b/src/libostree/ostree.h
@@ -39,6 +39,6 @@
 #include <ostree-repo-finder-config.h>
 #include <ostree-repo-finder-mount.h>
 #include <ostree-repo-finder-override.h>
+#include <ostree-kernel-args.h>
 #include <ostree-autocleanups.h>
 #include <ostree-version.h>
-#include <ostree-kernel-args.h>