Hack to work with versioned types

configure.ac

@@ -1866,6 +1866,11 @@ if test "x${enable_Bsymbolic}" = "xyes" ; then
 fi
 AC_SUBST(GTK_LINK_FLAGS)
 
+GTK_VERSION_FLAGS="-Wl,--version-script=\$(top_srcdir)/gtk3.versions"
+AC_SUBST(GTK_VERSION_FLAGS)
+
+AC_DEFINE(G_DEFINE_TYPE_DEFAULT_VERSION, GTK3, [Gtype default version])
+
 AC_CONFIG_FILES([
 README
 INSTALL

gdk/Makefile.am

@@ -47,6 +47,7 @@ AM_CPPFLAGS = 				\
 # we use the general approach here
 LDADD = 					\
 	$(GTK_LINK_FLAGS)			\
+	$(GTK_VERSION_FLAGS)			\
 	-version-info $(LT_VERSION_INFO)	\
 	-export-dynamic 			\
 	-rpath $(libdir) 			\

gdk/gdkenumtypes.c.template

@@ -24,7 +24,7 @@ GType
 /*** BEGIN value-tail ***/
             { 0, NULL, NULL }
         };
-        etype = g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
+        etype = g_@type@_register_static (g_intern_static_string (G_TYPE_GET_VERSIONED_NAME(@EnumName@)), values);
     }
     return etype;
 }

gtk/Makefile.am

@@ -77,6 +77,7 @@ deps = 					\
 # we use the general approach here
 libtool_opts =							\
   $(GTK_LINK_FLAGS)						\
+  $(GTK_VERSION_FLAGS)						\
   -version-info $(LT_VERSION_INFO)				\
   -export-dynamic $(no_undefined)				\
   -rpath $(libdir)

gtk/gtkcontainer.c

@@ -447,7 +447,7 @@ gtk_container_get_type (void)
       };
 
       container_type =
-        g_type_register_static (GTK_TYPE_WIDGET, I_("GtkContainer"),
+        g_type_register_static (GTK_TYPE_WIDGET, I_(G_TYPE_GET_VERSIONED_NAME(GtkContainer)),
                                 &container_info, G_TYPE_FLAG_ABSTRACT);
 
       GtkContainer_private_offset =

gtk/gtkmodules.c

@@ -589,6 +589,8 @@ _gtk_module_has_mixed_deps (GModule *module_to_check)
   gpointer func;
   gboolean result;
 
+  return FALSE;
+  
   if (!module_to_check)
     module = g_module_open (NULL, 0);
   else

gtk/gtktypebuiltins.c.template

@@ -25,7 +25,7 @@ GType
 /*** BEGIN value-tail ***/
             { 0, NULL, NULL }
         };
-        etype = g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
+        etype = g_@type@_register_static (g_intern_static_string (G_TYPE_GET_VERSIONED_NAME(@EnumName@)), values);
     }
     return etype;
 }

gtk/gtkwidget.c

@@ -896,7 +896,7 @@ gtk_widget_get_type (void)
 	NULL /* interface data */
       };
 
-      widget_type = g_type_register_static (G_TYPE_INITIALLY_UNOWNED, "GtkWidget",
+      widget_type = g_type_register_static (G_TYPE_INITIALLY_UNOWNED, G_TYPE_GET_VERSIONED_NAME(GtkWidget),
                                             &widget_info, G_TYPE_FLAG_ABSTRACT);
 
       g_type_add_class_private (widget_type, sizeof (GtkWidgetClassPrivate));