archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-18 22:54:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/qt5-webkit to 5.212.0alpha4-10

Browse source
This commit is contained in:
Kevin Mihelich 2021-04-17 19:26:11 +00:00
parent 4f06d80586
commit a3e68b1423
2 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
extra/qt5-webkit/PKGBUILD
View file

@ -12,13 +12,14 @@ highmem=1
pkgname=qt5-webkit pkgname=qt5-webkit
_pkgver=5.212.0-alpha4 _pkgver=5.212.0-alpha4
pkgver=${_pkgver/-/} pkgver=${_pkgver/-/}
pkgrel=9 pkgrel=10
arch=(x86_64) arch=(x86_64)
url='https://www.qt.io' url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom) license=(GPL3 LGPL3 FDL custom)
pkgdesc='Classes for a WebKit2 based implementation and a new QML API' 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" source=("https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$_pkgver/qtwebkit-$_pkgver.tar.xz"
icu68.patch icu68.patch
glib-2.68.patch
qt5-webkit-python-3.9.patch::"https://github.com/qtwebkit/qtwebkit/commit/78360c01.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" qt5-webkit-bison-3.7.patch::"https://github.com/qtwebkit/qtwebkit/commit/d92b11fe.patch"
'atomic.patch') 'atomic.patch')
@ -27,6 +28,7 @@ makedepends=(cmake ruby gperf python qt5-doc qt5-tools)
optdepends=('gst-plugins-good: Webm codec support') optdepends=('gst-plugins-good: Webm codec support')
sha256sums=('9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6' sha256sums=('9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6'
'0b40ed924f03ff6081af610bb0ee01560b7bd1fb68f8af02053304a01d4ccdf0' '0b40ed924f03ff6081af610bb0ee01560b7bd1fb68f8af02053304a01d4ccdf0'
'4969dd03e482155e2490b50307dada81dda7bbc9e5398e3a53c20bc474f7c04e'
'9db5480dfbd3c440489e8e4131e3555b2af61fa4b6c19f35227588c5996be128' '9db5480dfbd3c440489e8e4131e3555b2af61fa4b6c19f35227588c5996be128'
'cc5a2b762426e9cda5a3ae056bba266b5f775ee75c0590913839c255d5f10db0' 'cc5a2b762426e9cda5a3ae056bba266b5f775ee75c0590913839c255d5f10db0'
'23fbd785daf116c71b3ce87d40860f0a6c56ab1065ee98ec41634626ca961129') '23fbd785daf116c71b3ce87d40860f0a6c56ab1065ee98ec41634626ca961129')
@ -34,6 +36,7 @@ sha256sums=('9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6'
prepare() { prepare() {
cd qtwebkit-$_pkgver cd qtwebkit-$_pkgver
patch -p0 -i ../icu68.patch # Fix build with ICU 68.x 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-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 patch -p1 -i ../qt5-webkit-bison-3.7.patch # Fix build with bison 3.7

26
extra/qt5-webkit/glib-2.68.patch Normal file
View file

@ -0,0 +1,26 @@
From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@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 };