Compare commits
17 Commits
71cbf5b6f5
...
203fa7016d
Author | SHA1 | Date |
---|---|---|
David Abdurachmanov | 203fa7016d | |
Tomas Popela | ddb1cb527a | |
Tomas Popela | 34fbaf44cc | |
Tomas Popela | d4c96f56d5 | |
Tomas Popela | 585ab8037b | |
Tomas Popela | f7457d620a | |
Tomas Popela | a72d475e01 | |
Tomas Popela | fabef55f6c | |
Tomas Popela | 829b3d1723 | |
Tomas Popela | a21e00047f | |
Tomas Popela | d6f27c6253 | |
Tomas Popela | 8151653c5f | |
Tomas Popela | f2d309c869 | |
Fedora Release Engineering | d2a5b3dc58 | |
Pete Walter | 7655392173 | |
Tomas Popela | 1472d0fbf6 | |
Tomas Popela | 0632cbe8ea |
|
@ -7,3 +7,8 @@
|
|||
/webkitgtk-2.20.1.tar.xz
|
||||
/webkitgtk-2.21.1.tar.xz
|
||||
/webkitgtk-2.21.2.tar.xz
|
||||
/webkitgtk-2.21.3.tar.xz
|
||||
/webkitgtk-2.21.4.tar.xz
|
||||
/webkitgtk-2.21.5.tar.xz
|
||||
/webkitgtk-2.21.91.tar.xz
|
||||
/webkitgtk-2.21.92.tar.xz
|
||||
|
|
|
@ -1,17 +0,0 @@
|
|||
diff --git a/Source/JavaScriptCore/heap/MarkedBlock.h b/Source/JavaScriptCore/heap/MarkedBlock.h
|
||||
index 7d14eecfd8d..95ea41c04dd 100644
|
||||
--- a/Source/JavaScriptCore/heap/MarkedBlock.h
|
||||
+++ b/Source/JavaScriptCore/heap/MarkedBlock.h
|
||||
@@ -66,7 +66,12 @@ private:
|
||||
friend class Handle;
|
||||
public:
|
||||
static constexpr size_t atomSize = 16; // bytes
|
||||
+
|
||||
+#if CPU(PPC64) || CPU(PPC64LE) || CPU(PPC) || CPU(UNKNOWN)
|
||||
+ static constexpr size_t blockSize = 64 * KB;
|
||||
+#else
|
||||
static constexpr size_t blockSize = 16 * KB;
|
||||
+#endif
|
||||
static constexpr size_t blockMask = ~(blockSize - 1); // blockSize must be a power of two.
|
||||
|
||||
static constexpr size_t atomsPerBlock = blockSize / atomSize;
|
|
@ -1,6 +1,19 @@
|
|||
diff -up webkitgtk-2.21.2/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl.python2 webkitgtk-2.21.2/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
|
||||
--- webkitgtk-2.21.2/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl.python2 2018-05-24 12:12:11.041670717 +0200
|
||||
+++ webkitgtk-2.21.2/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2018-05-24 12:12:44.277550443 +0200
|
||||
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
|
||||
|
||||
|
@ -10,3 +23,16 @@ diff -up webkitgtk-2.21.2/Source/WebInspectorUI/Scripts/copy-user-interface-reso
|
|||
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.2.tar.xz) = 990ab190e2649bb9a9d3dd512ab135bd7c12d4ec0aa60021a9f92b2ca10a840f7117404c6c3f076ec0a3fb3d8443d7e62d28aa95e75f6743702491048bd47325
|
||||
SHA512 (webkitgtk-2.21.92.tar.xz) = 372e9ee1ff00368e81f102b4a96aa07ec51187f81e04da201cdfaf901d5e30a4f3a9d6b29862c1afc7f5d70b1b9f36b7c21fc590aca5ebaf56fa5a01b37bf703
|
||||
|
|
|
@ -0,0 +1,25 @@
|
|||
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
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
|
||||
|
||||
Name: webkit2gtk3
|
||||
Version: 2.21.2
|
||||
Version: 2.21.92
|
||||
Release: 2.0.riscv64%{?dist}
|
||||
Summary: GTK+ Web content engine library
|
||||
|
||||
|
@ -21,23 +21,22 @@ Patch0: user-agent-branding.patch
|
|||
Patch1: fedora-crypto-policy.patch
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=132333
|
||||
Patch2: cloop-big-endians.patch
|
||||
# Silly workaround for
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=182923
|
||||
Patch3: page-size.patch
|
||||
# Explicitly specify python2 over python
|
||||
Patch4: python2.patch
|
||||
Patch3: python2.patch
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=189078
|
||||
Patch4: webkit-jsc-use-ternary-operator.patch
|
||||
# Add RISC-V (riscv64) support
|
||||
Patch5: webkitgtk-2.21.2-riscv64.patch
|
||||
|
||||
BuildRequires: at-spi2-core-devel
|
||||
BuildRequires: bison
|
||||
BuildRequires: brotli-devel
|
||||
BuildRequires: cairo-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: enchant-devel
|
||||
BuildRequires: flex
|
||||
BuildRequires: fontconfig-devel
|
||||
BuildRequires: freetype-devel
|
||||
BuildRequires: git
|
||||
BuildRequires: geoclue2-devel
|
||||
BuildRequires: gettext
|
||||
BuildRequires: gcc-c++
|
||||
|
@ -160,7 +159,7 @@ Provides: webkitgtk4-plugin-process-gtk2 = %{version}-%{release}
|
|||
Support for the GTK+ 2 based NPAPI plugins (such as Adobe Flash) for %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n webkitgtk-%{version}
|
||||
%autosetup -p1 -n webkitgtk-%{version} -S git
|
||||
|
||||
# Remove bundled libraries
|
||||
rm -rf Source/ThirdParty/gtest/
|
||||
|
@ -258,8 +257,9 @@ make %{?_smp_mflags} -C %{_target_platform}
|
|||
%{_libdir}/girepository-1.0/WebKit2WebExtension-4.0.typelib
|
||||
%{_libdir}/webkit2gtk-4.0/
|
||||
%{_libexecdir}/webkit2gtk-4.0/
|
||||
%{_bindir}/WebKitWebDriver
|
||||
%exclude %{_libexecdir}/webkit2gtk-4.0/MiniBrowser
|
||||
%exclude %{_libexecdir}/webkit2gtk-4.0/WebKitPluginProcess2
|
||||
%{_bindir}/WebKitWebDriver
|
||||
|
||||
%files devel
|
||||
%{_libexecdir}/webkit2gtk-4.0/MiniBrowser
|
||||
|
@ -298,9 +298,36 @@ make %{?_smp_mflags} -C %{_target_platform}
|
|||
%{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
|
||||
|
||||
%changelog
|
||||
* Fri May 25 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 2.21.2-2.0.riscv64
|
||||
* Thu Aug 30 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 2.21.92-2.0.riscv64
|
||||
- Add support for RISC-V (riscv64)
|
||||
|
||||
* Thu Aug 30 2018 Tomas Popela <tpopela@redhat.com> - 2.21.92-2
|
||||
- Update the JSC build fix patch
|
||||
|
||||
* Wed Aug 29 2018 Tomas Popela <tpopela@redhat.com> - 2.21.92-1
|
||||
- Update to 2.21.92
|
||||
|
||||
* Thu Aug 16 2018 Tomas Popela <tpopela@redhat.com> - 2.21.91-1
|
||||
- Update to 2.21.91
|
||||
|
||||
* Fri Jul 20 2018 Tomas Popela <tpopela@redhat.com> - 2.21.5-1
|
||||
- Update to 2.21.5
|
||||
|
||||
* Mon Jul 16 2018 Tomas Popela <tpopela@redhat.com> - 2.21.4-4
|
||||
- Fix the broken build due to python2 changes
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.21.4-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 2.21.4-2
|
||||
- Rebuild for ICU 62
|
||||
|
||||
* Tue Jun 12 2018 Tomas Popela <tpopela@redhat.com> - 2.21.4-1
|
||||
- Update to 2.21.4
|
||||
|
||||
* Mon May 28 2018 Tomas Popela <tpopela@redhat.com> - 2.21.3-1
|
||||
- Update to 2.21.3
|
||||
|
||||
* Thu May 24 2018 Tomas Popela <tpopela@redhat.com> - 2.21.2-2
|
||||
- Explicitly specify python2 over python and add python2 to BR
|
||||
|
||||
|
|
Loading…
Reference in New Issue