Adding volatile patch for gcc11+ building.

3 files changed, 49 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4526a235a452..7bb51a726a23 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = webkitgtk
 	pkgdesc = Legacy Web content engine for GTK+ 3
 	pkgver = 2.4.11
-	pkgrel = 24
+	pkgrel = 25
 	epoch = 3
 	url = https://webkitgtk.org/
 	install = webkitgtk.install
@@ -12,7 +12,6 @@ pkgbase = webkitgtk
 	makedepends = gobject-introspection
 	makedepends = gperf
 	makedepends = gtk2
-	makedepends = gtk3
 	makedepends = mesa
 	makedepends = python2
 	makedepends = ruby
@@ -46,6 +45,7 @@ pkgbase = webkitgtk
 	source = gtk-doc.patch
 	source = grammar.patch
 	source = glib-2.68.0.patch
+	source = volatile.patch
 	sha256sums = 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7
 	sha256sums = e40f1e08665e1646ebc490141678f26c9c4a2792207fdf7c05978547eae9f61c
 	sha256sums = 7e37e059f071aaef93e387675de1a0c6a3dcf61ef67a3221a078caca69e22079
@@ -55,6 +55,6 @@ pkgbase = webkitgtk
 	sha256sums = 7341eb4c229656046be6ac526f94b9f4a742a66178412caf22a988677f5bf9d9
 	sha256sums = 5a62fbd0df69c6951562e72cd7b3c58cae7f2807338ced7b4a1973440b3dd193
 	sha256sums = db202fedd72a21318646c561afcd76656ea8ba6b1d641363fc7b69ae5687aa28
+	sha256sums = 013bf12e0ab79664c74f1ef3c299f564cd1f47feab2a3daa5ab80db1c5aebfa1
 
 pkgname = webkitgtk
-
diff --git a/PKGBUILD b/PKGBUILD
index bce4772290d0..5d037495bcad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=webkitgtk
 pkgver=2.4.11
-pkgrel=24
+pkgrel=25
 epoch=3
 pkgdesc="Legacy Web content engine for GTK+ 3"
 arch=("armv7h" "i686" "x86_64")
@@ -19,7 +19,7 @@ optdepends=(
   "gst-plugins-good: media decoding"
   "gtk2: Netscape plugin support"
 )
-makedepends=("gobject-introspection" "gperf" "gtk2" "gtk3" "mesa" "python2" "ruby")
+makedepends=("gobject-introspection" "gperf" "gtk2" "mesa" "python2" "ruby")
 provides=("${pkgname}3=${pkgver}" "libwebkit3=${pkgver}")
 conflicts=("${pkgname}3" "libwebkit3")
 replaces=("${pkgname}3" "libwebkit3")
@@ -35,6 +35,7 @@ source=(
   "gtk-doc.patch"
   "grammar.patch"
   "glib-2.68.0.patch"
+  "volatile.patch"
 )
 sha256sums=(
   "588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7"
@@ -46,6 +47,7 @@ sha256sums=(
   "7341eb4c229656046be6ac526f94b9f4a742a66178412caf22a988677f5bf9d9"
   "5a62fbd0df69c6951562e72cd7b3c58cae7f2807338ced7b4a1973440b3dd193"
   "db202fedd72a21318646c561afcd76656ea8ba6b1d641363fc7b69ae5687aa28"
+  "013bf12e0ab79664c74f1ef3c299f564cd1f47feab2a3daa5ab80db1c5aebfa1"
 )
 
 prepare() {
@@ -69,6 +71,9 @@ prepare() {
 
   # glib>=2.68.0
   patch -Np1 -i "${srcdir}/glib-2.68.0.patch"
+
+  # gcc11+ compiler volatile patch
+  patch -Np1 -i "${srcdir}/volatile.patch"
 }
 
 build() (
diff --git a/volatile.patch b/volatile.patch
new file mode 100644
index 000000000000..8bc0edf2c268
--- /dev/null
+++ b/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( \