From 46cda65123a09187e69b0cd5ee5cc4d0064670cf Mon Sep 17 00:00:00 2001
From: Frediano Ziglio <fziglio@redhat.com>
Date: Sun, 8 Mar 2020 10:52:53 +0000
Subject: [PATCH] build: Remove GObject dependency

Not used anymore.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
---
 configure.ac             |  3 ---
 meson.build              |  1 -
 server/Makefile.am       |  2 --
 server/red-common.h      | 38 --------------------------------------
 server/tests/Makefile.am |  3 ---
 5 files changed, 47 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0620fee1..63699122 100644
--- a/configure.ac
+++ b/configure.ac
@@ -191,9 +191,6 @@ GLIB2_CFLAGS="$GLIB2_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=$GLIB2_ENCODED_VERSION \
   -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_60"
 AS_VAR_APPEND([SPICE_REQUIRES], [" glib-2.0 >= $GLIB2_REQUIRED"])
 
-PKG_CHECK_MODULES([GOBJECT2], [gobject-2.0 >= $GLIB2_REQUIRED])
-AS_VAR_APPEND([SPICE_REQUIRES], [" gobject-2.0 >= $GLIB2_REQUIRED"])
-
 #used only by tests
 AS_IF([test "x$os_win32" != "xyes"],
       [PKG_CHECK_MODULES([GIO_UNIX], [gio-unix-2.0 >= $GLIB2_REQUIRED])])
diff --git a/meson.build b/meson.build
index 365603f1..b2fb018b 100644
--- a/meson.build
+++ b/meson.build
@@ -91,7 +91,6 @@ glib_version_info = '>= @0@'.format(glib_version)
 pixman_version = '>= 0.17.7'
 
 deps = {'glib-2.0'       : glib_version_info,
-        'gobject-2.0'    : glib_version_info,
         'pixman-1'       : pixman_version,
         'openssl'        : '>= 1.0.0'}
 
diff --git a/server/Makefile.am b/server/Makefile.am
index c16c7128..2b364cad 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -12,7 +12,6 @@ AM_CPPFLAGS =					\
 	-DSPICE_SERVER_INTERNAL			\
 	$(SPICE_COMMON_CFLAGS)			\
 	$(GLIB2_CFLAGS)				\
-	$(GOBJECT2_CFLAGS)			\
 	$(LZ4_CFLAGS)				\
 	$(PIXMAN_CFLAGS)			\
 	$(SASL_CFLAGS)				\
@@ -52,7 +51,6 @@ libserver_la_LIBADD =							\
 	$(SPICE_COMMON_DIR)/common/libspice-common.la			\
 	$(SPICE_COMMON_DIR)/common/libspice-common-server.la		\
 	$(GLIB2_LIBS)							\
-	$(GOBJECT2_LIBS)						\
 	$(JPEG_LIBS)							\
 	$(LZ4_LIBS)							\
 	$(LIBRT)							\
diff --git a/server/red-common.h b/server/red-common.h
index 244d767b..2e168520 100644
--- a/server/red-common.h
+++ b/server/red-common.h
@@ -112,35 +112,6 @@ typedef struct GListIter {
 #define GLIST_FOREACH_REVERSED(_list, _type, _data) \
     GLIST_FOREACH_GENERIC(_list, G_PASTE(_iter_, __LINE__), _type, _data, prev)
 
-/* Helper to declare a GObject type
- *
- * @ModuleObjName     type identifier like MyObject
- * @module_obj_name   method prefix like my_object (no need to add the
- *                    underscore)
- * @OBJ_NAME          macro common part like MY_OBJECT
- */
-#define SPICE_DECLARE_TYPE(ModuleObjName, module_obj_name, OBJ_NAME) \
-    typedef struct ModuleObjName ModuleObjName; \
-    typedef struct ModuleObjName ## Class ModuleObjName ## Class; \
-    typedef struct ModuleObjName ## Private ModuleObjName ## Private; \
-    GType module_obj_name ## _get_type(void) G_GNUC_CONST; \
-    static inline SPICE_GNUC_UNUSED ModuleObjName *G_PASTE(RED_,OBJ_NAME)(void *obj) \
-    { return G_TYPE_CHECK_INSTANCE_CAST(obj, \
-             module_obj_name ## _get_type(), ModuleObjName); } \
-    static inline SPICE_GNUC_UNUSED \
-    ModuleObjName ## Class *G_PASTE(G_PASTE(RED_,OBJ_NAME),_CLASS)(void *klass) \
-    { return G_TYPE_CHECK_CLASS_CAST(klass, \
-             module_obj_name ## _get_type(), ModuleObjName ## Class); } \
-    static inline SPICE_GNUC_UNUSED gboolean G_PASTE(RED_IS_,OBJ_NAME)(void *obj) \
-    { return G_TYPE_CHECK_INSTANCE_TYPE(obj, module_obj_name ## _get_type()); } \
-    static inline SPICE_GNUC_UNUSED \
-    gboolean G_PASTE(G_PASTE(RED_IS_,OBJ_NAME),_CLASS)(void *klass) \
-    { return G_TYPE_CHECK_CLASS_TYPE((klass), module_obj_name ## _get_type()); } \
-    static inline SPICE_GNUC_UNUSED \
-    ModuleObjName ## Class *G_PASTE(G_PASTE(RED_,OBJ_NAME),_GET_CLASS)(void *obj) \
-    { return G_TYPE_INSTANCE_GET_CLASS(obj, \
-             module_obj_name ## _get_type(), ModuleObjName ## Class); }
-
 /* This macro allows to use GLib for a class hieranrchy allocation.
  * The aims are:
  * - do not depend on C++ runtime, just C;
@@ -155,15 +126,6 @@ typedef struct GListIter {
     void operator delete(void *p) { g_free(p); } \
     void* operator new[](size_t count);
 
-#ifdef __cplusplus
-#include <glib-object.h>
-
-inline GParamFlags operator|(GParamFlags a, GParamFlags b)
-{
-    return (GParamFlags) ((int)a|(int)b);
-}
-#endif
-
 // XXX todo remove, just for easy portability
 #define XXX_CAST(from, to, name) \
 static inline to* name(from *p) { \
diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index a21d97b9..0ccc2c36 100644
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -19,7 +19,6 @@ AM_CPPFLAGS =					\
 	$(SPICE_COMMON_CFLAGS)			\
 	$(GIO_UNIX_CFLAGS)			\
 	$(GLIB2_CFLAGS)				\
-	$(GOBJECT2_CFLAGS)			\
 	$(SMARTCARD_CFLAGS)			\
 	$(SPICE_NONPKGCONFIG_CFLAGS)		\
 	$(NULL)
@@ -52,7 +51,6 @@ LDADD =								\
 	$(top_builddir)/server/libserver.la			\
 	$(GIO_UNIX_LIBS)					\
 	$(GLIB2_LIBS)						\
-	$(GOBJECT2_LIBS)					\
 	$(SPICE_NONPKGCONFIG_LIBS)		                \
 	$(NULL)
 
@@ -123,7 +121,6 @@ spice_server_replay_LDADD =					\
 	$(SPICE_COMMON_DIR)/common/libspice-common.la		\
 	$(top_builddir)/server/libspice-server.la		\
 	$(GLIB2_LIBS)						\
-	$(GOBJECT2_LIBS)					\
 	$(SPICE_NONPKGCONFIG_LIBS)		                \
 	$(NULL)