[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD glib-2.68.patch)

[Evangelos Foutras]

    Date: Thursday, April 15, 2021 @ 16:43:16
  Author: foutrelis
Revision: 412590

Fix build with GLib 2.68

Added:
  qt5-webkit/trunk/glib-2.68.patch
Modified:
  qt5-webkit/trunk/PKGBUILD

-----------------+
 PKGBUILD        |    3 +++
 glib-2.68.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-15 16:38:23 UTC (rev 412589)
+++ PKGBUILD	2021-04-15 16:43:16 UTC (rev 412590)
@@ -12,6 +12,7 @@
 pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
 source=("https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$_pkgver/qtwebkit-$_pkgver.tar.xz"
          icu68.patch
+         glib-2.68.patch
          qt5-webkit-python-3.9.patch::"https://github.com/qtwebkit/qtwebkit/commit/78360c01.patch"
          qt5-webkit-bison-3.7.patch::"https://github.com/qtwebkit/qtwebkit/commit/d92b11fe.patch")
 depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite gst-plugins-base hyphen woff2)
@@ -19,6 +20,7 @@
 optdepends=('gst-plugins-good: Webm codec support')
 sha256sums=('9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6'
             '0b40ed924f03ff6081af610bb0ee01560b7bd1fb68f8af02053304a01d4ccdf0'
+            '4969dd03e482155e2490b50307dada81dda7bbc9e5398e3a53c20bc474f7c04e'
             '9db5480dfbd3c440489e8e4131e3555b2af61fa4b6c19f35227588c5996be128'
             'cc5a2b762426e9cda5a3ae056bba266b5f775ee75c0590913839c255d5f10db0')
 
@@ -25,6 +27,7 @@
 prepare() {
   cd qtwebkit-$_pkgver
   patch -p0 -i ../icu68.patch # Fix build with ICU 68.x
+  patch -p1 -i ../glib-2.68.patch # https://github.com/qtwebkit/qtwebkit/issues/1057
   patch -p1 -i ../qt5-webkit-python-3.9.patch # Fix build with python 3.9
   patch -p1 -i ../qt5-webkit-bison-3.7.patch # Fix build with bison 3.7
 }

Added: glib-2.68.patch
===================================================================
--- glib-2.68.patch	                        (rev 0)
+++ glib-2.68.patch	2021-04-15 16:43:16 UTC (rev 412590)
@@ -0,0 +1,26 @@
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt at suse.de>
+Date: Wed, 7 Apr 2021 13:38:09 +0200
+Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
+ >= 2.68
+
+g_object_ref_sink is defined as a macro meanwhile and so the build fails.
+Just remove the declarations, glib.h is included anyway.
+---
+ Source/WTF/wtf/glib/GRefPtr.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
+index 06133d82cb35..d9a1d2f145f5 100644
+--- a/Source/WTF/wtf/glib/GRefPtr.h
++++ b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -29,9 +29,6 @@
+ #include <algorithm>
+ #include <glib.h>
+ 
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+ 
+ enum GRefPtrAdoptType { GRefPtrAdopt };