summaryrefslogtreecommitdiffstats
path: root/source/l/qt5-webkit
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-04-05 19:04:44 +0000
committer Eric Hameleers <alien@slackware.com>2021-04-06 08:59:51 +0200
commit928db52b4905b2f48ad28d9965f859ef8247ad3e (patch)
treef781955710861e62e73f872d321fd050f1b2591f /source/l/qt5-webkit
parent2fa8690488a46236661e058ebceb0cde13755f23 (diff)
downloadcurrent-928db52b4905b2f48ad28d9965f859ef8247ad3e.tar.gz
current-928db52b4905b2f48ad28d9965f859ef8247ad3e.tar.xz
Mon Apr 5 19:04:44 UTC 202120210405190444
a/hwdata-0.346-noarch-1.txz: Upgraded. a/kernel-firmware-20210405_af1ca28-noarch-1.txz: Upgraded. d/Cython-0.29.22-x86_64-2.txz: Rebuilt. Recompiled to fix building some programs that use Cython. It's possible that this was due to an ABI bug that shipped in Python-3.9.3, but we'll rebuild to be on the safe side. Thanks to PiterPunk who noticed this issue on 32-bit. d/python3-3.9.4-x86_64-1.txz: Upgraded. This update reverts a change that introduced an unintentional ABI incompatibility making some C extensions built with Python 3.9.0 - 3.9.2 crash with Python 3.9.3 on 32-bit systems. d/ruby-3.0.1-x86_64-1.txz: Upgraded. This release includes a security fix: XML round-trip vulnerability in REXML. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28965 (* Security fix *) l/cryfs-0.10.3-x86_64-1.txz: Upgraded. l/imagemagick-7.0.11_6-x86_64-1.txz: Upgraded. l/libqalculate-3.18.0-x86_64-1.txz: Upgraded.
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 };