wok-current diff webkitgtk/stuff/webkitgtk-fix-glib-2.68.0.patch @ rev 25701
Fix dep for libglamoregl.so (libepoxy), and miss file for amdgpu (thanks alanyih)
author | Stanislas Leduc <shann@slitaz.org> |
---|---|
date | Fri Apr 19 12:48:51 2024 +0000 (2 months ago) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/webkitgtk/stuff/webkitgtk-fix-glib-2.68.0.patch Fri Apr 19 12:48:51 2024 +0000 1.3 @@ -0,0 +1,33 @@ 1.4 +diff --git a/GNUmakefile.in b/GNUmakefile.in 1.5 +index 7d4d21c..646197f 100644 1.6 +--- a/GNUmakefile.in 1.7 ++++ b/GNUmakefile.in 1.8 +@@ -96250,8 +96250,8 @@ $(GENSOURCES_WEBKIT)/webkitmarshal.h: stamp-webkitmarshal.h 1.9 + @true 1.10 + 1.11 + stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST) 1.12 +- $(AM_V_GEN) echo "extern \"C\" {" > $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \ 1.13 +- $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \ 1.14 ++ $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \ 1.15 ++ sed -i '1,10s/#ifdef/extern "C" {\n#ifdef/gm' $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \ 1.16 + echo '}' >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \ 1.17 + echo timestamp > $(@F) 1.18 + 1.19 +diff --git a/Source/WTF/wtf/gobject/GRefPtr.h b/Source/WTF/wtf/gobject/GRefPtr.h 1.20 +index b25b7bb..447015e 100644 1.21 +--- a/Source/WTF/wtf/gobject/GRefPtr.h 1.22 ++++ b/Source/WTF/wtf/gobject/GRefPtr.h 1.23 +@@ -25,11 +25,11 @@ 1.24 + 1.25 + #if USE(GLIB) 1.26 + 1.27 ++#include <glib-object.h> 1.28 ++ 1.29 + #include <wtf/RefPtr.h> 1.30 + #include <algorithm> 1.31 + 1.32 +-extern "C" void g_object_unref(gpointer); 1.33 +-extern "C" gpointer g_object_ref_sink(gpointer); 1.34 + 1.35 + namespace WTF { 1.36 +