From d971b745734ae13219f5f66684ad4127923ab3e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
Date: Tue, 22 Feb 2022 22:26:35 +0100
Subject: [PATCH] lib: cleanup public headers and mark gs-test.h as public

Backport of https://gitlab.gnome.org/GNOME/gnome-software/-/merge_requests/1192
to fix building test in the out-of-tree plugin
---
 lib/gs-app-list-private.h | 1 -
 lib/gs-app-list.h         | 1 +
 lib/gs-plugin-job.h       | 2 +-
 lib/gs-plugin-loader.h    | 2 +-
 lib/meson.build           | 1 +
 5 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/gs-app-list-private.h b/lib/gs-app-list-private.h
index 3bf908c16..9f540a620 100644
--- a/lib/gs-app-list-private.h
+++ b/lib/gs-app-list-private.h
@@ -33,7 +33,6 @@ typedef enum {
 	GS_APP_LIST_FLAG_LAST  /*< skip >*/
 } GsAppListFlags;
 
-GsAppList	*gs_app_list_copy		(GsAppList	*list);
 guint		 gs_app_list_get_size_peak	(GsAppList	*list);
 void		 gs_app_list_filter_duplicates	(GsAppList	*list,
 						 GsAppListFilterFlags flags);
diff --git a/lib/gs-app-list.h b/lib/gs-app-list.h
index 1330e8048..80e5e5976 100644
--- a/lib/gs-app-list.h
+++ b/lib/gs-app-list.h
@@ -65,6 +65,7 @@ typedef gboolean (*GsAppListFilterFunc)		(GsApp		*app,
 						 gpointer	 user_data);
 
 GsAppList	*gs_app_list_new		(void);
+GsAppList	*gs_app_list_copy		(GsAppList	*list);
 void		 gs_app_list_add		(GsAppList	*list,
 						 GsApp		*app);
 void		 gs_app_list_add_list		(GsAppList	*list,
diff --git a/lib/gs-plugin-job.h b/lib/gs-plugin-job.h
index 2bd619c63..47420b4fe 100644
--- a/lib/gs-plugin-job.h
+++ b/lib/gs-plugin-job.h
@@ -10,7 +10,7 @@
 
 #include <glib-object.h>
 
-#include "gs-app-list-private.h"
+#include "gs-app-list.h"
 #include "gs-category.h"
 #include "gs-plugin-types.h"
 
diff --git a/lib/gs-plugin-loader.h b/lib/gs-plugin-loader.h
index 71fd35af8..bd56bc0d4 100644
--- a/lib/gs-plugin-loader.h
+++ b/lib/gs-plugin-loader.h
@@ -16,8 +16,8 @@
 #include "gs-category-manager.h"
 #include "gs-odrs-provider.h"
 #include "gs-plugin-event.h"
-#include "gs-plugin-private.h"
 #include "gs-plugin-job.h"
+#include "gs-plugin.h"
 
 G_BEGIN_DECLS
 
diff --git a/lib/meson.build b/lib/meson.build
index 3b8c92339..ceb2ea9a9 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -26,6 +26,7 @@ libgnomesoftware_public_headers = [
   'gs-plugin-types.h',
   'gs-plugin-vfuncs.h',
   'gs-remote-icon.h',
+  'gs-test.h',
   'gs-utils.h'
 ]
 
-- 
2.36.1