From 608582d3c4d01da42d659abe1368910166acebc7 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Thu, 2 Jul 2020 13:21:43 +0100
Subject: [PATCH] libsysprof-capture: Drop GLib dependency
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

None of the code uses it any more. This means that `libsysprof-capture.a`
can now be used within `libglib-2.0.so` for collecting main loop
statistics.

Brought to you by Opeth’s Deliverance on repeat.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Fixes: #40
---
 src/libsysprof-capture/mapped-ring-buffer.h           | 1 -
 src/libsysprof-capture/meson.build                    | 4 ----
 src/libsysprof-capture/sysprof-capture-types.h        | 1 -
 src/libsysprof-capture/sysprof-capture-util-private.h | 2 --
 src/libsysprof-capture/sysprof-capture-util.c         | 1 -
 src/libsysprof-capture/sysprof-capture-writer-cat.c   | 1 -
 src/libsysprof-capture/sysprof-capture-writer.c       | 1 -
 src/libsysprof-capture/sysprof-capture.h              | 2 --
 src/libsysprof-capture/sysprof-clock.h                | 1 -
 src/libsysprof-capture/sysprof-platform.c             | 2 --
 src/libsysprof-capture/sysprof-version-macros.h       | 2 --
 11 files changed, 18 deletions(-)

diff --git a/src/libsysprof-capture/mapped-ring-buffer.h b/src/libsysprof-capture/mapped-ring-buffer.h
index eb2c6ca4..6bf2bb7a 100644
--- a/src/libsysprof-capture/mapped-ring-buffer.h
+++ b/src/libsysprof-capture/mapped-ring-buffer.h
@@ -20,7 +20,6 @@
 
 #pragma once
 
-#include <glib.h>
 #include <stdbool.h>
 #include <stddef.h>
 
diff --git a/src/libsysprof-capture/meson.build b/src/libsysprof-capture/meson.build
index 233e3314..c8cd6895 100644
--- a/src/libsysprof-capture/meson.build
+++ b/src/libsysprof-capture/meson.build
@@ -37,9 +37,6 @@ configure_file(
 )
 
 libsysprof_capture_deps = [
-  glib_dep,
-  gio_dep,
-  gio_unix_dep,
   dependency('threads'),
 ]
 
@@ -70,7 +67,6 @@ pkgconfig.generate(
      filebase: 'sysprof-capture-@0@'.format(libsysprof_api_version),
   description: 'The static capture library for tools that generate profiling capture data',
   install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
-     requires: [ 'glib-2.0' ],
      variables: [
        'datadir=' + datadir_for_pc_file,
      ],
diff --git a/src/libsysprof-capture/sysprof-capture-types.h b/src/libsysprof-capture/sysprof-capture-types.h
index f249be5e..2031fc7e 100644
--- a/src/libsysprof-capture/sysprof-capture-types.h
+++ b/src/libsysprof-capture/sysprof-capture-types.h
@@ -58,7 +58,6 @@
 
 #include <assert.h>
 #include <endian.h>
-#include <glib.h>
 #include <inttypes.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/libsysprof-capture/sysprof-capture-util-private.h b/src/libsysprof-capture/sysprof-capture-util-private.h
index 47c59d13..1b1d93e9 100644
--- a/src/libsysprof-capture/sysprof-capture-util-private.h
+++ b/src/libsysprof-capture/sysprof-capture-util-private.h
@@ -56,8 +56,6 @@
 
 #pragma once
 
-#include <glib.h>
-
 #ifdef __linux__
 # include <sys/sendfile.h>
 #endif
diff --git a/src/libsysprof-capture/sysprof-capture-util.c b/src/libsysprof-capture/sysprof-capture-util.c
index b731d030..0bbea06a 100644
--- a/src/libsysprof-capture/sysprof-capture-util.c
+++ b/src/libsysprof-capture/sysprof-capture-util.c
@@ -58,7 +58,6 @@
 
 #include <assert.h>
 #include <errno.h>
-#include <glib.h>
 #include <unistd.h>
 
 #ifdef _WIN32
diff --git a/src/libsysprof-capture/sysprof-capture-writer-cat.c b/src/libsysprof-capture/sysprof-capture-writer-cat.c
index 7b8bac54..66171b92 100644
--- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
+++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
@@ -58,7 +58,6 @@
 
 #include <assert.h>
 #include <errno.h>
-#include <glib/gstdio.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/libsysprof-capture/sysprof-capture-writer.c b/src/libsysprof-capture/sysprof-capture-writer.c
index 444ce5f0..f890da98 100644
--- a/src/libsysprof-capture/sysprof-capture-writer.c
+++ b/src/libsysprof-capture/sysprof-capture-writer.c
@@ -64,7 +64,6 @@
 #include <endian.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <glib/gstdio.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/libsysprof-capture/sysprof-capture.h b/src/libsysprof-capture/sysprof-capture.h
index e5b2dd5b..ac2f1c25 100644
--- a/src/libsysprof-capture/sysprof-capture.h
+++ b/src/libsysprof-capture/sysprof-capture.h
@@ -56,8 +56,6 @@
 
 #pragma once
 
-#include <glib.h>
-
 #define SYSPROF_CAPTURE_INSIDE
 
 # include "sysprof-address.h"
diff --git a/src/libsysprof-capture/sysprof-clock.h b/src/libsysprof-capture/sysprof-clock.h
index 288a1fc0..c127c09d 100644
--- a/src/libsysprof-capture/sysprof-clock.h
+++ b/src/libsysprof-capture/sysprof-clock.h
@@ -56,7 +56,6 @@
 
 #pragma once
 
-#include <glib.h>
 #include <stdint.h>
 #include <time.h>
 
diff --git a/src/libsysprof-capture/sysprof-platform.c b/src/libsysprof-capture/sysprof-platform.c
index 1a344a52..a80ab890 100644
--- a/src/libsysprof-capture/sysprof-platform.c
+++ b/src/libsysprof-capture/sysprof-platform.c
@@ -56,8 +56,6 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <glib/gstdio.h>
 #include <stdlib.h>
 #include <sys/syscall.h>
 #include <unistd.h>
diff --git a/src/libsysprof-capture/sysprof-version-macros.h b/src/libsysprof-capture/sysprof-version-macros.h
index 8152735d..43930127 100644
--- a/src/libsysprof-capture/sysprof-version-macros.h
+++ b/src/libsysprof-capture/sysprof-version-macros.h
@@ -56,8 +56,6 @@
 
 #pragma once
 
-#include <glib.h>
-
 #include "sysprof-version.h"
 
 #ifndef _SYSPROF_EXTERN