File glib-2.68.0.patch of Package mingw64-webkitgtk

Overview Repositories Revisions Requests Users Attributes Meta

File glib-2.68.0.patch of Package mingw64-webkitgtk (Revision 4ae6e7ddb59113683f638ada76a8584f)

Currently displaying revision 4ae6e7ddb59113683f638ada76a8584f , Show latest

--- webkitgtk-2.4.11/GNUmakefile.in	2016-04-10 11:00:18.000000000 +0200
+++ webkitgtk-2.4.11/GNUmakefile.in	2021-05-08 17:43:43.240823950 +0200
@@ -82645,8 +82645,8 @@
 	@true
 
 stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST)
-	$(AM_V_GEN) echo "extern \"C\" {" > $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
-	$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
+	$(AM_V_GEN)	$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
+	sed -i '1,10s/#ifdef/extern "C" {\n#ifdef/gm' $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
 	echo '}' >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
 	echo timestamp > $(@F)
 
--- webkitgtk-2.4.11/Source/WebKit/gtk/GNUmakefile.am	2016-04-10 08:48:37.000000000 +0200
+++ webkitgtk-2.4.11/Source/WebKit/gtk/GNUmakefile.am	2021-05-08 17:44:57.443265207 +0200
@@ -352,8 +352,8 @@
 	@true
 
 stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST)
-	$(AM_V_GEN) echo "extern \"C\" {" > $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
-	$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
+	$(AM_V_GEN)	$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
+	sed -i '1,10s/#ifdef/extern "C" {\n#ifdef/gm' $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
 	echo '}' >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
 	echo timestamp > $(@F)
 
--- webkitgtk-2.4.11/Source/WTF/wtf/gobject/GRefPtr.h	2016-04-10 08:48:36.000000000 +0200
+++ webkitgtk-2.4.11/Source/WTF/wtf/gobject/GRefPtr.h	2021-05-08 17:43:43.244823866 +0200
@@ -25,11 +25,11 @@
 
 #if USE(GLIB)
 
+#include <glib-object.h>
+
 #include <wtf/RefPtr.h>
 #include <algorithm>
 
-extern "C" void g_object_unref(gpointer);
-extern "C" gpointer g_object_ref_sink(gpointer);
 
 namespace WTF {

Places

File glib-2.68.0.patch of Package mingw64-webkitgtk (Revision 4ae6e7ddb59113683f638ada76a8584f)

Places