Compare commits
60 Commits
ddb1cb527a
...
e546d8f324
Author | SHA1 | Date |
---|---|---|
Eike Rathke | e546d8f324 | |
Eike Rathke | 2c51681cfb | |
Eike Rathke | ba6a58f717 | |
Eike Rathke | 0f11df0c70 | |
Michael Catanzaro | 89ca4a525d | |
Tomas Popela | e988e469eb | |
Tomas Popela | 664e67fe7f | |
Kalev Lember | 9d7977fb5e | |
Michael Catanzaro | c53d8c40e8 | |
Michael Catanzaro | 51412210ff | |
Eike Rathke | 8803623319 | |
Eike Rathke | 15649bd8ef | |
Tomas Popela | 8f252f5dc3 | |
Eike Rathke | c108f6a8a2 | |
Adam Williamson | 9ca67d2095 | |
Eike Rathke | ff71195142 | |
Eike Rathke | 78a062e347 | |
Eike Rathke | 12d8c8215a | |
Eike Rathke | a23b7370ef | |
Eike Rathke | 41676d7c4d | |
Eike Rathke | 8d95205b3a | |
Tomas Popela | 3a8013b2cc | |
Tomas Popela | 1fd036c7d6 | |
Tomas Popela | d7bf9b487d | |
Tomas Popela | b1f826e29f | |
Tomas Popela | d4f3c5b3ca | |
Tomas Popela | 40dd25fb60 | |
Tomas Popela | 370955e304 | |
Tomas Popela | ccaca898ce | |
Tomas Popela | ba03f02a03 | |
Eike Rathke | f11e966d3e | |
Eike Rathke | a873328068 | |
Fedora Release Engineering | 774dc3ab99 | |
Pete Walter | 6ebae669f0 | |
Eike Rathke | 632d98c3d5 | |
Eike Rathke | caa7f8348c | |
Eike Rathke | d268dbda46 | |
Eike Rathke | 24aeb58169 | |
Eike Rathke | 8e43b85da5 | |
Eike Rathke | 58e75c6e5b | |
Eike Rathke | 84412a2cec | |
Eike Rathke | 9156881d7c | |
Eike Rathke | c0c7a4be6c | |
Eike Rathke | 06f9002591 | |
Tomas Popela | 2a4f891df5 | |
Tomas Popela | 59914c4ce7 | |
Tomas Popela | c3dfed5438 | |
Tomas Popela | 405f4727bb | |
Tomas Popela | ec9bac720a | |
Tomas Popela | 2e6b7f56c1 | |
Tomas Popela | 2bd1cc4cd0 | |
Tomas Popela | ddd571dd96 | |
Tomas Popela | ec466e3787 | |
Tomas Popela | 2673a614f5 | |
Kalev Lember | 9912d3c2b9 | |
Kalev Lember | 4949ffa2b4 | |
Tomas Popela | d7f13138ba | |
Tomas Popela | 9ee7a89d4f | |
Tomas Popela | 026c18c6f6 | |
Tomas Popela | de98181765 |
|
@ -12,3 +12,26 @@
|
|||
/webkitgtk-2.21.5.tar.xz
|
||||
/webkitgtk-2.21.91.tar.xz
|
||||
/webkitgtk-2.21.92.tar.xz
|
||||
/webkitgtk-2.22.0.tar.xz
|
||||
/webkitgtk-2.22.1.tar.xz
|
||||
/webkitgtk-2.22.2.tar.xz
|
||||
/webkitgtk-2.22.3.tar.xz
|
||||
/webkitgtk-2.22.4.tar.xz
|
||||
/webkitgtk-2.23.1.tar.xz
|
||||
/webkitgtk-2.23.2.tar.xz
|
||||
/webkitgtk-2.23.3.tar.xz
|
||||
/webkitgtk-2.23.90.tar.xz
|
||||
/webkitgtk-2.23.91.tar.xz
|
||||
/webkitgtk-2.23.92.tar.xz
|
||||
/webkitgtk-2.24.0.tar.xz
|
||||
/webkitgtk-2.24.1.tar.xz
|
||||
/webkitgtk-2.24.2.tar.xz
|
||||
/webkitgtk-2.25.1.tar.xz
|
||||
/webkitgtk-2.25.2.tar.xz
|
||||
/webkitgtk-2.25.3.tar.xz
|
||||
/webkitgtk-2.25.4.tar.xz
|
||||
/webkitgtk-2.25.92.tar.xz
|
||||
/webkitgtk-2.26.0.tar.xz
|
||||
/webkitgtk-2.26.1.tar.xz
|
||||
/webkitgtk-2.27.1.tar.xz
|
||||
/webkitgtk-2.27.2.tar.xz
|
||||
|
|
|
@ -1,30 +0,0 @@
|
|||
diff -up webkitgtk-2.14.7/Source/JavaScriptCore/bytecode/CodeBlock.cpp.b132333 webkitgtk-2.14.7/Source/JavaScriptCore/bytecode/CodeBlock.cpp
|
||||
--- webkitgtk-2.14.7/Source/JavaScriptCore/bytecode/CodeBlock.cpp.b132333 2017-02-07 09:05:07.000000000 +0100
|
||||
+++ webkitgtk-2.14.7/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2017-06-16 10:34:57.859748036 +0200
|
||||
@@ -2186,7 +2186,12 @@ void CodeBlock::finishCreation(VM& vm, S
|
||||
instructions[i + 5].u.watchpointSet = op.watchpointSet;
|
||||
else if (op.structure)
|
||||
instructions[i + 5].u.structure.set(vm, this, op.structure);
|
||||
- instructions[i + 6].u.pointer = reinterpret_cast<void*>(op.operand);
|
||||
+
|
||||
+ if (op.type == ClosureVar || op.type == ClosureVarWithVarInjectionChecks || op.type == GlobalProperty || op.type == GlobalPropertyWithVarInjectionChecks || op.type == ModuleVar)
|
||||
+ instructions[i + 6].u.operand = op.operand;
|
||||
+ else
|
||||
+ instructions[i + 6].u.pointer = reinterpret_cast<void*>(op.operand);
|
||||
+
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -2222,7 +2227,11 @@ void CodeBlock::finishCreation(VM& vm, S
|
||||
op.watchpointSet->invalidate(vm, PutToScopeFireDetail(this, ident));
|
||||
} else if (op.structure)
|
||||
instructions[i + 5].u.structure.set(vm, this, op.structure);
|
||||
- instructions[i + 6].u.pointer = reinterpret_cast<void*>(op.operand);
|
||||
+
|
||||
+ if (op.type == ClosureVar || op.type == ClosureVarWithVarInjectionChecks || op.type == GlobalProperty || op.type == GlobalPropertyWithVarInjectionChecks || op.type == ModuleVar)
|
||||
+ instructions[i + 6].u.operand = op.operand;
|
||||
+ else
|
||||
+ instructions[i + 6].u.pointer = reinterpret_cast<void*>(op.operand);
|
||||
|
||||
break;
|
||||
}
|
|
@ -1,24 +0,0 @@
|
|||
diff -up webkitgtk-2.17.92/Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp.fedora-crypto-policy webkitgtk-2.17.92/Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp
|
||||
--- webkitgtk-2.17.92/Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp.fedora-crypto-policy 2017-09-05 13:39:59.294426661 +0200
|
||||
+++ webkitgtk-2.17.92/Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp 2017-09-05 13:40:09.144389997 +0200
|
||||
@@ -43,7 +43,7 @@ int main(int argc, char** argv)
|
||||
// overwrite this priority string if it's already set by the user.
|
||||
// https://bugzilla.gnome.org/show_bug.cgi?id=738633
|
||||
// WARNING: This needs to be KEPT IN SYNC with WebProcessMain.cpp.
|
||||
- setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0:!ARCFOUR-128", 0);
|
||||
+ setenv("G_TLS_GNUTLS_PRIORITY", "@SYSTEM:%COMPAT:!VERS-SSL3.0:!ARCFOUR-128", 0);
|
||||
|
||||
#if USE(GCRYPT)
|
||||
PAL::GCrypt::initialize();
|
||||
diff -up webkitgtk-2.17.92/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMain.cpp.fedora-crypto-policy webkitgtk-2.17.92/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMain.cpp
|
||||
--- webkitgtk-2.17.92/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMain.cpp.fedora-crypto-policy 2017-09-05 13:40:28.558317735 +0200
|
||||
+++ webkitgtk-2.17.92/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMain.cpp 2017-09-05 13:40:56.057215378 +0200
|
||||
@@ -43,7 +43,7 @@ int main(int argc, char** argv)
|
||||
// overwrite this priority string if it's already set by the user.
|
||||
// https://bugzilla.gnome.org/show_bug.cgi?id=738633
|
||||
// WARNING: This needs to be KEPT IN SYNC with WebProcessMain.cpp.
|
||||
- setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0:!ARCFOUR-128", 0);
|
||||
+ setenv("G_TLS_GNUTLS_PRIORITY", "@SYSTEM:%COMPAT:!VERS-SSL3.0:!ARCFOUR-128", 0);
|
||||
|
||||
#if USE(GCRYPT)
|
||||
PAL::GCrypt::initialize();
|
|
@ -0,0 +1,24 @@
|
|||
From 494e4abb7a5130376d3cdb41a5e3963650b8659f Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Mon, 16 Jul 2018 06:34:53 +0200
|
||||
Subject: [PATCH] Fix the broken build due to python2
|
||||
|
||||
/builddir/build/BUILD/webkitgtk-2.23.3/Tools/gtkdoc/generate-gtkdoc
|
||||
/usr/bin/env: 'python': No such file or directory
|
||||
---
|
||||
Tools/gtk/generate-gtkdoc | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Tools/gtk/generate-gtkdoc b/Tools/gtk/generate-gtkdoc
|
||||
index 45c23dfb..a3f82984 100755
|
||||
--- a/Tools/gtkdoc/generate-gtkdoc
|
||||
+++ b/Tools/gtkdoc/generate-gtkdoc
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python3
|
||||
# Copyright (C) 2011 Igalia S.L.
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
--
|
||||
2.17.1
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
From 494e4abb7a5130376d3cdb41a5e3963650b8659f Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Mon, 16 Jul 2018 06:34:53 +0200
|
||||
Subject: [PATCH] Fix the broken build due to python2
|
||||
|
||||
/builddir/build/BUILD/webkitgtk-2.21.4/Tools/gtk/generate-gtkdoc
|
||||
/usr/bin/env: 'python': No such file or directory
|
||||
---
|
||||
Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl | 2 +-
|
||||
Tools/gtk/generate-gtkdoc | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl b/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
|
||||
index 4bb7037d..3071b45f 100755
|
||||
--- a/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
|
||||
+++ b/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
|
||||
@@ -155,7 +155,7 @@ my $inspectorLicense = <<'EOF';
|
||||
EOF
|
||||
|
||||
my $perl = $^X;
|
||||
-my $python = ($OSNAME =~ /cygwin/) ? "/usr/bin/python" : "python";
|
||||
+my $python = ($OSNAME =~ /cygwin/) ? "/usr/bin/python2" : "python2";
|
||||
my $derivedSourcesDir = $ENV{'DERIVED_SOURCES_DIR'};
|
||||
my $scriptsRoot = File::Spec->catdir($ENV{'SRCROOT'}, 'Scripts');
|
||||
my $sharedScriptsRoot = File::Spec->catdir($ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'});
|
||||
diff --git a/Tools/gtk/generate-gtkdoc b/Tools/gtk/generate-gtkdoc
|
||||
index 45c23dfb..a3f82984 100755
|
||||
--- a/Tools/gtk/generate-gtkdoc
|
||||
+++ b/Tools/gtk/generate-gtkdoc
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/env python2.7
|
||||
# Copyright (C) 2011 Igalia S.L.
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
--
|
||||
2.17.1
|
||||
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
SHA512 (webkitgtk-2.21.92.tar.xz) = 372e9ee1ff00368e81f102b4a96aa07ec51187f81e04da201cdfaf901d5e30a4f3a9d6b29862c1afc7f5d70b1b9f36b7c21fc590aca5ebaf56fa5a01b37bf703
|
||||
SHA512 (webkitgtk-2.27.2.tar.xz) = f535102ea81db463bcabd5ae8c1911aedba26a6db218cd7ac258433e6053210bdcf3a305d5e47e702d54281bdf22e5ff52c6337e68c72adf1baf928dc1fecbc7
|
||||
|
|
|
@ -1,25 +0,0 @@
|
|||
From 9154ea477728797b9d33b32fb36940485f6927fa Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Thu, 30 Aug 2018 07:04:58 +0200
|
||||
Subject: [PATCH] Use ternary operator instead of std::max
|
||||
|
||||
---
|
||||
Source/JavaScriptCore/heap/RegisterState.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Source/JavaScriptCore/heap/RegisterState.h b/Source/JavaScriptCore/heap/RegisterState.h
|
||||
index baaef4c7..b3037dba 100644
|
||||
--- a/Source/JavaScriptCore/heap/RegisterState.h
|
||||
+++ b/Source/JavaScriptCore/heap/RegisterState.h
|
||||
@@ -166,7 +166,7 @@ using RegisterState = jmp_buf;
|
||||
#pragma warning(disable: 4611)
|
||||
#endif
|
||||
#define ALLOCATE_AND_GET_REGISTER_STATE(registers) \
|
||||
- alignas(std::max(alignof(void*), alignof(RegisterState))) RegisterState registers; \
|
||||
+ alignas(alignof(void*) > alignof(RegisterState) ? alignof(void*) : alignof(RegisterState)) RegisterState registers; \
|
||||
setjmp(registers)
|
||||
|
||||
#if COMPILER(MSVC)
|
||||
--
|
||||
2.17.1
|
||||
|
275
webkit2gtk3.spec
275
webkit2gtk3.spec
|
@ -6,9 +6,9 @@
|
|||
cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
|
||||
|
||||
Name: webkit2gtk3
|
||||
Version: 2.21.92
|
||||
Release: 2%{?dist}
|
||||
Summary: GTK+ Web content engine library
|
||||
Version: 2.27.2
|
||||
Release: 1%{?dist}
|
||||
Summary: GTK Web content engine library
|
||||
|
||||
License: LGPLv2
|
||||
URL: http://www.webkitgtk.org/
|
||||
|
@ -16,68 +16,70 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
|
|||
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=162611
|
||||
Patch0: user-agent-branding.patch
|
||||
# https://fedoraproject.org/wiki/Packaging:CryptoPolicies
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=158785
|
||||
Patch1: fedora-crypto-policy.patch
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=132333
|
||||
Patch2: cloop-big-endians.patch
|
||||
# Explicitly specify python2 over python
|
||||
Patch3: python2.patch
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=189078
|
||||
Patch4: webkit-jsc-use-ternary-operator.patch
|
||||
# Don't use the shebang, but point straight to python 3
|
||||
Patch1: no-env-shebang.patch
|
||||
|
||||
BuildRequires: at-spi2-core-devel
|
||||
BuildRequires: bison
|
||||
BuildRequires: cairo-devel
|
||||
BuildRequires: bubblewrap
|
||||
BuildRequires: cmake
|
||||
BuildRequires: enchant-devel
|
||||
BuildRequires: flex
|
||||
BuildRequires: fontconfig-devel
|
||||
BuildRequires: freetype-devel
|
||||
BuildRequires: git
|
||||
BuildRequires: geoclue2-devel
|
||||
BuildRequires: gettext
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: gnutls-devel
|
||||
BuildRequires: gobject-introspection-devel
|
||||
BuildRequires: gettext
|
||||
BuildRequires: git
|
||||
BuildRequires: gperf
|
||||
BuildRequires: gstreamer1-devel
|
||||
BuildRequires: gstreamer1-plugins-base-devel
|
||||
BuildRequires: gstreamer1-plugins-bad-free-devel
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: gtk3-devel
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: harfbuzz-devel
|
||||
BuildRequires: hyphen-devel
|
||||
BuildRequires: libatomic
|
||||
BuildRequires: libicu-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libnotify-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libsecret-devel
|
||||
BuildRequires: libsoup-devel
|
||||
BuildRequires: libwebp-devel
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: libXt-devel
|
||||
BuildRequires: libwayland-client-devel
|
||||
BuildRequires: libwayland-egl-devel
|
||||
BuildRequires: libwayland-server-devel
|
||||
BuildRequires: mesa-libEGL-devel
|
||||
BuildRequires: mesa-libGL-devel
|
||||
BuildRequires: mesa-libGLES-devel
|
||||
BuildRequires: pcre-devel
|
||||
BuildRequires: ninja-build
|
||||
BuildRequires: perl-File-Copy-Recursive
|
||||
BuildRequires: perl-JSON-PP
|
||||
BuildRequires: perl-Switch
|
||||
BuildRequires: python2
|
||||
BuildRequires: python3
|
||||
BuildRequires: ruby
|
||||
BuildRequires: rubygems
|
||||
BuildRequires: sqlite-devel
|
||||
BuildRequires: upower-devel
|
||||
BuildRequires: woff2-devel
|
||||
BuildRequires: xdg-dbus-proxy
|
||||
|
||||
BuildRequires: pkgconfig(atspi-2)
|
||||
BuildRequires: pkgconfig(cairo)
|
||||
BuildRequires: pkgconfig(egl)
|
||||
BuildRequires: pkgconfig(enchant-2)
|
||||
BuildRequires: pkgconfig(fontconfig)
|
||||
BuildRequires: pkgconfig(freetype2)
|
||||
BuildRequires: pkgconfig(geoclue-2.0)
|
||||
BuildRequires: pkgconfig(gl)
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(glesv2)
|
||||
BuildRequires: pkgconfig(gnutls)
|
||||
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||
BuildRequires: pkgconfig(gstreamer-1.0)
|
||||
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
|
||||
BuildRequires: pkgconfig(gstreamer-plugins-bad-1.0)
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(harfbuzz)
|
||||
BuildRequires: pkgconfig(icu-uc)
|
||||
BuildRequires: pkgconfig(libjpeg)
|
||||
BuildRequires: pkgconfig(libnotify)
|
||||
BuildRequires: pkgconfig(libopenjp2)
|
||||
BuildRequires: pkgconfig(libpcre)
|
||||
BuildRequires: pkgconfig(libpng)
|
||||
BuildRequires: pkgconfig(libseccomp)
|
||||
BuildRequires: pkgconfig(libsecret-1)
|
||||
BuildRequires: pkgconfig(libsoup-2.4)
|
||||
BuildRequires: pkgconfig(libwebp)
|
||||
BuildRequires: pkgconfig(libwoff2dec)
|
||||
BuildRequires: pkgconfig(libxslt)
|
||||
BuildRequires: pkgconfig(sqlite3)
|
||||
BuildRequires: pkgconfig(upower-glib)
|
||||
BuildRequires: pkgconfig(wayland-client)
|
||||
BuildRequires: pkgconfig(wayland-egl)
|
||||
BuildRequires: pkgconfig(wayland-server)
|
||||
BuildRequires: pkgconfig(wpe-1.0)
|
||||
BuildRequires: pkgconfig(wpebackend-fdo-1.0)
|
||||
BuildRequires: pkgconfig(xt)
|
||||
|
||||
Requires: bubblewrap
|
||||
Requires: geoclue2
|
||||
Requires: xdg-dbus-proxy
|
||||
|
||||
# Obsolete libwebkit2gtk from the webkitgtk3 package
|
||||
Obsoletes: libwebkit2gtk < 2.5.0
|
||||
|
@ -87,6 +89,10 @@ Provides: libwebkit2gtk = %{version}-%{release}
|
|||
Obsoletes: webkitgtk4 < %{version}-%{release}
|
||||
Provides: webkitgtk4 = %{version}-%{release}
|
||||
|
||||
# GTK+ 2 plugins support was removed in 2.25.3
|
||||
Obsoletes: webkit2gtk3-plugin-process-gtk2 < %{version}-%{release}
|
||||
Provides: webkit2gtk3-plugin-process-gtk2 = %{version}-%{release}
|
||||
|
||||
# We're supposed to specify versions here, but these crap Google libs don't do
|
||||
# normal releases. Accordingly, they're not suitable to be system libs.
|
||||
Provides: bundled(angle)
|
||||
|
@ -94,17 +100,14 @@ Provides: bundled(angle)
|
|||
# Require the jsc subpackage
|
||||
Requires: %{name}-jsc%{?_isa} = %{version}-%{release}
|
||||
|
||||
# Recommend the support for the GTK+ 2 based NPAPI plugins
|
||||
Recommends: %{name}-plugin-process-gtk2%{?_isa} = %{version}-%{release}
|
||||
|
||||
# Filter out provides for private libraries
|
||||
%global __provides_exclude_from ^%{_libdir}/webkit2gtk-4\\.0/.*\\.so$
|
||||
|
||||
%description
|
||||
WebKitGTK+ is the port of the portable web rendering engine WebKit to the
|
||||
GTK+ platform.
|
||||
WebKitGTK is the port of the portable web rendering engine WebKit to the
|
||||
GTK platform.
|
||||
|
||||
This package contains WebKit2 based WebKitGTK+ for GTK+ 3.
|
||||
This package contains WebKit2 based WebKitGTK for GTK 3.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
|
@ -146,16 +149,6 @@ Provides: webkitgtk4-jsc-devel = %{version}-%{release}
|
|||
The %{name}-jsc-devel package contains libraries, build data, and header
|
||||
files for developing applications that use JavaScript engine from %{name}.
|
||||
|
||||
%package plugin-process-gtk2
|
||||
Summary: GTK+ 2 based NPAPI plugins support for %{name}
|
||||
Requires: %{name}-jsc%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: %{name} < 2.12.0-3
|
||||
Obsoletes: webkitgtk4-plugin-process-gtk2 < %{version}-%{release}
|
||||
Provides: webkitgtk4-plugin-process-gtk2 = %{version}-%{release}
|
||||
|
||||
%description plugin-process-gtk2
|
||||
Support for the GTK+ 2 based NPAPI plugins (such as Adobe Flash) for %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n webkitgtk-%{version} -S git
|
||||
|
||||
|
@ -173,51 +166,35 @@ rm -rf Source/ThirdParty/qunit/
|
|||
# is only needed for x86_64.
|
||||
%global _dwz_max_die_limit_x86_64 250000000
|
||||
|
||||
%ifarch s390 aarch64
|
||||
# Use linker flags to reduce memory consumption - on other arches the ld.gold is
|
||||
# used and also it doesn't have the --reduce-memory-overheads option
|
||||
%global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
|
||||
%endif
|
||||
|
||||
# Decrease debuginfo even on ix86 because of:
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=140176
|
||||
%ifarch s390 s390x %{arm} %{ix86} ppc %{power64} %{mips}
|
||||
%ifarch s390x %{arm} %{ix86} %{power64} %{mips}
|
||||
# Decrease debuginfo verbosity to reduce memory consumption even more
|
||||
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
|
||||
%endif
|
||||
|
||||
%ifarch ppc
|
||||
# Use linker flag -relax to get WebKit build under ppc(32) with JIT disabled
|
||||
%global optflags %{optflags} -Wl,-relax
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global optflags %{optflags} -DUSER_AGENT_GTK_DISTRIBUTOR_NAME=\'\\"Fedora\\"\'
|
||||
%endif
|
||||
|
||||
# Disable ld.gold on s390 as it does not have it.
|
||||
# Also for aarch64 as the support is in upstream, but not packaged in Fedora.
|
||||
mkdir -p %{_target_platform}
|
||||
pushd %{_target_platform}
|
||||
%cmake \
|
||||
-GNinja \
|
||||
-DPORT=GTK \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DENABLE_GTKDOC=ON \
|
||||
-DENABLE_MINIBROWSER=ON \
|
||||
%ifarch s390 aarch64
|
||||
-DUSE_LD_GOLD=OFF \
|
||||
%endif
|
||||
%ifarch s390 s390x ppc %{power64}
|
||||
-DENABLE_JIT=OFF \
|
||||
-DUSE_SYSTEM_MALLOC=ON \
|
||||
%endif
|
||||
-DPYTHON_EXECUTABLE=%{_bindir}/python3 \
|
||||
..
|
||||
popd
|
||||
|
||||
make %{?_smp_mflags} -C %{_target_platform}
|
||||
# Show the build time in the status
|
||||
export NINJA_STATUS="[%f/%t][%e] "
|
||||
%ninja_build -C %{_target_platform}
|
||||
|
||||
%install
|
||||
%make_install -C %{_target_platform}
|
||||
%ninja_install -C %{_target_platform}
|
||||
|
||||
%find_lang WebKit2GTK-4.0
|
||||
|
||||
|
@ -233,7 +210,6 @@ make %{?_smp_mflags} -C %{_target_platform}
|
|||
%add_to_license_files Source/WebCore/LICENSE-LGPL-2
|
||||
%add_to_license_files Source/WebCore/LICENSE-LGPL-2.1
|
||||
%add_to_license_files Source/WebInspectorUI/UserInterface/External/CodeMirror/LICENSE
|
||||
%add_to_license_files Source/WebInspectorUI/UserInterface/External/ESLint/LICENSE
|
||||
%add_to_license_files Source/WebInspectorUI/UserInterface/External/Esprima/LICENSE
|
||||
%add_to_license_files Source/WebInspectorUI/UserInterface/External/three.js/LICENSE
|
||||
%add_to_license_files Source/WTF/icu/LICENSE
|
||||
|
@ -252,7 +228,6 @@ make %{?_smp_mflags} -C %{_target_platform}
|
|||
%{_libdir}/webkit2gtk-4.0/
|
||||
%{_libexecdir}/webkit2gtk-4.0/
|
||||
%exclude %{_libexecdir}/webkit2gtk-4.0/MiniBrowser
|
||||
%exclude %{_libexecdir}/webkit2gtk-4.0/WebKitPluginProcess2
|
||||
%{_bindir}/WebKitWebDriver
|
||||
|
||||
%files devel
|
||||
|
@ -281,9 +256,6 @@ make %{?_smp_mflags} -C %{_target_platform}
|
|||
%dir %{_datadir}/gir-1.0
|
||||
%{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
|
||||
|
||||
%files plugin-process-gtk2
|
||||
%{_libexecdir}/webkit2gtk-4.0/WebKitPluginProcess2
|
||||
|
||||
%files doc
|
||||
%dir %{_datadir}/gtk-doc
|
||||
%dir %{_datadir}/gtk-doc/html
|
||||
|
@ -292,6 +264,123 @@ make %{?_smp_mflags} -C %{_target_platform}
|
|||
%{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
|
||||
|
||||
%changelog
|
||||
* Tue Oct 22 2019 Eike Rathke <erack@redhat.com> - 2.27.2-1
|
||||
- Resolves: rhbz#1764135 Update to 2.27.2
|
||||
|
||||
* Fri Oct 04 2019 Eike Rathke <erack@redhat.com> - 2.27.1-1
|
||||
- Resolves: rhbz#1758590 Update to 2.27.1
|
||||
|
||||
* Thu Sep 26 2019 Eike Rathke <erack@redhat.com> - 2.26.1-1
|
||||
- Resolves: rhbz#1754472 Update to 2.26.1
|
||||
|
||||
* Thu Sep 19 2019 Michael Catanzaro <mcatanzaro@gnome.org> - 2.26.0-3
|
||||
- Enable WPE renderer, resolves rhbz#1753730
|
||||
|
||||
* Tue Sep 17 2019 Tomas Popela <tpopela@redhat.com> - 2.26.0-2
|
||||
- Backport fix for a crash when closing the view and HW acceleration is enabled
|
||||
- Resolves: rhbz#1750345
|
||||
- Backport fix for EGL_BAD_ALLOC
|
||||
- Resolves: rhbz#1751936
|
||||
|
||||
* Mon Sep 09 2019 Kalev Lember <klember@redhat.com> - 2.26.0-1
|
||||
- Update to 2.26.0
|
||||
|
||||
* Wed Sep 04 2019 Michael Catanzaro <mcatanzaro@gnome.org> - 2.25.92-2
|
||||
- Add patch to fix startup in X11 when not using gdm
|
||||
|
||||
* Tue Sep 03 2019 Eike Rathke <erack@redhat.com> - 2.25.92-1
|
||||
- Resolves: rhbz#1748305 Update to 2.25.92
|
||||
|
||||
* Fri Aug 02 2019 Eike Rathke <erack@redhat.com> - 2.25.4-1
|
||||
- Update to 2.25.4
|
||||
|
||||
* Fri Jul 26 2019 Tomas Popela <tpopela@redhat.com> - 2.25.3-2
|
||||
- Follow-up fixes for the GTK2 plugins support removal
|
||||
- Fixes: rhbz#1733436
|
||||
|
||||
* Tue Jul 23 2019 Eike Rathke <erack@redhat.com> - 2.25.3-1
|
||||
- Update to 2.25.3
|
||||
- This removes support for GTK 2 based NPAPI plugins (such as Adobe Flash)
|
||||
|
||||
* Wed Jul 17 2019 Adam Williamson <awilliam@redhat.com> - 2.25.2-2
|
||||
- Backport fix for crasher that affects Evolution (bwo#199621)
|
||||
|
||||
* Mon Jun 24 2019 Eike Rathke <erack@redhat.com> - 2.25.2-1
|
||||
- Update to 2.25.2
|
||||
|
||||
* Thu Jun 06 2019 Eike Rathke <erack@redhat.com> - 2.25.1-1
|
||||
- Update to 2.25.1
|
||||
|
||||
* Fri May 17 2019 Eike Rathke <erack@redhat.com> - 2.24.2-1
|
||||
- Update to 2.24.2
|
||||
|
||||
* Tue Apr 09 2019 Eike Rathke <erack@redhat.com> - 2.24.1-1
|
||||
- Update to 2.24.1
|
||||
|
||||
* Wed Mar 13 2019 Tomas Popela <tpopela@redhat.com> - 2.24.0-1
|
||||
- Update to 2.24.0
|
||||
|
||||
* Fri Mar 08 2019 Tomas Popela <tpopela@redhat.com> - 2.23.92-1
|
||||
- Update to 2.23.92
|
||||
- Switch to python3
|
||||
|
||||
* Wed Feb 20 2019 Eike Rathke <erack@redhat.com> - 2.23.91-1
|
||||
- Update to 2.23.91
|
||||
|
||||
* Mon Feb 18 2019 Eike Rathke <erack@redhat.com> - 2.23.90-1
|
||||
- Update to 2.23.90
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.23.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Jan 24 2019 Pete Walter <pwalter@fedoraproject.org> - 2.23.3-2
|
||||
- Rebuild for ICU 63
|
||||
|
||||
* Mon Jan 14 2019 Eike Rathke <erack@redhat.com> - 2.23.3-1
|
||||
- Update to 2.23.3
|
||||
|
||||
* Tue Nov 27 2018 Eike Rathke <erack@redhat.com> - 2.23.1-1
|
||||
- Update to 2.23.1
|
||||
|
||||
* Thu Nov 22 2018 Tomáš Popela <tpopela@redhat.com> - 2.22.4-1
|
||||
- Update to 2.22.4
|
||||
|
||||
* Thu Nov 01 2018 Tomas Popela <tpopela@redhat.com> - 2.22.3-2
|
||||
- Switch to using pkgconfig build requires
|
||||
- Switch to enchant-2
|
||||
- Resolves: rhbz#1631486
|
||||
|
||||
* Mon Oct 29 2018 Tomas Popela <tpopela@redhat.com> - 2.22.3-1
|
||||
- Update to 2.22.3
|
||||
|
||||
* Fri Oct 19 2018 Tomas Popela <tpopela@redhat.com> - 2.22.2-3
|
||||
- Fix WebProcess crash while printing
|
||||
- Resolves: rhbz#1639754
|
||||
|
||||
* Tue Sep 25 2018 Tomas Popela <tpopela@redhat.com> - 2.22.2-2
|
||||
- Switch to Ninja:
|
||||
-7 minutes on the x86_64
|
||||
-11 minutes on ppc64le
|
||||
-13 minutes on i686
|
||||
-13 minutes on s390x
|
||||
-10 minutes on armv7hl
|
||||
-19 minutes on aarch64
|
||||
|
||||
* Sun Sep 23 2018 Tomas Popela <tpopela@redhat.com> - 2.22.2-1
|
||||
- Update to 2.22.2
|
||||
|
||||
* Thu Sep 20 2018 Tomas Popela <tpopela@redhat.com> - 2.22.1-1
|
||||
- Update to 2.22.1
|
||||
|
||||
* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 2.22.0-3
|
||||
- Rebuilt against fixed atk (#1626575)
|
||||
|
||||
* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 2.22.0-2
|
||||
- Rebuilt for GNOME 3.30.0 megaupdate
|
||||
|
||||
* Mon Sep 03 2018 Tomas Popela <tpopela@redhat.com> - 2.22.0-1
|
||||
- Update to 2.22.0
|
||||
|
||||
* Thu Aug 30 2018 Tomas Popela <tpopela@redhat.com> - 2.21.92-2
|
||||
- Update the JSC build fix patch
|
||||
|
||||
|
|
Loading…
Reference in New Issue