Compare commits
22 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
e503289818 | ||
|
ebc57ccca1 | ||
|
61ff89829d | ||
|
75efc2e13b | ||
|
dad790ba4f | ||
|
7d2a96a545 | ||
|
255943e946 | ||
|
f494ce509d | ||
|
5692fec063 | ||
|
af3fdac354 | ||
|
31b45aff39 | ||
|
a6ca6b93b7 | ||
|
d9291c72f8 | ||
|
ca7d7f3f67 | ||
|
23b3c5b4d3 | ||
|
1c412a3e4a | ||
|
3688ee843f | ||
|
040a65edcf | ||
|
20d5a63454 | ||
|
bce05e43ea | ||
|
b2ddaf24cc | ||
|
ea429a14ab |
@ -1,45 +0,0 @@
|
||||
diff -up webkit-qtwebkit-23/Source/WTF/wtf/dtoa.cpp.ppc64le webkit-qtwebkit-23/Source/WTF/wtf/dtoa.cpp
|
||||
--- webkit-qtwebkit-23/Source/WTF/wtf/dtoa.cpp.ppc64le 2014-09-24 06:42:05.000000000 -0500
|
||||
+++ webkit-qtwebkit-23/Source/WTF/wtf/dtoa.cpp 2014-10-16 11:06:24.935086905 -0500
|
||||
@@ -113,7 +113,7 @@ static ALWAYS_INLINE uint32_t* storeInc(
|
||||
#define Big0 (Frac_mask1 | Exp_msk1 * (DBL_MAX_EXP + Bias - 1))
|
||||
#define Big1 0xffffffff
|
||||
|
||||
-#if CPU(PPC64) || CPU(X86_64)
|
||||
+#if CPU(PPC64) || CPU(X86_64) || CPU(PPC64LE)
|
||||
// FIXME: should we enable this on all 64-bit CPUs?
|
||||
// 64-bit emulation provided by the compiler is likely to be slower than dtoa own code on 32-bit hardware.
|
||||
#define USE_LONG_LONG
|
||||
diff -up webkit-qtwebkit-23/Source/WTF/wtf/dtoa/utils.h.ppc64le webkit-qtwebkit-23/Source/WTF/wtf/dtoa/utils.h
|
||||
--- webkit-qtwebkit-23/Source/WTF/wtf/dtoa/utils.h.ppc64le 2014-10-16 11:06:24.935086905 -0500
|
||||
+++ webkit-qtwebkit-23/Source/WTF/wtf/dtoa/utils.h 2014-10-16 11:10:04.207685227 -0500
|
||||
@@ -49,7 +49,7 @@
|
||||
defined(__ARMEL__) || \
|
||||
defined(_MIPS_ARCH_MIPS32R2)
|
||||
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
|
||||
-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64) || CPU(AARCH64) || CPU(HPPA)
|
||||
+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64) || CPU(AARCH64) || CPU(HPPA)
|
||||
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
|
||||
#elif defined(_M_IX86) || defined(__i386__)
|
||||
#if defined(_WIN32)
|
||||
diff -up webkit-qtwebkit-23/Source/WTF/wtf/Platform.h.ppc64le webkit-qtwebkit-23/Source/WTF/wtf/Platform.h
|
||||
--- webkit-qtwebkit-23/Source/WTF/wtf/Platform.h.ppc64le 2014-10-16 11:06:24.936086920 -0500
|
||||
+++ webkit-qtwebkit-23/Source/WTF/wtf/Platform.h 2014-10-16 11:09:08.735022008 -0500
|
||||
@@ -130,6 +130,17 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+/* CPU(PPC64) - PowerPC 64-bit + LITTLE ENDIAN */
|
||||
+#if ( defined(__ppc64__) \
|
||||
+ || defined(__PPC64__) \
|
||||
+ || defined(__ppc64le__) \
|
||||
+ || defined(__PPC64LE__)) \
|
||||
+ && defined(__BYTE_ORDER__) \
|
||||
+ && (__BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__)
|
||||
+#define WTF_CPU_PPC64LE 1
|
||||
+#define WTF_CPU_LITTLE_ENDIAN 1
|
||||
+#endif
|
||||
+
|
||||
/* CPU(SH4) - SuperH SH-4 */
|
||||
#if defined(__SH4__)
|
||||
#define WTF_CPU_SH4 1
|
104
qtwebkit.spec
104
qtwebkit.spec
@ -5,7 +5,7 @@ Name: qtwebkit
|
||||
Summary: Qt WebKit bindings
|
||||
|
||||
Version: 2.3.4
|
||||
Release: 1%{?dist}
|
||||
Release: 21%{?dist}
|
||||
|
||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||
URL: http://trac.webkit.org/wiki/QtWebKit
|
||||
@ -50,20 +50,24 @@ Patch11: qtwebkit-23-LLInt-C-Loop-backend-ppc.patch
|
||||
# truly madly deeply no rpath please, kthxbye
|
||||
Patch14: webkit-qtwebkit-23-no_rpath.patch
|
||||
|
||||
# ppc64le support
|
||||
Patch15: qtwebkit-23-ppc64le.patch
|
||||
|
||||
## upstream patches
|
||||
# backport from qt5-qtwebkit
|
||||
# qtwebkit: undefined symbol: g_type_class_adjust_private_offset
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1202735
|
||||
Patch100: webkit-qtwebkit-23-gcc5.patch
|
||||
# backport from qt5-qtwebkit: URLs visited during private browsing show up in WebpageIcons.db
|
||||
Patch101: webkit-qtwebkit-23-private_browsing.patch
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: flex
|
||||
BuildRequires: gperf
|
||||
BuildRequires: libicu-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: pkgconfig(gio-2.0) pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(gio-2.0)
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.10
|
||||
BuildRequires: pkgconfig(fontconfig)
|
||||
# gstreamer media support
|
||||
%if 0%{?fedora} > 20 || 0%{?rhel} > 7
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
%global gstreamer1 1
|
||||
BuildRequires: pkgconfig(gstreamer-1.0) pkgconfig(gstreamer-app-1.0)
|
||||
%else
|
||||
@ -82,8 +86,10 @@ BuildRequires: pkgconfig(xext)
|
||||
BuildRequires: pkgconfig(xrender)
|
||||
BuildRequires: perl(version)
|
||||
BuildRequires: perl(Digest::MD5)
|
||||
BuildRequires: ruby
|
||||
%if 0%{?fedora}
|
||||
BuildRequires: perl(Getopt::Long)
|
||||
BuildRequires: python2
|
||||
BuildRequires: ruby ruby(rubygems)
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
# qt-mobility bits
|
||||
BuildRequires: pkgconfig(QtLocation) >= 1.2
|
||||
BuildRequires: pkgconfig(QtSensors) >= 1.2
|
||||
@ -95,6 +101,10 @@ Provides: qt4-webkit%{?_isa} = 2:%{version}-%{release}
|
||||
|
||||
Requires: mozilla-filesystem
|
||||
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
|
||||
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo "2.10")
|
||||
## Naughty glib2, adding new symbols without soname bump or symbol versioning... -- rex
|
||||
## https://bugzilla.redhat.com/show_bug.cgi?id=1202735
|
||||
Requires: glib2%{?_isa} >= %{glib2_version}
|
||||
|
||||
%description
|
||||
%{summary}
|
||||
@ -116,18 +126,18 @@ Provides: qt4-webkit-devel%{?_isa} = 2:%{version}-%{release}
|
||||
%patch1 -p1 -b .pluginpath
|
||||
%patch3 -p1 -b .debuginfo
|
||||
%patch4 -p1 -b .save_memory
|
||||
# all big-endian arches require the Double2Ints fix
|
||||
%ifarch ppc ppc64 s390 s390x
|
||||
%ifarch ppc ppc64 ppc64le s390 s390x %{mips}
|
||||
%patch10 -p1 -b .system-malloc
|
||||
%endif
|
||||
%ifarch ppc ppc64 s390 s390x mips mips64
|
||||
# all big-endian arches require the Double2Ints fix
|
||||
# still needed? -- rex
|
||||
%patch11 -p1 -b .Double2Ints
|
||||
%endif
|
||||
%patch14 -p1 -b .no_rpath
|
||||
|
||||
## Apply this last patch, as it deps so aarch stuffs
|
||||
%ifarch ppc64le
|
||||
%patch10 -p1 -b .system-malloc
|
||||
%patch15 -p1 -b .ppc64le
|
||||
%endif
|
||||
%patch100 -p1 -b .gcc5
|
||||
%patch101 -p1 -b .private_browsing
|
||||
|
||||
install -m755 -D %{SOURCE1} bin/qmake
|
||||
|
||||
@ -141,7 +151,7 @@ PATH=`pwd`/bin:%{_qt4_bindir}:$PATH; export PATH
|
||||
QMAKEPATH=`pwd`/Tools/qmake; export QMAKEPATH
|
||||
QTDIR=%{_qt4_prefix}; export QTDIR
|
||||
|
||||
%ifarch aarch64 ppc64le
|
||||
%ifarch aarch64 %{mips}
|
||||
%global qtdefines DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0
|
||||
%endif
|
||||
|
||||
@ -213,6 +223,68 @@ popd
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Mar 18 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.3.4-21
|
||||
- Update Python 2 dependency declarations to new packaging standards
|
||||
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Oct 25 2017 Troy Dawson <tdawson@redhat.com> - 2.3.4-19
|
||||
- Cleanup spec file conditionals
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.4-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Feb 01 2017 Sandro Mani <manisandro@gmail.com> - 2.3.4-14
|
||||
- Rebuild (libwebp)
|
||||
|
||||
* Tue Jan 31 2017 Merlin Mathesius <mmathesi@redhat.com> - 2.3.4-13
|
||||
- Add BuildRequires: python to fix FTBFS (BZ#1418102).
|
||||
|
||||
* Wed Nov 30 2016 Rex Dieter <rdieter@fedoraproject.org> - 2.3.4-12
|
||||
- rebuild
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Dec 30 2015 Michal Toman <mtoman@fedoraproject.org> - 2.3.4-10
|
||||
- Add support for MIPS (#1294886)
|
||||
|
||||
* Mon Dec 28 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 2.3.4-9
|
||||
- Rebuilt for libwebp soname bump
|
||||
|
||||
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.4-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.3.4-7
|
||||
- Rebuilt for GCC 5 C++11 ABI change
|
||||
|
||||
* Mon Mar 23 2015 Rex Dieter <rdieter@fedoraproject.org> 2.3.4-6
|
||||
- QtWebKit logs visited URLs to WebpageIcons.db in private browsing mode (#1204795)
|
||||
|
||||
* Mon Mar 23 2015 Rex Dieter <rdieter@fedoraproject.org> 2.3.4-5
|
||||
- drop ppc64le patch (that no longer applies or is needed)
|
||||
|
||||
* Fri Mar 20 2015 Rex Dieter <rdieter@fedoraproject.org> - 2.3.4-4
|
||||
- gcc-5.0.0-0.20.fc23 FTBFS qtwebkit (#1203008)
|
||||
- add versioned glib2 dep (#1202735)
|
||||
|
||||
* Tue Mar 17 2015 Rex Dieter <rdieter@fedoraproject.org> 2.3.4-3
|
||||
- qtwebkit enable jit for ppc64le (#1096330)
|
||||
|
||||
* Wed Feb 18 2015 Rex Dieter <rdieter@fedoraproject.org> 2.3.4-2
|
||||
- rebuild (gcc5)
|
||||
|
||||
* Thu Oct 16 2014 Rex Dieter <rdieter@fedoraproject.org> 2.3.4-1
|
||||
- qtwebkit-2.3.4
|
||||
|
||||
|
14
webkit-qtwebkit-23-gcc5.patch
Normal file
14
webkit-qtwebkit-23-gcc5.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff -up webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp.gcc5 webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp
|
||||
--- webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp.gcc5 2014-09-24 06:42:05.000000000 -0500
|
||||
+++ webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp 2015-03-20 08:15:53.192778375 -0500
|
||||
@@ -1922,6 +1922,10 @@ void JSObject::putByIndexBeyondVectorLen
|
||||
}
|
||||
}
|
||||
|
||||
+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
|
||||
+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
|
||||
+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
|
||||
+
|
||||
void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
|
||||
{
|
||||
JSGlobalData& globalData = exec->globalData();
|
25
webkit-qtwebkit-23-private_browsing.patch
Normal file
25
webkit-qtwebkit-23-private_browsing.patch
Normal file
@ -0,0 +1,25 @@
|
||||
diff -up webkit-qtwebkit-23/Source/WebCore/loader/icon/IconController.cpp.private_browsing webkit-qtwebkit-23/Source/WebCore/loader/icon/IconController.cpp
|
||||
--- webkit-qtwebkit-23/Source/WebCore/loader/icon/IconController.cpp.private_browsing 2014-09-24 06:42:05.000000000 -0500
|
||||
+++ webkit-qtwebkit-23/Source/WebCore/loader/icon/IconController.cpp 2015-03-23 11:20:04.050447318 -0500
|
||||
@@ -163,6 +163,10 @@ void IconController::startLoader()
|
||||
}
|
||||
|
||||
if (iconDatabase().supportsAsynchronousMode()) {
|
||||
+ // FIXME (<rdar://problem/9168605>) - We should support in-memory-only private browsing icons in asynchronous icon database mode.
|
||||
+ if (m_frame->page()->settings()->privateBrowsingEnabled())
|
||||
+ return;
|
||||
+
|
||||
m_frame->loader()->documentLoader()->getIconLoadDecisionForIconURL(urlString);
|
||||
// Commit the icon url mapping to the database just in case we don't end up loading later.
|
||||
commitToDatabase(iconURL);
|
||||
@@ -206,10 +210,6 @@ void IconController::continueLoadWithDec
|
||||
{
|
||||
ASSERT(iconLoadDecision != IconLoadUnknown);
|
||||
|
||||
- // FIXME (<rdar://problem/9168605>) - We should support in-memory-only private browsing icons in asynchronous icon database mode.
|
||||
- if (iconDatabase().supportsAsynchronousMode() && m_frame->page()->settings()->privateBrowsingEnabled())
|
||||
- return;
|
||||
-
|
||||
if (iconLoadDecision == IconLoadNo) {
|
||||
KURL iconURL(url());
|
||||
String urlString(iconURL.string());
|
Loading…
Reference in New Issue
Block a user