diff options
| author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2021-04-24 08:49:41 +0700 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2021-04-23 23:26:24 -0500 |
| commit | 332c385836bae6a25d674a84e743f0795fa199b0 (patch) | |
| tree | 3f8791193a9b35734aa6fd26bb50cff7f5b1ac9c | |
| parent | 3635b9dd94e50c52d5fdef330ddc64dd6e743cfc (diff) | |
libraries/webkitgtk: Fix build against newer glib.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | libraries/webkitgtk/glib-2.68.0.patch | 29 | ||||
| -rw-r--r-- | libraries/webkitgtk/webkitgtk.SlackBuild | 2 |
2 files changed, 31 insertions, 0 deletions
diff --git a/libraries/webkitgtk/glib-2.68.0.patch b/libraries/webkitgtk/glib-2.68.0.patch new file mode 100644 index 000000000000..a5ef51700ba1 --- /dev/null +++ b/libraries/webkitgtk/glib-2.68.0.patch @@ -0,0 +1,29 @@ +--- Source/WTF/wtf/gobject/GRefPtr.h 2021-04-22 00:32:56.644133999 +0900 ++++ Source/WTF/wtf/gobject/GRefPtr.h 2021-04-22 00:33:57.755315484 +0900 +@@ -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 { + +--- GNUmakefile.in 2021-04-22 00:35:24.846905490 +0900 ++++ GNUmakefile.in 2021-04-22 00:42:04.543194694 +0900 +@@ -96250,8 +96250,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) + diff --git a/libraries/webkitgtk/webkitgtk.SlackBuild b/libraries/webkitgtk/webkitgtk.SlackBuild index 41793b144836..35f476622613 100644 --- a/libraries/webkitgtk/webkitgtk.SlackBuild +++ b/libraries/webkitgtk/webkitgtk.SlackBuild @@ -80,6 +80,8 @@ patch -p1 < $CWD/icu4c-65.1.patch patch -p1 < $CWD/bison-3.7.1.patch +patch -p0 < $CWD/glib-2.68.0.patch + # Disable excessive warnings spam CFLAGS="$SLKCFLAGS -fno-delete-null-pointer-checks" \ CXXFLAGS="$SLKCFLAGS -DU_DEFINE_FALSE_AND_TRUE=1 -fno-delete-null-pointer-checks -fpermissive -Wno-deprecated-declarations -Wno-deprecated-copy -Wno-expansion-to-defined -Wno-class-memaccess -Wno-ignored-qualifiers -Wno-redundant-move -Wno-misleading-indentation -Wno-cast-function-type" \ |