summary refs log tree commit diff
path: root/pkgs/development/libraries/glib/gobject_init_on_demand.patch
blob: d72d0b61dca27b32b3481f9bbefec6d1df74bba0 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
--- glib-source/gobject/gtype.c	2016-08-17 17:20:47.000000000 +0200
+++ glib-source/gobject/gtype.c	2016-09-01 21:56:31.777406646 +0200
@@ -209,6 +209,9 @@
 static gboolean				type_node_is_a_L		(TypeNode		*node,
 									 TypeNode		*iface_node);
 
+#if !defined(__GLIBC__)
+static void gobject_init (void);
+#endif
 
 /* --- enumeration --- */
 
@@ -2631,7 +2634,10 @@
 			     GTypeFlags			 flags)
 {
   TypeNode *node;
-  
+ 
+#if !defined(__GLIBC__)
+  gobject_init();
+#endif 
   g_assert_type_system_initialized ();
   g_return_val_if_fail (type_id > 0, 0);
   g_return_val_if_fail (type_name != NULL, 0);
@@ -2749,6 +2755,9 @@
   TypeNode *pnode, *node;
   GType type = 0;
   
+#if !defined(__GLIBC__)
+  gobject_init();
+#endif 
   g_assert_type_system_initialized ();
   g_return_val_if_fail (parent_type > 0, 0);
   g_return_val_if_fail (type_name != NULL, 0);
@@ -2804,6 +2813,9 @@
   TypeNode *pnode, *node;
   GType type;
   
+#if !defined(__GLIBC__)
+  gobject_init();
+#endif 
   g_assert_type_system_initialized ();
   g_return_val_if_fail (parent_type > 0, 0);
   g_return_val_if_fail (type_name != NULL, 0);
@@ -3319,6 +3331,9 @@
 {
   TypeNode *node;
   
+#if !defined(__GLIBC__)
+  gobject_init();
+#endif 
   g_assert_type_system_initialized ();
   
   node = lookup_type_node_I (type);
@@ -4343,6 +4358,9 @@
 void
 g_type_init_with_debug_flags (GTypeDebugFlags debug_flags)
 {
+#if !defined(__GLIBC__)
+  gobject_init();
+#endif 
   g_assert_type_system_initialized ();
 
   if (debug_flags)
@@ -4361,6 +4379,9 @@
 void
 g_type_init (void)
 {
+#if !defined(__GLIBC__)
+  gobject_init();
+#endif 
   g_assert_type_system_initialized ();
 }
 
@@ -4372,6 +4393,12 @@
   TypeNode *node;
   GType type;
 
+#if !defined(__GLIBC__)
+  static int gobject_initialized = 0;
+  if (gobject_initialized)
+    return;
+  gobject_initialized = 1;
+#endif
   /* Ensure GLib is initialized first, see
    * https://bugzilla.gnome.org/show_bug.cgi?id=756139
    */