forked from pool/webkit2gtk3
Accepting request 948492 from GNOME:Next
- Add webkit2gtk3-gcc12.patch: fix the build with gcc 12. - Require glib2 2.44 to match source. Tweak changes OBS-URL: https://build.opensuse.org/request/show/948492 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=333
This commit is contained in:
parent
4159e6468b
commit
dcef5cfddf
56
webkit2gtk3-gcc12.patch
Normal file
56
webkit2gtk3-gcc12.patch
Normal file
@ -0,0 +1,56 @@
|
||||
diff -urp webkitgtk-2.34.3.orig/Source/JavaScriptCore/API/JSRetainPtr.h webkitgtk-2.34.3/Source/JavaScriptCore/API/JSRetainPtr.h
|
||||
--- webkitgtk-2.34.3.orig/Source/JavaScriptCore/API/JSRetainPtr.h 2021-09-01 04:16:46.000000000 -0500
|
||||
+++ webkitgtk-2.34.3/Source/JavaScriptCore/API/JSRetainPtr.h 2022-01-20 13:07:21.713055778 -0600
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <JavaScriptCore/JSObjectRef.h>
|
||||
#include <JavaScriptCore/JSStringRef.h>
|
||||
#include <algorithm>
|
||||
+#include <utility>
|
||||
|
||||
inline void JSRetain(JSClassRef context) { JSClassRetain(context); }
|
||||
inline void JSRelease(JSClassRef context) { JSClassRelease(context); }
|
||||
diff -urp webkitgtk-2.34.3.orig/Source/WebCore/platform/graphics/x11/XUniqueResource.h webkitgtk-2.34.3/Source/WebCore/platform/graphics/x11/XUniqueResource.h
|
||||
--- webkitgtk-2.34.3.orig/Source/WebCore/platform/graphics/x11/XUniqueResource.h 2021-09-01 04:16:50.000000000 -0500
|
||||
+++ webkitgtk-2.34.3/Source/WebCore/platform/graphics/x11/XUniqueResource.h 2022-01-20 13:07:21.713055778 -0600
|
||||
@@ -28,6 +28,8 @@
|
||||
|
||||
#if PLATFORM(X11)
|
||||
|
||||
+#include <utility>
|
||||
+
|
||||
#if USE(GLX)
|
||||
typedef unsigned long GLXPbuffer;
|
||||
typedef unsigned long GLXPixmap;
|
||||
diff -urp webkitgtk-2.34.3.orig/Source/WTF/wtf/CompletionHandler.h webkitgtk-2.34.3/Source/WTF/wtf/CompletionHandler.h
|
||||
--- webkitgtk-2.34.3.orig/Source/WTF/wtf/CompletionHandler.h 2021-09-01 04:16:49.000000000 -0500
|
||||
+++ webkitgtk-2.34.3/Source/WTF/wtf/CompletionHandler.h 2022-01-20 13:07:21.713055778 -0600
|
||||
@@ -27,6 +27,7 @@
|
||||
|
||||
#include <wtf/Function.h>
|
||||
#include <wtf/MainThread.h>
|
||||
+#include <utility>
|
||||
|
||||
namespace WTF {
|
||||
|
||||
diff -urp webkitgtk-2.34.3.orig/Source/WTF/wtf/MallocPtr.h webkitgtk-2.34.3/Source/WTF/wtf/MallocPtr.h
|
||||
--- webkitgtk-2.34.3.orig/Source/WTF/wtf/MallocPtr.h 2021-09-01 04:16:49.000000000 -0500
|
||||
+++ webkitgtk-2.34.3/Source/WTF/wtf/MallocPtr.h 2022-01-20 13:07:21.713055778 -0600
|
||||
@@ -27,6 +27,7 @@
|
||||
|
||||
#include <wtf/FastMalloc.h>
|
||||
#include <wtf/Noncopyable.h>
|
||||
+#include <utility>
|
||||
|
||||
// MallocPtr is a smart pointer class that calls fastFree in its destructor.
|
||||
// It is intended to be used for pointers where the C++ lifetime semantics
|
||||
diff -urp webkitgtk-2.34.3.orig/Source/WTF/wtf/text/IntegerToStringConversion.h webkitgtk-2.34.3/Source/WTF/wtf/text/IntegerToStringConversion.h
|
||||
--- webkitgtk-2.34.3.orig/Source/WTF/wtf/text/IntegerToStringConversion.h 2021-09-01 04:16:49.000000000 -0500
|
||||
+++ webkitgtk-2.34.3/Source/WTF/wtf/text/IntegerToStringConversion.h 2022-01-20 13:10:13.501962777 -0600
|
||||
@@ -22,6 +22,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <wtf/text/LChar.h>
|
||||
+#include <string>
|
||||
|
||||
namespace WTF {
|
||||
|
@ -1,11 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 24 21:54:31 UTC 2022 - Michael Gorse <mgorse@suse.com>
|
||||
|
||||
- Add webkit2gtk3-gcc12.patch: fix the build with gcc 12.
|
||||
- Require glib2 2.44 to match source.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 21 12:58:32 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 2.34.4:
|
||||
- Update to version 2.34.4 (boo#1195064):
|
||||
+ Fix several crashes and rendering issues.
|
||||
+ This release fixes numerous security issues, including an
|
||||
especially severe issue that allowed websites to read the names
|
||||
of IndexedDB databases created by other websites.
|
||||
+ Security fixes: CVE-2021-30934, CVE-2021-30936, CVE-2021-30951,
|
||||
CVE-2021-30952, CVE-2021-30953, CVE-2021-30954, CVE-2021-30984.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 19 15:12:02 UTC 2022 - Frederic Crozat <fcrozat@suse.com>
|
||||
@ -107,8 +115,8 @@ Wed Sep 22 16:18:00 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
- Update to version 2.34.0 (boo#1192063):
|
||||
+ Fix another regression in JavaScriptCore on 32bit systems.
|
||||
+ Security fixes: CVE-2021-30846, CVE-2021-30851, CVE-2021-30818,
|
||||
CVE-2021-30823, CVE-2021-30884, CVE-2021-30888, CVE-2021-30889,
|
||||
CVE-2021-30897.
|
||||
CVE-2021-30823, CVE-2021-30884, CVE-2021-30888, CVE-2021-30889,
|
||||
CVE-2021-30897, CVE-2021-45481, CVE-2021-45483.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 20 02:33:51 UTC 2021 - Michael Gorse <mgorse@suse.com>
|
||||
@ -177,7 +185,7 @@ Sun Sep 19 19:00:09 UTC 2021 - Michael Gorse <mgorse@suse.com>
|
||||
+ Do not append .asc extension to downloaded text/plain files.
|
||||
+ Fix several crashes and rendering issues.
|
||||
+ Security fixes: CVE-2021-30848, CVE-2021-30849, CVE-2021-30858,
|
||||
CVE-2021-30809, CVE-2021-30836.
|
||||
CVE-2021-30809, CVE-2021-30836, CVE-2021-45482.
|
||||
- Drop fix-lto.patch: fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
@ -327,7 +335,7 @@ Tue Apr 6 18:25:11 UTC 2021 - Michael Gorse <mgorse@suse.com>
|
||||
+ Changes in version 2.30.6 (boo#1184262):
|
||||
+ Update user agent quirks again for Google Docs and Google Drive.
|
||||
+ Fix several crashes and rendering issues.
|
||||
+ Security fixes: CVE-2020-27918, CVE-2020-29623, CVE-2021-1765
|
||||
+ Security fixes: CVE-2020-27918, CVE-2020-29623, CVE-2021-1765,
|
||||
CVE-2021-1789, CVE-2021-1799, CVE-2021-1801, CVE-2021-1870.
|
||||
- Remove webkit-font-scaling.patch: contained in upstream
|
||||
- Drop original SLE 15 support from the spec. Drop
|
||||
|
@ -92,6 +92,8 @@ Patch0: no-forced-sse.patch
|
||||
Patch1: fix-warnings.patch
|
||||
# PATCH-FIX-UPSTREAM webkit2gtk3-link-fix.patch mgorse@suse.com -- annotate executeJSCJITProbe.
|
||||
Patch2: webkit2gtk3-link-fix.patch
|
||||
# PATCH-FIX-UPSTREAM webkit2gtk3-gcc12.patch webkit#235445 webkit#235458 mgorse@suse.com -- fix the build with gcc 12.
|
||||
Patch3: webkit2gtk3-gcc12.patch
|
||||
|
||||
BuildRequires: Mesa-libEGL-devel
|
||||
BuildRequires: Mesa-libGL-devel
|
||||
@ -126,7 +128,7 @@ BuildRequires: pkgconfig(cairo) >= 1.10.2
|
||||
BuildRequires: pkgconfig(fontconfig) >= 2.8.0
|
||||
BuildRequires: pkgconfig(freetype2) >= 2.4.2
|
||||
BuildRequires: pkgconfig(geoclue-2.0) >= 2.1.5
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.36
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.44
|
||||
%if %usegcc10
|
||||
BuildRequires: pkgconfig(glproto)
|
||||
%endif
|
||||
|
Loading…
Reference in New Issue
Block a user