Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt5-5.15.3

Browse Source
This commit is contained in:
Rmys
2022-04-18 22:26:51 +03:00
parent ab11ff5e45
commit dbc1e9face
7 changed files with 102 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-webkit/files/glib-2.68.patch
+26
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 };
desktop/toolkit/qt5/qt5-webkit/pspec.xml
+28 -19
View File
@@ -43,21 +43,23 @@
<Dependency versionFrom="2.50.2">glib2-devel</Dependency>
<Dependency versionFrom="3.16.2">sqlite-devel</Dependency>
<Dependency versionFrom="2.7.13">python-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-linguist</Dependency>
<Dependency versionFrom="5.15.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-sql-sqlite</Dependency>
<Dependency versionFrom="5.15.2">qt5-qdbusviewer</Dependency>
<Dependency versionFrom="5.15.2">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-designer-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-location-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-assistant-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-multimedia-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-linguist</Dependency>
<Dependency versionFrom="5.15.3">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-sql-sqlite</Dependency>
<Dependency versionFrom="5.15.3">qt5-qdbusviewer</Dependency>
<Dependency versionFrom="5.15.3">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-designer-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-location-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-assistant-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-multimedia-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-declarative-devel</Dependency>
<Dependency versionFrom="1.10.3">gst-plugins-base-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="0">icu68.patch</Patch>
<Patch level="1">glib-2.68.patch</Patch>
<Patch level="1">78360c01.patch</Patch>
<Patch level="1">d92b11fe.patch</Patch>
<!-- <Patch level="1">qt5-webkit-gcc7.patch</Patch> -->
<!-- <Patch level="1">qt5-webkit-null-pointer-dereference.patch</Patch> --> -->
@@ -95,11 +97,11 @@
<Dependency>gstreamer</Dependency>
<Dependency>gst-plugins-base</Dependency>
<Dependency>gst-plugins-base</Dependency>
<Dependency versionFrom="5.15.2">qt5-base</Dependency>
<Dependency versionFrom="5.15.2">qt5-location</Dependency>
<Dependency versionFrom="5.15.2">qt5-sensors</Dependency>
<Dependency versionFrom="5.15.2">qt5-webchannel</Dependency>
<Dependency versionFrom="5.15.2">qt5-declarative</Dependency>
<Dependency versionFrom="5.15.3">qt5-base</Dependency>
<Dependency versionFrom="5.15.3">qt5-location</Dependency>
<Dependency versionFrom="5.15.3">qt5-sensors</Dependency>
<Dependency versionFrom="5.15.3">qt5-webchannel</Dependency>
<Dependency versionFrom="5.15.3">qt5-declarative</Dependency>
</RuntimeDependencies>
</Package>
@@ -126,13 +128,20 @@
<Dependency>gstreamer-devel</Dependency>
<Dependency>gst-plugins-base-devel</Dependency>
<Dependency release="current">qt5-webkit</Dependency>
<Dependency versionFrom="5.15.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-declarative-devel</Dependency>
</RuntimeDependencies>
</Package>
<History>
<Update release="25">
<Date>2022-04-18</Date>
<Version>5.212.0</Version>
<Comment>Rebuild qt5-5.15.3</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="24">
<Date>2020-12-14</Date>
<Version>5.212.0</Version>