Remove unnecessary glib-dev dependency pythonnet#1120 (pythonnet#1121)

lostmsu · web-flow · commit 1fb2e63283eb · 2020-04-22T12:53:00.000+02:00
diff --git a/setup.py b/setup.py
@@ -398,11 +398,9 @@ def _build_monoclr(self):
                 return
             raise
         mono_cflags = _check_output("pkg-config --cflags mono-2", shell=True)
-        glib_libs = _check_output("pkg-config --libs glib-2.0", shell=True)
-        glib_cflags = _check_output("pkg-config --cflags glib-2.0", shell=True)
-        cflags = mono_cflags.strip() + " " + glib_cflags.strip()
-        libs = mono_libs.strip() + " " + glib_libs.strip()
-
+        cflags = mono_cflags.strip()
+        libs = mono_libs.strip()
+        
         # build the clr python module
         clr_ext = Extension(
             "clr",
diff --git a/src/monoclr/pynetclr.h b/src/monoclr/pynetclr.h
@@ -7,7 +7,6 @@
 #include <mono/metadata/mono-config.h>
 #include <mono/metadata/debug-helpers.h>
 #include <mono/metadata/assembly.h>
-#include <glib.h>
 
 #define MONO_VERSION "v4.0.30319.1"
 #define MONO_DOMAIN "Python.Runtime"
@@ -27,7 +26,7 @@ typedef struct
 
 PyNet_Args *PyNet_Init(int);
 void PyNet_Finalize(PyNet_Args *);
-void main_thread_handler(gpointer user_data);
+void main_thread_handler(PyNet_Args *user_data);
 char *PyNet_ExceptionToString(MonoObject *);
 
 #endif // PYNET_CLR_H
diff --git a/src/monoclr/pynetinit.c b/src/monoclr/pynetinit.c
@@ -91,9 +91,9 @@ MonoMethod *getMethodFromClass(MonoClass *cls, char *name)
     return method;
 }
 
-void main_thread_handler(gpointer user_data)
+void main_thread_handler(PyNet_Args *user_data)
 {
-    PyNet_Args *pn_args = (PyNet_Args *)user_data;
+    PyNet_Args *pn_args = user_data;
     MonoMethod *init;
     MonoImage *pr_image;
     MonoClass *pythonengine;
@@ -241,7 +241,7 @@ void main_thread_handler(gpointer user_data)
 // Get string from a Mono exception
 char *PyNet_ExceptionToString(MonoObject *e)
 {
-    MonoMethodDesc *mdesc = mono_method_desc_new(":ToString()", FALSE);
+    MonoMethodDesc *mdesc = mono_method_desc_new(":ToString()", 0 /*FALSE*/);
     MonoMethod *mmethod = mono_method_desc_search_in_class(mdesc, mono_get_object_class());
     mono_method_desc_free(mdesc);
 

Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,9 @@ MonoMethod getMethodFromClass(MonoClass cls, char *name)`
`91`	`91`	`return method;`
`92`	`92`	`}`
`93`	`93`
`94`		`-void main_thread_handler(gpointer user_data)`
	`94`	`+void main_thread_handler(PyNet_Args *user_data)`
`95`	`95`	`{`
`96`		`- PyNet_Args pn_args = (PyNet_Args )user_data;`
	`96`	`+ PyNet_Args *pn_args = user_data;`
`97`	`97`	`MonoMethod *init;`
`98`	`98`	`MonoImage *pr_image;`
`99`	`99`	`MonoClass *pythonengine;`
`@@ -241,7 +241,7 @@ void main_thread_handler(gpointer user_data)`
`241`	`241`	`// Get string from a Mono exception`
`242`	`242`	`char PyNet_ExceptionToString(MonoObject e)`
`243`	`243`	`{`
`244`		`- MonoMethodDesc *mdesc = mono_method_desc_new(":ToString()", FALSE);`
	`244`	`+ MonoMethodDesc mdesc = mono_method_desc_new(":ToString()", 0 /FALSE*/);`
`245`	`245`	`MonoMethod *mmethod = mono_method_desc_search_in_class(mdesc, mono_get_object_class());`
`246`	`246`	`mono_method_desc_free(mdesc);`
`247`	`247`