diff options
| author | marcus <marcus@FreeBSD.org> | 2005-07-02 05:12:20 +0000 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2005-07-02 05:12:20 +0000 |
| commit | df61b4a85e77bd6e9894ad087d67343f60ac4c3c (patch) | |
| tree | 4ee0b7b071612cb7f0b96dc2c550c5b743a58e3e | |
| parent | 9f58f0de4c76c9a522f9b2bc3c9c4cbd51888a75 (diff) | |
| download | FreeBSD-ports-df61b4a85e77bd6e9894ad087d67343f60ac4c3c.zip FreeBSD-ports-df61b4a85e77bd6e9894ad087d67343f60ac4c3c.tar.gz | |
Fix the build on 4.X.
Reported by: pointyhat via kris
| -rw-r--r-- | devel/dbus/files/patch-glib_dbus-gvalue-utils.c | 26 | ||||
| -rw-r--r-- | devel/dbus/files/patch-glib_dbus-gvalue.c | 34 |
2 files changed, 60 insertions, 0 deletions
diff --git a/devel/dbus/files/patch-glib_dbus-gvalue-utils.c b/devel/dbus/files/patch-glib_dbus-gvalue-utils.c new file mode 100644 index 0000000..9067bf3 --- /dev/null +++ b/devel/dbus/files/patch-glib_dbus-gvalue-utils.c @@ -0,0 +1,26 @@ +--- glib/dbus-gvalue-utils.c.orig Sat Jul 2 01:10:40 2005 ++++ glib/dbus-gvalue-utils.c Sat Jul 2 01:11:18 2005 +@@ -682,7 +682,6 @@ dbus_g_type_specialized_builtins_init (v + NULL + }; + +- dbus_g_type_register_collection ("GArray", &array_vtable, 0); + + static const DBusGTypeSpecializedCollectionVtable ptrarray_vtable = { + { +@@ -697,7 +696,6 @@ dbus_g_type_specialized_builtins_init (v + ptrarray_iterator + }; + +- dbus_g_type_register_collection ("GPtrArray", &ptrarray_vtable, 0); + + static const DBusGTypeSpecializedMapVtable hashtable_vtable = { + { +@@ -711,5 +709,7 @@ dbus_g_type_specialized_builtins_init (v + hashtable_iterator + }; + ++ dbus_g_type_register_collection ("GArray", &array_vtable, 0); ++ dbus_g_type_register_collection ("GPtrArray", &ptrarray_vtable, 0); + dbus_g_type_register_map ("GHashTable", &hashtable_vtable, 0); + } diff --git a/devel/dbus/files/patch-glib_dbus-gvalue.c b/devel/dbus/files/patch-glib_dbus-gvalue.c new file mode 100644 index 0000000..d0144b9 --- /dev/null +++ b/devel/dbus/files/patch-glib_dbus-gvalue.c @@ -0,0 +1,34 @@ +--- glib/dbus-gvalue.c.orig Sat Jul 2 01:08:35 2005 ++++ glib/dbus-gvalue.c Sat Jul 2 01:10:19 2005 +@@ -213,15 +213,6 @@ dbus_g_value_types_init (void) + { + static gboolean types_initialized; + +- +- if (types_initialized) +- return; +- +- g_assert (sizeof (DBusGValueIterator) >= sizeof (DBusMessageIter)); +- +- dbus_g_type_specialized_init (); +- dbus_g_type_specialized_builtins_init (); +- + static const DBusGTypeMarshalVtable basic_vtable = { + marshal_basic, + demarshal_basic +@@ -234,6 +225,15 @@ dbus_g_value_types_init (void) + marshal_map, + demarshal_ghashtable + }; ++ ++ if (types_initialized) ++ return; ++ ++ g_assert (sizeof (DBusGValueIterator) >= sizeof (DBusMessageIter)); ++ ++ dbus_g_type_specialized_init (); ++ dbus_g_type_specialized_builtins_init (); ++ + + /* Register basic types */ + { |
