Commitd4642e6

committed

remove unnecessary glib-dev dependency#1120

1 parent92bc145 commitd4642e6Copy full SHA for d4642e6

File tree

-10

lines changed

-10

lines changed

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -398,11 +398,9 @@ def _build_monoclr(self):`
`398`	`398`	`return`
`399`	`399`	`raise`
`400`	`400`	`mono_cflags=_check_output("pkg-config --cflags mono-2",shell=True)`
`401`		`-glib_libs=_check_output("pkg-config --libs glib-2.0",shell=True)`
`402`		`-glib_cflags=_check_output("pkg-config --cflags glib-2.0",shell=True)`
`403`		`-cflags=mono_cflags.strip()+" "+glib_cflags.strip()`
`404`		`-libs=mono_libs.strip()+" "+glib_libs.strip()`
`405`		`-`
	`401`	`+cflags=mono_cflags.strip()`
	`402`	`+libs=mono_libs.strip()`
	`403`	`+`
`406`	`404`	`# build the clr python module`
`407`	`405`	`clr_ext=Extension(`
`408`	`406`	`"clr",`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`#include<mono/metadata/mono-config.h>`
`8`	`8`	`#include<mono/metadata/debug-helpers.h>`
`9`	`9`	`#include<mono/metadata/assembly.h>`
`10`		`-#include<glib.h>`
`11`	`10`
`12`	`11`	`#defineMONO_VERSION "v4.0.30319.1"`
`13`	`12`	`#defineMONO_DOMAIN "Python.Runtime"`
`@@ -27,7 +26,7 @@ typedef struct`
`27`	`26`
`28`	`27`	`PyNet_Args*PyNet_Init(int);`
`29`	`28`	`voidPyNet_Finalize(PyNet_Args*);`
`30`		`-voidmain_thread_handler(gpointeruser_data);`
	`29`	`+voidmain_thread_handler(PyNet_Args*user_data);`
`31`	`30`	`charPyNet_ExceptionToString(MonoObject);`
`32`	`31`
`33`	`32`	`#endif// PYNET_CLR_H`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,9 @@ MonoMethod getMethodFromClass(MonoClass cls, char *name)`
`91`	`91`	`returnmethod;`
`92`	`92`	`}`
`93`	`93`
`94`		`-voidmain_thread_handler(gpointeruser_data)`
	`94`	`+voidmain_thread_handler(PyNet_Args*user_data)`
`95`	`95`	`{`
`96`		`-PyNet_Argspn_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`	`charPyNet_ExceptionToString(MonoObjecte)`
`243`	`243`	`{`
`244`		`-MonoMethodDesc*mdesc=mono_method_desc_new(":ToString()", FALSE);`
	`244`	`+MonoMethodDescmdesc=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`

Comments

(0)