Compare commits
107 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 | ||
|
01ad6ba8be | ||
|
8ceb9b9ec5 | ||
|
187e0db424 | ||
|
12cdfa4232 | ||
|
4564ccf943 | ||
|
818fd64f3d | ||
|
d2eed13264 | ||
|
21d9fad3e3 | ||
|
628712584c | ||
|
69c2afd3d0 | ||
|
41b34c333a | ||
|
d56c2b8a13 | ||
|
2f54342ece | ||
|
c22af0555b | ||
|
b9c539cc50 | ||
|
6b590a97c3 | ||
|
e5b1f45ff4 | ||
|
aaae34c9e9 | ||
|
743c205e63 | ||
|
56652ee7c3 | ||
|
a0ea2817bb | ||
|
30bd45bb64 | ||
|
8f60fcf973 | ||
|
7da03a3caa | ||
|
103224fa3a | ||
|
4acbe02d36 | ||
|
6230cecc69 | ||
|
28bc4e363b | ||
|
34761255a8 | ||
|
df5f3f64dc | ||
|
4fc5d69459 | ||
|
5b212d2113 | ||
|
3435ed35a7 | ||
|
10c1a5330b | ||
|
38733a1e38 | ||
|
c9ba2bd014 | ||
|
8e4a591dae | ||
|
673d07ffa5 | ||
|
b59e394103 | ||
|
c81a283cdd | ||
|
1bdbbcda01 | ||
|
3712689abb | ||
|
bea731c670 | ||
|
e9d5930dd1 | ||
|
e36b1dc3fe | ||
|
4822351c53 | ||
|
0ddcb1af11 | ||
|
60efd8b54c | ||
|
9985f39d64 | ||
|
28ee8db430 | ||
|
862814ac15 | ||
|
23b0fc519f | ||
|
ea96e059ed | ||
|
15b5dce55c | ||
|
86c4a22151 | ||
|
cf9a32af04 | ||
|
69980c3359 | ||
|
22b215654f | ||
|
53d898afac | ||
|
517aece940 | ||
|
704a6d8479 | ||
|
064b733c5a | ||
|
7c73396e54 | ||
|
a79d979d87 | ||
|
e4254332d6 | ||
|
dbb8a01304 | ||
|
d1403f6267 | ||
|
53896f102f | ||
|
679265c83a | ||
|
e3d6907053 | ||
|
a0919c6a00 | ||
|
6b628e5d2b | ||
|
a5364653a4 | ||
|
6217366e71 | ||
|
003945f410 | ||
|
f7f4b75b2a | ||
|
13e23beaf2 | ||
|
eace7ea864 | ||
|
f0030e06d1 | ||
|
4de6c798ea | ||
|
fb793c02c7 | ||
|
9b19c8baf9 | ||
|
64965bf5a7 | ||
|
e0fa781725 | ||
|
ea356d4f11 |
3
.gitignore
vendored
3
.gitignore
vendored
@ -0,0 +1,3 @@
|
|||||||
|
/qtwebkit-developers-qtwebkit-qtwebkit-2.1.1.tar.xz
|
||||||
|
/qtwebkit-2.3.3.tar.xz
|
||||||
|
/qtwebkit-2.3.4.tar.gz
|
7
qmake.sh
Executable file
7
qmake.sh
Executable file
@ -0,0 +1,7 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
qmake-qt4 \
|
||||||
|
$@ \
|
||||||
|
QMAKE_CFLAGS="${CFLAGS}" \
|
||||||
|
QMAKE_CXXFLAGS="${CXXFLAGS}" \
|
||||||
|
QMAKE_LFLAGS="${LDFLAGS}" \
|
16
qtwebkit-2.3-debuginfo.patch
Normal file
16
qtwebkit-2.3-debuginfo.patch
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
diff -up webkit-qtwebkit-23/Source/WebCore/WebCore.pri.debuginfo webkit-qtwebkit-23/Source/WebCore/WebCore.pri
|
||||||
|
--- webkit-qtwebkit-23/Source/WebCore/WebCore.pri.debuginfo 2013-02-21 22:28:57.791764043 -0600
|
||||||
|
+++ webkit-qtwebkit-23/Source/WebCore/WebCore.pri 2013-02-21 22:31:02.994198797 -0600
|
||||||
|
@@ -7,6 +7,12 @@
|
||||||
|
|
||||||
|
SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebCore
|
||||||
|
|
||||||
|
+#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64)|equals(QT_ARCH, powerpc64)|equals(QT_ARCH, powerpc) {
|
||||||
|
+ message("WebCore workaround for QtWebkit: do not build with -g, but with -g1")
|
||||||
|
+ QMAKE_CXXFLAGS_RELEASE -= -g
|
||||||
|
+ QMAKE_CXXFLAGS_RELEASE += -g1
|
||||||
|
+#}
|
||||||
|
+
|
||||||
|
QT *= network
|
||||||
|
haveQt(5): QT *= core-private gui-private
|
||||||
|
|
12
qtwebkit-2.3-save_memory.patch
Normal file
12
qtwebkit-2.3-save_memory.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up webkit-qtwebkit-23/Source/WebCore/WebCore.pri.save_memory webkit-qtwebkit-23/Source/WebCore/WebCore.pri
|
||||||
|
--- webkit-qtwebkit-23/Source/WebCore/WebCore.pri.save_memory 2013-02-15 09:46:12.000000000 -0600
|
||||||
|
+++ webkit-qtwebkit-23/Source/WebCore/WebCore.pri 2013-02-21 16:42:30.996634743 -0600
|
||||||
|
@@ -336,6 +336,8 @@ mac {
|
||||||
|
}
|
||||||
|
unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections
|
||||||
|
unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
|
||||||
|
+unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--no-keep-memory
|
||||||
|
+unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--reduce-memory-overheads
|
||||||
|
linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
|
||||||
|
|
||||||
|
unix|win32-g++* {
|
51
qtwebkit-23-LLInt-C-Loop-backend-ppc.patch
Normal file
51
qtwebkit-23-LLInt-C-Loop-backend-ppc.patch
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
diff -up webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.Double2Ints webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
|
||||||
|
--- webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.Double2Ints 2013-04-16 04:49:21.000000000 -0500
|
||||||
|
+++ webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-04-19 09:38:20.133519114 -0500
|
||||||
|
@@ -1708,7 +1708,7 @@ _llint_op_next_pname:
|
||||||
|
loadi 20[PC], t2
|
||||||
|
loadi PayloadOffset[cfr, t2, 8], t2
|
||||||
|
loadp JSPropertyNameIterator::m_jsStrings[t2], t3
|
||||||
|
- loadi [t3, t0, 8], t3
|
||||||
|
+ loadi PayloadOffset[t3, t0, 8], t3
|
||||||
|
addi 1, t0
|
||||||
|
storei t0, PayloadOffset[cfr, t1, 8]
|
||||||
|
loadi 4[PC], t1
|
||||||
|
diff -up webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.Double2Ints webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
|
||||||
|
--- webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.Double2Ints 2013-04-16 04:49:21.000000000 -0500
|
||||||
|
+++ webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-04-19 09:38:20.133519114 -0500
|
||||||
|
@@ -267,13 +267,13 @@ macro assertNotConstant(index)
|
||||||
|
end
|
||||||
|
|
||||||
|
macro functionForCallCodeBlockGetter(targetRegister)
|
||||||
|
- loadp Callee[cfr], targetRegister
|
||||||
|
+ loadp Callee + PayloadOffset[cfr], targetRegister
|
||||||
|
loadp JSFunction::m_executable[targetRegister], targetRegister
|
||||||
|
loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister
|
||||||
|
end
|
||||||
|
|
||||||
|
macro functionForConstructCodeBlockGetter(targetRegister)
|
||||||
|
- loadp Callee[cfr], targetRegister
|
||||||
|
+ loadp Callee + PayloadOffset[cfr], targetRegister
|
||||||
|
loadp JSFunction::m_executable[targetRegister], targetRegister
|
||||||
|
loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister
|
||||||
|
end
|
||||||
|
@@ -845,7 +845,7 @@ macro interpretResolveWithBase(opcodeLen
|
||||||
|
getResolveOperation(4, t0, t1)
|
||||||
|
btpz t0, .slowPath
|
||||||
|
|
||||||
|
- loadp ScopeChain[cfr], t3
|
||||||
|
+ loadp ScopeChain + PayloadOffset[cfr], t3
|
||||||
|
# Get the base
|
||||||
|
loadis ResolveOperation::m_operation[t0], t2
|
||||||
|
|
||||||
|
diff -up webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.Double2Ints webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
|
||||||
|
--- webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.Double2Ints 2013-04-16 04:49:21.000000000 -0500
|
||||||
|
+++ webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 2013-04-19 09:38:20.134519102 -0500
|
||||||
|
@@ -33,6 +33,7 @@
|
||||||
|
|
||||||
|
#if ENABLE(LLINT_C_LOOP)
|
||||||
|
#include "CodeBlock.h"
|
||||||
|
+#include "JSValueInlines.h"
|
||||||
|
#include "LLIntCLoop.h"
|
||||||
|
#include "LLIntSlowPaths.h"
|
||||||
|
#include "VMInspector.h"
|
37
qtwebkit-ppc.patch
Normal file
37
qtwebkit-ppc.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
diff -up webkit-qtwebkit-23/Source/cmake/WebKitFeatures.cmake.me webkit-qtwebkit-23/Source/cmake/WebKitFeatures.cmake
|
||||||
|
--- webkit-qtwebkit-23/Source/cmake/WebKitFeatures.cmake.me 2013-02-25 15:53:12.278297141 +0100
|
||||||
|
+++ webkit-qtwebkit-23/Source/cmake/WebKitFeatures.cmake 2013-02-25 15:53:42.134167593 +0100
|
||||||
|
@@ -125,7 +125,7 @@ MACRO (WEBKIT_OPTION_BEGIN)
|
||||||
|
WEBKIT_OPTION_DEFINE(ENABLE_WORKERS "Toggle Web Workers support" OFF)
|
||||||
|
WEBKIT_OPTION_DEFINE(ENABLE_XHR_TIMEOUT "Toggle XHR timeout support" OFF)
|
||||||
|
WEBKIT_OPTION_DEFINE(ENABLE_XSLT "Toggle XSLT support" ON)
|
||||||
|
- WEBKIT_OPTION_DEFINE(USE_SYSTEM_MALLOC "Toggle system allocator instead of TCmalloc" OFF)
|
||||||
|
+ WEBKIT_OPTION_DEFINE(USE_SYSTEM_MALLOC "Toggle system allocator instead of TCmalloc" ON)
|
||||||
|
WEBKIT_OPTION_DEFINE(WTF_USE_TILED_BACKING_STORE "Toggle Tiled Backing Store support" OFF)
|
||||||
|
WEBKIT_OPTION_DEFINE(WTF_USE_WTFURL "Toogle the use of WTFURL for URL parsing" OFF)
|
||||||
|
ENDMACRO ()
|
||||||
|
diff -up webkit-qtwebkit-23/Source/WTF/wtf/PageAllocationAligned.cpp.me webkit-qtwebkit-23/Source/WTF/wtf/PageAllocationAligned.cpp
|
||||||
|
--- webkit-qtwebkit-23/Source/WTF/wtf/PageAllocationAligned.cpp.me 2013-02-25 15:54:06.974227858 +0100
|
||||||
|
+++ webkit-qtwebkit-23/Source/WTF/wtf/PageAllocationAligned.cpp 2013-02-25 15:55:02.355132792 +0100
|
||||||
|
@@ -50,7 +50,9 @@ PageAllocationAligned PageAllocationAlig
|
||||||
|
vm_map(current_task(), &address, size, alignmentMask, flags, MEMORY_OBJECT_NULL, 0, FALSE, protection, PROT_READ | PROT_WRITE | PROT_EXEC, VM_INHERIT_DEFAULT);
|
||||||
|
return PageAllocationAligned(reinterpret_cast<void*>(address), size);
|
||||||
|
#else
|
||||||
|
- size_t alignmentDelta = alignment - pageSize();
|
||||||
|
+ size_t pagesize = pageSize();
|
||||||
|
+ if (alignment < pagesize) alignment = pagesize;
|
||||||
|
+ size_t alignmentDelta = alignment - pagesize;
|
||||||
|
|
||||||
|
// Resererve with suffcient additional VM to correctly align.
|
||||||
|
size_t reservationSize = size + alignmentDelta;
|
||||||
|
--- webkit-qtwebkit-23/Source/WTF/wtf/Platform.h.system-malloc 2013-02-15 16:46:12.000000000 +0100
|
||||||
|
+++ webkit-qtwebkit-23/Source/WTF/wtf/Platform.h 2013-02-27 14:50:28.044688152 +0100
|
||||||
|
@@ -1011,7 +1011,7 @@
|
||||||
|
#define ENABLE_REGEXP_TRACING 0
|
||||||
|
|
||||||
|
/* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
|
||||||
|
-#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !PLATFORM(CHROMIUM)
|
||||||
|
+#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && !PLATFORM(CHROMIUM)
|
||||||
|
#define ENABLE_YARR_JIT 1
|
||||||
|
|
||||||
|
/* Setting this flag compares JIT results with interpreter results. */
|
528
qtwebkit.spec
Normal file
528
qtwebkit.spec
Normal file
@ -0,0 +1,528 @@
|
|||||||
|
|
||||||
|
%global _hardened_build 1
|
||||||
|
|
||||||
|
Name: qtwebkit
|
||||||
|
Summary: Qt WebKit bindings
|
||||||
|
|
||||||
|
Version: 2.3.4
|
||||||
|
Release: 21%{?dist}
|
||||||
|
|
||||||
|
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||||
|
URL: http://trac.webkit.org/wiki/QtWebKit
|
||||||
|
## This was how qtwebkit-2.2 did it (no longer works for 2.3)
|
||||||
|
# get make-package.py:
|
||||||
|
# $ git clone git://qt.gitorious.org/qtwebkit/tools.git
|
||||||
|
# get Qt WebKit source code:
|
||||||
|
# $ git clone git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git
|
||||||
|
# create a branch from a tag (e.g. qtwebkit-2.2.2):
|
||||||
|
# $ git checkout -b qtwebkit-2.2.2 qtwebkit-2.2.2
|
||||||
|
# generate the tarball (requires: bison flex gperf):
|
||||||
|
# $ make-package.py
|
||||||
|
# fix/repack the generated tarball:
|
||||||
|
# $ tar xzf qtwebkit-2.2.2-source.tar.gz
|
||||||
|
# $ mv qtwebkit-2.2.2-source/include qtwebkit-2.2.2-source/Source/
|
||||||
|
# $ tar cJf qtwebkit-2.2.2-source.tar.xz qtwebkit-2.2.2-source/
|
||||||
|
##
|
||||||
|
# download from
|
||||||
|
# https://gitorious.org/webkit/qtwebkit-23/archive-tarball/qtwebkit-%{version}
|
||||||
|
# repack as .xz
|
||||||
|
#Source0: qtwebkit-%{version}.tar.xz
|
||||||
|
Source0: http://download.kde.org/stable/qtwebkit-2.3/%{version}/src/qtwebkit-%{version}.tar.gz
|
||||||
|
# qmake wrapper
|
||||||
|
Source1: qmake.sh
|
||||||
|
|
||||||
|
# search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too
|
||||||
|
Patch1: webkit-qtwebkit-2.2-tp1-pluginpath.patch
|
||||||
|
|
||||||
|
# smaller debuginfo s/-g/-g1/ (debian uses -gstabs) to avoid 4gb size limit
|
||||||
|
Patch3: qtwebkit-2.3-debuginfo.patch
|
||||||
|
|
||||||
|
# tweak linker flags to minimize memory usage on "small" platforms
|
||||||
|
Patch4: qtwebkit-2.3-save_memory.patch
|
||||||
|
|
||||||
|
# use SYSTEM_MALLOC on ppc/ppc64, plus some additional minor tweaks (needed only on ppc? -- rex)
|
||||||
|
Patch10: qtwebkit-ppc.patch
|
||||||
|
|
||||||
|
# add missing function Double2Ints(), backport
|
||||||
|
# rebased for 2.3.1, not sure if this is still needed? -- rex
|
||||||
|
Patch11: qtwebkit-23-LLInt-C-Loop-backend-ppc.patch
|
||||||
|
|
||||||
|
# truly madly deeply no rpath please, kthxbye
|
||||||
|
Patch14: webkit-qtwebkit-23-no_rpath.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)
|
||||||
|
BuildRequires: pkgconfig(glib-2.0) >= 2.10
|
||||||
|
BuildRequires: pkgconfig(fontconfig)
|
||||||
|
# gstreamer media support
|
||||||
|
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||||
|
%global gstreamer1 1
|
||||||
|
BuildRequires: pkgconfig(gstreamer-1.0) pkgconfig(gstreamer-app-1.0)
|
||||||
|
%else
|
||||||
|
# We don't want to use GStreamer 1 where the rest of the Qt 4 stack doesn't,
|
||||||
|
# or we run into symbol conflicts. So build against GStreamer 0.10 on Fedora up
|
||||||
|
# to 20 and RHEL up to 7. (Up to RHEL 6, GStreamer 0.10 is the only option.)
|
||||||
|
BuildRequires: pkgconfig(gstreamer-0.10) pkgconfig(gstreamer-app-0.10)
|
||||||
|
%endif
|
||||||
|
BuildRequires: pkgconfig(libpcre)
|
||||||
|
BuildRequires: pkgconfig(libpng)
|
||||||
|
BuildRequires: pkgconfig(libwebp)
|
||||||
|
BuildRequires: pkgconfig(libxslt)
|
||||||
|
BuildRequires: pkgconfig(QtCore) pkgconfig(QtNetwork)
|
||||||
|
BuildRequires: pkgconfig(sqlite3)
|
||||||
|
BuildRequires: pkgconfig(xext)
|
||||||
|
BuildRequires: pkgconfig(xrender)
|
||||||
|
BuildRequires: perl(version)
|
||||||
|
BuildRequires: perl(Digest::MD5)
|
||||||
|
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
|
||||||
|
%endif
|
||||||
|
Obsoletes: qt-webkit < 1:4.9.0
|
||||||
|
Provides: qt-webkit = 2:%{version}-%{release}
|
||||||
|
Provides: qt4-webkit = 2:%{version}-%{release}
|
||||||
|
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}
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Summary: Development files for %{name}
|
||||||
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
Obsoletes: qt-webkit-devel < 1:4.9.0
|
||||||
|
Provides: qt-webkit-devel = 2:%{version}-%{release}
|
||||||
|
Provides: qt4-webkit-devel = 2:%{version}-%{release}
|
||||||
|
Provides: qt4-webkit-devel%{?_isa} = 2:%{version}-%{release}
|
||||||
|
%description devel
|
||||||
|
%{summary}.
|
||||||
|
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q -c -n webkit-qtwebkit-23
|
||||||
|
|
||||||
|
%patch1 -p1 -b .pluginpath
|
||||||
|
%patch3 -p1 -b .debuginfo
|
||||||
|
%patch4 -p1 -b .save_memory
|
||||||
|
%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
|
||||||
|
|
||||||
|
%patch100 -p1 -b .gcc5
|
||||||
|
%patch101 -p1 -b .private_browsing
|
||||||
|
|
||||||
|
install -m755 -D %{SOURCE1} bin/qmake
|
||||||
|
|
||||||
|
|
||||||
|
%build
|
||||||
|
|
||||||
|
CFLAGS="%{optflags}"; export CFLAGS
|
||||||
|
CXXFLAGS="%{optflags}"; export CXXFLAGS
|
||||||
|
LDFLAGS="%{?__global_ldflags}"; export LDFLAGS
|
||||||
|
PATH=`pwd`/bin:%{_qt4_bindir}:$PATH; export PATH
|
||||||
|
QMAKEPATH=`pwd`/Tools/qmake; export QMAKEPATH
|
||||||
|
QTDIR=%{_qt4_prefix}; export QTDIR
|
||||||
|
|
||||||
|
%ifarch aarch64 %{mips}
|
||||||
|
%global qtdefines DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0
|
||||||
|
%endif
|
||||||
|
|
||||||
|
mkdir -p %{_target_platform}
|
||||||
|
pushd %{_target_platform}
|
||||||
|
WEBKITOUTPUTDIR=`pwd`; export WEBKITOUTPUTDIR
|
||||||
|
../Tools/Scripts/build-webkit \
|
||||||
|
--qt %{?qtdefines} \
|
||||||
|
--no-webkit2 \
|
||||||
|
--release \
|
||||||
|
--qmakearg="CONFIG+=production_build DEFINES+=HAVE_LIBWEBP=1" \
|
||||||
|
--makeargs="%{?_smp_mflags}" \
|
||||||
|
--system-malloc
|
||||||
|
popd
|
||||||
|
|
||||||
|
%ifarch %{ix86}
|
||||||
|
# build safe(r) non-sse2-enabled version
|
||||||
|
mkdir -p %{_target_platform}-no_sse2
|
||||||
|
pushd %{_target_platform}-no_sse2
|
||||||
|
WEBKITOUTPUTDIR=`pwd`; export WEBKITOUTPUTDIR
|
||||||
|
../Tools/Scripts/build-webkit \
|
||||||
|
--qt \
|
||||||
|
--no-webkit2 \
|
||||||
|
--release \
|
||||||
|
--qmakearg="CONFIG+=production_build DEFINES+=HAVE_LIBWEBP=1" \
|
||||||
|
--makeargs="%{?_smp_mflags}" \
|
||||||
|
--system-malloc \
|
||||||
|
--no-force-sse2
|
||||||
|
popd
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
%install
|
||||||
|
make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}/Release
|
||||||
|
|
||||||
|
%ifarch %{ix86}
|
||||||
|
mkdir -p %{buildroot}%{_qt4_libdir}/sse2/
|
||||||
|
mv %{buildroot}%{_qt4_libdir}/libQtWebKit.so.4* %{buildroot}%{_qt4_libdir}/sse2/
|
||||||
|
make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}-no_sse2/Release
|
||||||
|
%endif
|
||||||
|
|
||||||
|
## pkgconfig love
|
||||||
|
# drop Libs.private, it contains buildroot references, and
|
||||||
|
# we don't support static linking libQtWebKit anyway
|
||||||
|
pushd %{buildroot}%{_libdir}/pkgconfig
|
||||||
|
grep -v "^Libs.private:" QtWebKit.pc > QtWebKit.pc.new && \
|
||||||
|
mv QtWebKit.pc.new QtWebKit.pc
|
||||||
|
popd
|
||||||
|
|
||||||
|
|
||||||
|
%post -p /sbin/ldconfig
|
||||||
|
%postun -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%files
|
||||||
|
%{_qt4_libdir}/libQtWebKit.so.4*
|
||||||
|
%ifarch %{ix86}
|
||||||
|
%{_qt4_libdir}/sse2/libQtWebKit.so.4*
|
||||||
|
%endif
|
||||||
|
%if 0%{?_qt4_importdir:1}
|
||||||
|
%{_qt4_importdir}/QtWebKit/
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%files devel
|
||||||
|
%{_qt4_datadir}/mkspecs/modules/qt_webkit.pri
|
||||||
|
%{_qt4_headerdir}/QtWebKit/
|
||||||
|
%{_qt4_libdir}/libQtWebKit.prl
|
||||||
|
%{_qt4_libdir}/libQtWebKit.so
|
||||||
|
%{_libdir}/pkgconfig/QtWebKit.pc
|
||||||
|
|
||||||
|
|
||||||
|
%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
|
||||||
|
|
||||||
|
* Tue Sep 23 2014 Rex Dieter <rdieter@fedoraproject.org> 2.3.3-18
|
||||||
|
- enable hardened build (#1051790)
|
||||||
|
|
||||||
|
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.3-17
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jul 20 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 2.3.3-16
|
||||||
|
- build against GStreamer1 on F21+ (#1092642, patch from openSUSE)
|
||||||
|
|
||||||
|
* Fri Jun 20 2014 Rex Dieter <rdieter@fedoraproject.org> 2.3.3-15
|
||||||
|
- use pkgconfig deps for qt-mobility
|
||||||
|
|
||||||
|
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.3-14
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed May 07 2014 Jaromir Capik <jcapik@redhat.com> - 2.3.3-13
|
||||||
|
- ppc64le support
|
||||||
|
|
||||||
|
* Mon May 05 2014 Rex Dieter <rdieter@fedoraproject.org> 2.3.3-12
|
||||||
|
- Requires: mozilla-filesystem (#1000673)
|
||||||
|
|
||||||
|
* Fri May 02 2014 Rex Dieter <rdieter@fedoraproject.org> 2.3.3-11
|
||||||
|
- no need to set empty qtdefines macro
|
||||||
|
- no rpath for real, drop chrpath hacks
|
||||||
|
|
||||||
|
* Sat Mar 08 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 2.3.3-10
|
||||||
|
- rebuild against fixed qt to fix -debuginfo (#1074041)
|
||||||
|
|
||||||
|
* Thu Mar 06 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2.3.3-9
|
||||||
|
- update aarch64 patchset
|
||||||
|
|
||||||
|
* Fri Feb 28 2014 Rex Dieter <rdieter@fedoraproject.org> 2.3.3-8
|
||||||
|
- initial backport aarch64 javascriptcore fixes, needswork (#1070446)
|
||||||
|
- apply downstream patches *after* upstream ones
|
||||||
|
|
||||||
|
* Thu Feb 13 2014 Rex Dieter <rdieter@fedoraproject.org> 2.3.3-7
|
||||||
|
- backport more upstream fixes
|
||||||
|
|
||||||
|
* Thu Feb 13 2014 Rex Dieter <rdieter@fedoraproject.org> 2.3.3-6
|
||||||
|
- ftbfs using bison3
|
||||||
|
|
||||||
|
* Wed Feb 12 2014 Rex Dieter <rdieter@fedoraproject.org> 2.3.3-5
|
||||||
|
- rebuild (libicu)
|
||||||
|
|
||||||
|
* Wed Jan 01 2014 Rex Dieter <rdieter@fedoraproject.org> 2.3.3-4
|
||||||
|
- rebuild (libwebp)
|
||||||
|
|
||||||
|
* Wed Dec 11 2013 Rex Dieter <rdieter@fedoraproject.org> - 2.3.3-3
|
||||||
|
- support out-of-source-tree build
|
||||||
|
- %%ix86: build both no-sse2 and sse2 versions
|
||||||
|
|
||||||
|
* Mon Dec 09 2013 Rex Dieter <rdieter@fedoraproject.org> 2.3.3-2
|
||||||
|
- build-webkit --system-malloc (unconditionally, WAS only ppc)
|
||||||
|
|
||||||
|
* Thu Oct 03 2013 Rex Dieter <rdieter@fedoraproject.org> 2.3.3-1
|
||||||
|
- qtwebkit-2.3.3
|
||||||
|
- include some post 2.3.3 commits/fixes
|
||||||
|
|
||||||
|
* Thu Sep 12 2013 Rex Dieter <rdieter@fedoraproject.org> 2.3.2-3
|
||||||
|
- SIGSEGV - ~NonSharedCharacterBreakIterator (#1006539, webkit#101337)
|
||||||
|
|
||||||
|
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.2-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 11 2013 Rex Dieter <rdieter@fedoraproject.org> 2.3.2-1
|
||||||
|
- qtwebkit-2.3.2
|
||||||
|
|
||||||
|
* Thu Apr 18 2013 Rex Dieter <rdieter@fedoraproject.org> - 2.3.1-1
|
||||||
|
- qtwebkit-2.3.1
|
||||||
|
- -devel: drop explicit Requires: qt4-devel (let pkgconfig deps do it)
|
||||||
|
|
||||||
|
* Mon Mar 25 2013 Dan Horák <dan[at]danny.cz> 2.3.0-2
|
||||||
|
- use ppc fixes also on s390
|
||||||
|
|
||||||
|
* Fri Mar 15 2013 Rex Dieter <rdieter@fedoraproject.org> 2.3.0-1
|
||||||
|
- 2.3.0 (final)
|
||||||
|
- enable libwebp support
|
||||||
|
- .spec cleanup
|
||||||
|
|
||||||
|
* Sat Mar 09 2013 Rex Dieter <rdieter@fedoraproject.org> 2.3-0.6.rc1
|
||||||
|
- should use libxml and libxslt (#919778)
|
||||||
|
|
||||||
|
* Sat Mar 09 2013 Rex Dieter <rdieter@fedoraproject.org> 2.3-0.5.rc1
|
||||||
|
- qt_webkit_version.pri is missing in 2.3-rc1 package (#919477)
|
||||||
|
|
||||||
|
* Tue Mar 05 2013 Rex Dieter <rdieter@fedoraproject.org> 2.3-0.4.rc1
|
||||||
|
- 2.3-rc1
|
||||||
|
|
||||||
|
* Tue Mar 05 2013 Than Ngo <than@redhat.com> - 2.3-0.3.beta2
|
||||||
|
- add missing function Double2Ints() on ppc, backport
|
||||||
|
|
||||||
|
* Mon Feb 25 2013 Than Ngo <than@redhat.com> - 2.3-0.2.beta2
|
||||||
|
- fix 64k page issue on ppc/ppc64
|
||||||
|
- set -g1 on ppc/ppc64 to reduce archive size
|
||||||
|
|
||||||
|
* Thu Feb 21 2013 Rex Dieter <rdieter@fedoraproject.org> 2.3-0.1.beta2
|
||||||
|
- qtwebkit-2.3-beta2
|
||||||
|
|
||||||
|
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.2-9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jan 22 2013 Rex Dieter <rdieter@fedoraproject.org> 2.2.2-8
|
||||||
|
- fix rpath (#902571)
|
||||||
|
|
||||||
|
* Tue Jan 15 2013 Than Ngo <than@redhat.com> - 2.2.2-7
|
||||||
|
- use SYSTEM_MALLOC on ppc/ppc64
|
||||||
|
|
||||||
|
* Fri Jan 11 2013 Than Ngo <than@redhat.com> 2.2.2-6
|
||||||
|
- bz#893447, fix 64k pagesize issue
|
||||||
|
|
||||||
|
* Fri Jan 04 2013 Rex Dieter <rdieter@fedoraproject.org> 2.2.2-5
|
||||||
|
- segfault in requiresLineBox at rendering/RenderBlockLineLayout.cpp (#891464)
|
||||||
|
|
||||||
|
* Mon Dec 24 2012 Rex Dieter <rdieter@fedoraproject.org> 2.2.2-4
|
||||||
|
- switch to upstream versions of some patches
|
||||||
|
|
||||||
|
* Tue Nov 13 2012 Rex Dieter <rdieter@fedoraproject.org> 2.2.2-3
|
||||||
|
- Certain SVG content freezes QtWebKit (webkit#97258)
|
||||||
|
|
||||||
|
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.2-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue May 22 2012 Rex Dieter <rdieter@fedoraproject.org> 2.2.2-1
|
||||||
|
- qtwebkit-2.2.2
|
||||||
|
|
||||||
|
* Fri May 11 2012 Rex Dieter <rdieter@fedoraproject.org> 2.2.1-6
|
||||||
|
- can't render Complex Text Layout (Hindi, Arabic) (#761337)
|
||||||
|
|
||||||
|
* Fri May 11 2012 Rex Dieter <rdieter@fedoraproject.org> 2.2.1-5
|
||||||
|
- respin tarball using upstream make-package.py tool
|
||||||
|
|
||||||
|
* Tue Jan 24 2012 Than Ngo <than@redhat.com> - 2.2.1-4
|
||||||
|
- gcc doesn't support flag -fuse-ld=gold yet
|
||||||
|
- fix build failure with gcc-4.7
|
||||||
|
|
||||||
|
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Dec 21 2011 Than Ngo <than@redhat.com> - 2.2.1-2
|
||||||
|
- backport the correct patch from trunk to fix glib-2.31 issue
|
||||||
|
|
||||||
|
* Mon Dec 19 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2.1-1
|
||||||
|
- qtwebkit-2.2.1
|
||||||
|
- add explicit BR: pkgconfig(xext) pkgconfig(xrender)
|
||||||
|
|
||||||
|
* Sun Nov 27 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2.0-3
|
||||||
|
- add explicit BR: libjpeg-devel libpng-devel
|
||||||
|
|
||||||
|
* Fri Nov 18 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2.0-2
|
||||||
|
- fix FTBFS against newer glib
|
||||||
|
|
||||||
|
* Thu Sep 29 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2.0-1
|
||||||
|
- qtwebkit-2.2.0 (final)
|
||||||
|
- more pkgconfig-style deps
|
||||||
|
|
||||||
|
* Wed Sep 14 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2.0-0.1.rc1
|
||||||
|
- qtwebkit-2.2.0-rc1
|
||||||
|
|
||||||
|
* Tue Sep 06 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2-16.week35
|
||||||
|
- qtwebkit-2.2-week35 snapshot
|
||||||
|
|
||||||
|
* Thu Sep 01 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2-15.week34
|
||||||
|
- qtwebkit-2.2-week34 snapshot
|
||||||
|
|
||||||
|
* Sat Aug 27 2011 Than Ngo <than@redhat.com> - 2.2-14.week32
|
||||||
|
- drop conditional
|
||||||
|
|
||||||
|
* Thu Aug 18 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2-13.week32
|
||||||
|
- qtwebkit-2.2-week32 snapshot
|
||||||
|
|
||||||
|
* Wed Aug 10 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2-12.week31
|
||||||
|
- BR: gstreamer-devel bits
|
||||||
|
|
||||||
|
* Tue Aug 09 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2-11.week31
|
||||||
|
- qtwebkit-2.2-week31 snapshot
|
||||||
|
|
||||||
|
* Sat Jul 23 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2-10.week28
|
||||||
|
- rebuild
|
||||||
|
|
||||||
|
* Wed Jul 20 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2-9.week28
|
||||||
|
- qtwebkit-2.2-week28 snapshot
|
||||||
|
|
||||||
|
* Wed Jul 20 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2-8.20110621
|
||||||
|
- rebuild (qt48)
|
||||||
|
|
||||||
|
* Wed Jun 22 2011 Dan Horák <dan[at]danny.cz> 2.2-7.20110621
|
||||||
|
- bump release for the s390 build fix
|
||||||
|
|
||||||
|
* Tue Jun 21 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2-6.20110621
|
||||||
|
- 20110621 snapshot
|
||||||
|
- s390: respin javascriptcore_debuginfo.patch to omit -g from CXXFLAGS too
|
||||||
|
|
||||||
|
* Fri Jun 03 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2-5.20110603
|
||||||
|
- 20110603 snapshot
|
||||||
|
- drop unused/deprecated phonon/gstreamer support snippets
|
||||||
|
- add minimal qt4 dep
|
||||||
|
|
||||||
|
* Tue May 24 2011 Than Ngo <than@redhat.com> - 2.2-4.20110513
|
||||||
|
- fix for qt-4.6.x
|
||||||
|
- add condition for rhel
|
||||||
|
- enable shared for qtwebkit build
|
||||||
|
|
||||||
|
* Thu May 19 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2-3.20110513
|
||||||
|
- bump up Obsoletes: qt-webkit a bit, to be on the safe side
|
||||||
|
|
||||||
|
* Fri May 13 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2-2.20110513
|
||||||
|
- 20110513 qtwebkit-2.2 branch snapshot
|
||||||
|
- cleanup deps
|
||||||
|
- drop -Werror
|
||||||
|
|
||||||
|
* Thu May 12 2011 Than Ngo <than@redhat.com> - 2.2-1
|
||||||
|
- 2.2-tp1
|
||||||
|
- gstreamer is now default, drop unneeded phonon patch
|
||||||
|
|
||||||
|
* Fri Apr 22 2011 Rex Dieter <rdieter@fedoraproject.org> 2.1-4
|
||||||
|
- javascriptcore -debuginfo too (#667175)
|
||||||
|
|
||||||
|
* Fri Apr 22 2011 Rex Dieter <rdieter@fedoraproject.org> 2.1-3
|
||||||
|
- Provides: qt(4)-webkit(-devel) = 2:%%version...
|
||||||
|
|
||||||
|
* Thu Apr 21 2011 Rex Dieter <rdieter@fedoraproject.org> 2.1-2
|
||||||
|
- -devel: Conflicts: qt-devel < 1:4.7.2-9 (qt_webkit_version.pri)
|
||||||
|
- drop old/deprecated Obsoletes/Provides: WebKit-qt
|
||||||
|
- use modified, less gigantic tarball
|
||||||
|
- patch to use phonon instead of QtMultimediaKit
|
||||||
|
- patch pluginpath for /usr/lib{,64}/mozilla/plugins-wrapped
|
||||||
|
|
||||||
|
* Tue Apr 19 2011 Rex Dieter <rdieter@fedoraproject.org> 2.1-1
|
||||||
|
- 2.1
|
||||||
|
|
||||||
|
* Mon Nov 08 2010 Than Ngo <than@redhat.com> - 2.0-2
|
||||||
|
- fix webkit to export symbol correctly
|
||||||
|
|
||||||
|
* Tue Nov 02 2010 Rex Dieter <rdieter@fedoraproject.org> 2.0-1
|
||||||
|
- 2.0 (as released with qt-4.7.0)
|
||||||
|
|
||||||
|
* Thu Sep 09 2010 Rex Dieter <rdieter@fedoraproject.org> 2.0-0.1.week32
|
||||||
|
- first try, borrowing a lot from debian/kubuntu packaging
|
19
webkit-qtwebkit-2.2-tp1-pluginpath.patch
Normal file
19
webkit-qtwebkit-2.2-tp1-pluginpath.patch
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
diff -up webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp.orig webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp
|
||||||
|
--- webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp.orig 2011-05-12 10:06:43.000000000 +0200
|
||||||
|
+++ webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp 2011-05-12 10:08:08.000000000 +0200
|
||||||
|
@@ -380,6 +380,7 @@ Vector<String> PluginDatabase::defaultPl
|
||||||
|
paths.append("/usr/lib/firefox/plugins");
|
||||||
|
paths.append("/usr/lib64/browser-plugins");
|
||||||
|
paths.append("/usr/lib/browser-plugins");
|
||||||
|
+ paths.append("/usr/lib/mozilla/plugins-wrapped");
|
||||||
|
paths.append("/usr/lib/mozilla/plugins");
|
||||||
|
paths.append("/usr/local/netscape/plugins");
|
||||||
|
paths.append("/opt/mozilla/plugins");
|
||||||
|
@@ -389,6 +390,7 @@ Vector<String> PluginDatabase::defaultPl
|
||||||
|
paths.append("/usr/lib/netscape/plugins");
|
||||||
|
paths.append("/usr/lib/netscape/plugins-libc5");
|
||||||
|
paths.append("/usr/lib/netscape/plugins-libc6");
|
||||||
|
+ paths.append("/usr/lib64/mozilla/plugins-wrapped");
|
||||||
|
paths.append("/usr/lib64/netscape/plugins");
|
||||||
|
paths.append("/usr/lib64/mozilla/plugins");
|
||||||
|
paths.append("/usr/lib/nsbrowser/plugins");
|
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();
|
40
webkit-qtwebkit-23-no_rpath.patch
Normal file
40
webkit-qtwebkit-23-no_rpath.patch
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
diff -up webkit-qtwebkit-23/Source/WebKit/qt/declarative/experimental/experimental.pri.no_rpath webkit-qtwebkit-23/Source/WebKit/qt/declarative/experimental/experimental.pri
|
||||||
|
--- webkit-qtwebkit-23/Source/WebKit/qt/declarative/experimental/experimental.pri.no_rpath 2014-09-24 06:42:05.000000000 -0500
|
||||||
|
+++ webkit-qtwebkit-23/Source/WebKit/qt/declarative/experimental/experimental.pri 2014-10-16 07:34:02.266399979 -0500
|
||||||
|
@@ -29,8 +29,8 @@ haveQt(5): QT += network quick quick-pri
|
||||||
|
|
||||||
|
DESTDIR = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name}
|
||||||
|
|
||||||
|
-CONFIG += rpath
|
||||||
|
-RPATHDIR_RELATIVE_TO_DESTDIR = ../../lib
|
||||||
|
+#CONFIG += rpath
|
||||||
|
+#RPATHDIR_RELATIVE_TO_DESTDIR = ../../lib
|
||||||
|
|
||||||
|
SOURCES += plugin.cpp
|
||||||
|
|
||||||
|
diff -up webkit-qtwebkit-23/Source/WebKit/qt/declarative/public.pri.no_rpath webkit-qtwebkit-23/Source/WebKit/qt/declarative/public.pri
|
||||||
|
--- webkit-qtwebkit-23/Source/WebKit/qt/declarative/public.pri.no_rpath 2014-09-24 06:42:05.000000000 -0500
|
||||||
|
+++ webkit-qtwebkit-23/Source/WebKit/qt/declarative/public.pri 2014-10-16 07:33:46.122390687 -0500
|
||||||
|
@@ -36,8 +36,8 @@ WEBKIT += wtf
|
||||||
|
|
||||||
|
DESTDIR = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name}
|
||||||
|
|
||||||
|
-CONFIG += rpath
|
||||||
|
-RPATHDIR_RELATIVE_TO_DESTDIR = ../../lib
|
||||||
|
+#CONFIG += rpath
|
||||||
|
+#RPATHDIR_RELATIVE_TO_DESTDIR = ../../lib
|
||||||
|
|
||||||
|
SOURCES += plugin.cpp
|
||||||
|
|
||||||
|
diff -up webkit-qtwebkit-23/Tools/qmake/mkspecs/features/rpath.prf.no_rpath webkit-qtwebkit-23/Tools/qmake/mkspecs/features/rpath.prf
|
||||||
|
--- webkit-qtwebkit-23/Tools/qmake/mkspecs/features/rpath.prf.no_rpath 2014-09-24 06:42:05.000000000 -0500
|
||||||
|
+++ webkit-qtwebkit-23/Tools/qmake/mkspecs/features/rpath.prf 2014-10-13 14:11:19.723829903 -0500
|
||||||
|
@@ -6,7 +6,7 @@
|
||||||
|
|
||||||
|
equals(ROOT_BUILD_DIR, $$dirname(DESTDIR)): RPATHDIR_RELATIVE_TO_DESTDIR = ../lib
|
||||||
|
|
||||||
|
-linux-*:!isEmpty(RPATHDIR_RELATIVE_TO_DESTDIR) {
|
||||||
|
+linux-rpath_me_harder_no_no_no:!isEmpty(RPATHDIR_RELATIVE_TO_DESTDIR) {
|
||||||
|
# Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
|
||||||
|
# this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var.
|
||||||
|
QMAKE_RPATHDIR = \$\$ORIGIN/$${RPATHDIR_RELATIVE_TO_DESTDIR} $${QMAKE_RPATHDIR}
|
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