summaryrefslogtreecommitdiffstats
path: root/source/l/qt5-webkit
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/qt5-webkit')
-rwxr-xr-xsource/l/qt5-webkit/qt5-webkit.SlackBuild3
-rw-r--r--source/l/qt5-webkit/qt5-webkit.glib-2.68.0.diff12
2 files changed, 15 insertions, 0 deletions
diff --git a/source/l/qt5-webkit/qt5-webkit.SlackBuild b/source/l/qt5-webkit/qt5-webkit.SlackBuild
index a591d875c..9a3d58453 100755
--- a/source/l/qt5-webkit/qt5-webkit.SlackBuild
+++ b/source/l/qt5-webkit/qt5-webkit.SlackBuild
@@ -100,6 +100,9 @@ fi
# Fix for bison 3.7.x:
zcat $CWD/qt5-webkit.bison27.patch.gz | patch -p1 --verbose || exit 1
+# Fix for glib-2.68.0:
+zcat $CWD/qt5-webkit.glib-2.68.0.diff.gz | patch -p1 --verbose || exit 1
+
# -DU_DEFINE_FALSE_AND_TRUE=1 since recent icu4c no longer defines these otherwise.
export CFLAGS="$SLKCFLAGS -DU_DEFINE_FALSE_AND_TRUE=1"
diff --git a/source/l/qt5-webkit/qt5-webkit.glib-2.68.0.diff b/source/l/qt5-webkit/qt5-webkit.glib-2.68.0.diff
new file mode 100644
index 000000000..156423a25
--- /dev/null
+++ b/source/l/qt5-webkit/qt5-webkit.glib-2.68.0.diff
@@ -0,0 +1,12 @@
+--- ./Source/WTF/wtf/glib/GRefPtr.h.orig 2020-03-04 11:16:37.000000000 -0600
++++ ./Source/WTF/wtf/glib/GRefPtr.h 2021-04-04 13:49:13.487944604 -0500
+@@ -29,9 +29,6 @@
+ #include <wtf/RefPtr.h>
+ #include <algorithm>
+
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+
+ enum GRefPtrAdoptType { GRefPtrAdopt };