summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Andrew Clemons <andrew.clemons@gmail.com>2021-10-25 16:04:05 +1300
committer Andrew Clemons <andrew.clemons@gmail.com>2021-10-26 17:22:20 +1300
commit5c26214a2e3e50976bf35102eecad328cbd51779 (patch)
tree5b7dcef234ee91fdda2358ed42900367b17fe4bb
parent469e7a346b60aae35408c560e8cb1040b61ab410 (diff)
downloadslackbuilds-webkitgtk-wip.tar.gz
slackbuilds-webkitgtk-wip.tar.xz
libraries/webkitgtk: Fix building with gcc11.webkitgtk-wip
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
-rw-r--r--libraries/webkitgtk/volatile.patch39
-rw-r--r--libraries/webkitgtk/webkitgtk.SlackBuild5
2 files changed, 44 insertions, 0 deletions
diff --git a/libraries/webkitgtk/volatile.patch b/libraries/webkitgtk/volatile.patch
new file mode 100644
index 0000000000..8bc0edf2c2
--- /dev/null
+++ b/libraries/webkitgtk/volatile.patch
@@ -0,0 +1,39 @@
+diff --git a/Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp b/Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp
+index 0e4a0c8..2a8296d 100644
+--- a/Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp
++++ b/Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp
+@@ -390,7 +390,7 @@ static void webkitAccessibleHyperlinkInit(AtkHyperlink* link)
+
+ GType webkitAccessibleHyperlinkGetType()
+ {
+- static volatile gsize typeVolatile = 0;
++ static gsize typeVolatile = 0;
+
+ if (g_once_init_enter(&typeVolatile)) {
+ static const GTypeInfo tinfo = {
+diff --git a/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp b/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
+index 79eb46d..f4b0270 100644
+--- a/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
++++ b/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
+@@ -1015,7 +1015,7 @@ static void webkitAccessibleClassInit(AtkObjectClass* klass)
+ GType
+ webkitAccessibleGetType(void)
+ {
+- static volatile gsize typeVolatile = 0;
++ static gsize typeVolatile = 0;
+
+ if (g_once_init_enter(&typeVolatile)) {
+ static const GTypeInfo tinfo = {
+diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h b/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h
+index bd060ed..f003e8a 100644
+--- a/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h
++++ b/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h
+@@ -98,7 +98,7 @@ static void type_name##_init(TypeName* self) \
+ }\
+ GType type_name##_get_type(void) \
+ { \
+- static volatile gsize g_define_type_id__volatile = 0; \
++ static gsize g_define_type_id__volatile = 0; \
+ if (g_once_init_enter(&g_define_type_id__volatile)) { \
+ GType g_define_type_id = \
+ g_type_register_static_simple( \
diff --git a/libraries/webkitgtk/webkitgtk.SlackBuild b/libraries/webkitgtk/webkitgtk.SlackBuild
index bafb7454c8..cf018f6475 100644
--- a/libraries/webkitgtk/webkitgtk.SlackBuild
+++ b/libraries/webkitgtk/webkitgtk.SlackBuild
@@ -88,10 +88,15 @@ patch -p1 < $CWD/webkitgtk-2.4.9-abs.patch
# https://bugs.webkit.org/show_bug.cgi?id=202600
patch -p1 < $CWD/icu4c-65.1.patch
+autoreconf -ifv
+
patch -p1 < $CWD/bison-3.7.1.patch
patch -p0 < $CWD/glib-2.68.0.patch
+# gcc11 volatile fixes
+patch -p1 < $CWD/volatile.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" \