Merge branch 'master' into epel7
This commit is contained in:
commit
78b2aa48c1
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,3 +1,7 @@
|
||||
/qtwebkit-opensource-src-5.4.0.tar.xz
|
||||
/qtwebkit-opensource-src-5.4.1.tar.xz
|
||||
/qtwebkit-opensource-src-5.4.2.tar.xz
|
||||
/qtwebkit-opensource-src-5.5.0-rc.tar.xz
|
||||
/qtwebkit-opensource-src-5.5.0.tar.xz
|
||||
/qtwebkit-opensource-src-5.5.1-rc1.tar.xz
|
||||
/qtwebkit-opensource-src-5.5.1.tar.xz
|
||||
|
@ -6,24 +6,26 @@
|
||||
# define to build docs, need to undef this for bootstrapping
|
||||
# where qt5-qttools builds are not yet available
|
||||
# only primary archs (for now), allow secondary to bootstrap
|
||||
#global bootstrap 1
|
||||
|
||||
%if ! 0%{?bootstrap}
|
||||
%ifarch %{arm} %{ix86} x86_64
|
||||
%define docs 1
|
||||
%endif
|
||||
%endif
|
||||
|
||||
## define prerelease rc1
|
||||
|
||||
Summary: Qt5 - QtWebKit components
|
||||
Name: qt5-qtwebkit
|
||||
Version: 5.4.2
|
||||
Release: 1%{?dist}
|
||||
Version: 5.5.1
|
||||
Release: 3%{?dist}
|
||||
|
||||
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
|
||||
# See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
|
||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||
Url: http://qt-project.org/
|
||||
%if 0%{?pre:1}
|
||||
Source0: http://download.qt-project.org/development_releases/qt/5.4/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz
|
||||
%else
|
||||
Source0: http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
|
||||
%endif
|
||||
Url: http://www.qt.io
|
||||
Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz
|
||||
|
||||
# Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too
|
||||
Patch1: qtwebkit-opensource-src-5.2.0-pluginpath.patch
|
||||
@ -34,28 +36,17 @@ Patch3: qtwebkit-opensource-src-5.0.1-debuginfo.patch
|
||||
# tweak linker flags to minimize memory usage on "small" platforms
|
||||
Patch4: qtwebkit-opensource-src-5.2.0-save_memory.patch
|
||||
|
||||
# use unbundled system angleproject library
|
||||
#define system_angle 1
|
||||
# NEEDS REBASE -- rex
|
||||
Patch5: qtwebkit-opensource-src-5.0.2-system_angle.patch
|
||||
# Fix compilation against latest ANGLE
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=109127
|
||||
Patch6: webkit-commit-142567.patch
|
||||
|
||||
# Add AArch64 support
|
||||
Patch7: 0001-Add-ARM-64-support.patch
|
||||
|
||||
# truly madly deeply no rpath please, kthxbye
|
||||
Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch
|
||||
|
||||
%if 0%{?system_angle}
|
||||
BuildRequires: angleproject-devel angleproject-static
|
||||
%endif
|
||||
|
||||
BuildRequires: qt5-qtbase-devel >= %{version}
|
||||
BuildRequires: qt5-qtdeclarative-devel >= %{version}
|
||||
BuildRequires: qt5-qtlocation-devel
|
||||
BuildRequires: qt5-qtsensors-devel
|
||||
BuildRequires: qt5-qtwebchannel
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: flex
|
||||
@ -80,11 +71,13 @@ BuildRequires: pkgconfig(libwebp)
|
||||
BuildRequires: pkgconfig(libxslt)
|
||||
BuildRequires: pkgconfig(sqlite3)
|
||||
BuildRequires: pkgconfig(xcomposite) pkgconfig(xrender)
|
||||
BuildRequires: perl perl(version) perl(Digest::MD5) perl(Text::ParseWords)
|
||||
BuildRequires: perl perl(version)
|
||||
BuildRequires: perl(Digest::MD5) perl(Text::ParseWords) perl(Getopt::Long)
|
||||
BuildRequires: ruby
|
||||
BuildRequires: zlib-devel
|
||||
|
||||
%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
|
||||
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
|
||||
%{?_qt5:Requires: qt5-qtdeclarative%{?_isa} = %{_qt5_version}}
|
||||
|
||||
##upstream patches
|
||||
|
||||
@ -103,8 +96,7 @@ Requires: qt5-qtdeclarative-devel%{?_isa}
|
||||
%if 0%{?docs}
|
||||
%package doc
|
||||
Summary: API documentation for %{name}
|
||||
# for qhelpgenerator
|
||||
BuildRequires: qt5-qttools-devel
|
||||
BuildRequires: qt5-qhelpgenerator
|
||||
BuildArch: noarch
|
||||
%description doc
|
||||
%{summary}.
|
||||
@ -112,15 +104,11 @@ BuildArch: noarch
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n qtwebkit-opensource-src-%{version}%{?pre:-%{pre}}
|
||||
%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}
|
||||
|
||||
%patch1 -p1 -b .pluginpath
|
||||
%patch3 -p1 -b .debuginfo
|
||||
%patch4 -p1 -b .save_memory
|
||||
%if 0%{?system_angle}
|
||||
#patch5 -p1 -b .system_angle
|
||||
%patch6 -p1 -b .svn142567
|
||||
%endif
|
||||
%patch7 -p1 -b .aarch64
|
||||
%patch8 -p1 -b .no_rpath
|
||||
|
||||
@ -130,18 +118,12 @@ mkdir Source/ThirdParty/orig
|
||||
mv Source/ThirdParty/{gtest/,qunit/} \
|
||||
Source/ThirdParty/orig/
|
||||
|
||||
%if 0%{?system_angle}
|
||||
mv Source/ThirdParty/ANGLE/ \
|
||||
Source/ThirdParty/orig/
|
||||
%endif
|
||||
|
||||
|
||||
%build
|
||||
mkdir %{_target_platform}
|
||||
pushd %{_target_platform}
|
||||
|
||||
%{qmake_qt5} .. \
|
||||
%{?system_angle:DEFINES+=USE_SYSTEM_ANGLE=1} \
|
||||
%ifnarch %{arm} %{ix86} x86_64
|
||||
DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0
|
||||
%endif
|
||||
@ -155,7 +137,6 @@ make %{?_smp_mflags} docs
|
||||
%endif
|
||||
popd
|
||||
|
||||
|
||||
%install
|
||||
make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
|
||||
|
||||
@ -175,7 +156,6 @@ for prl_file in libQt5*.prl ; do
|
||||
done
|
||||
popd
|
||||
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
@ -204,6 +184,32 @@ popd
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Oct 16 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.1-3
|
||||
- drop (unused) system_angle support/patches
|
||||
|
||||
* Thu Oct 15 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.1-2
|
||||
- Update to final release 5.5.1
|
||||
|
||||
* Tue Sep 29 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.1-1
|
||||
- Update to Qt 5.5.1 RC1
|
||||
|
||||
* Wed Jul 29 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-4
|
||||
- -docs: BuildRequires: qt5-qhelpgenerator, standardize bootstrapping
|
||||
|
||||
* Thu Jul 16 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-3
|
||||
- tighten deps (#1233829)
|
||||
|
||||
* Mon Jul 13 2015 Rex Dieter <rdieter@fedoraproject.org> - 5.5.0-2
|
||||
- add 5.5.0-1 changelog
|
||||
- BR: qt5-qtwebchannel-devel
|
||||
- (re)enable docs
|
||||
|
||||
* Wed Jul 1 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.0-1
|
||||
- New final upstream release Qt 5.5.0
|
||||
|
||||
* Thu Jun 25 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.0-0.2.rc
|
||||
- Update for official RC1 released packages
|
||||
|
||||
* Wed Jun 03 2015 Jan Grulich <jgrulich@redhat.com> - 5.4.2-1
|
||||
- 5.4.2
|
||||
|
||||
|
@ -1,114 +0,0 @@
|
||||
diff -up qtwebkit-opensource-src-5.0.2/Source/api.pri.system_angle qtwebkit-opensource-src-5.0.2/Source/api.pri
|
||||
--- qtwebkit-opensource-src-5.0.2/Source/api.pri.system_angle 2013-04-08 19:11:51.000000000 -0500
|
||||
+++ qtwebkit-opensource-src-5.0.2/Source/api.pri 2013-05-25 07:24:57.723118634 -0500
|
||||
@@ -24,8 +24,6 @@ build?(webkit1): {
|
||||
}
|
||||
build?(webkit2): QMAKE_INTERNAL_INCLUDED_FILES *= WebKit2/Target.pri
|
||||
|
||||
-use?(3D_GRAPHICS): WEBKIT += angle
|
||||
-
|
||||
MODULE = webkit
|
||||
CONFIG += creating_module
|
||||
|
||||
diff -up qtwebkit-opensource-src-5.0.2/Source/WebCore/Target.pri.system_angle qtwebkit-opensource-src-5.0.2/Source/WebCore/Target.pri
|
||||
--- qtwebkit-opensource-src-5.0.2/Source/WebCore/Target.pri.system_angle 2013-04-08 19:11:51.000000000 -0500
|
||||
+++ qtwebkit-opensource-src-5.0.2/Source/WebCore/Target.pri 2013-05-25 07:24:57.722118644 -0500
|
||||
@@ -3988,7 +3988,7 @@ use?(3D_GRAPHICS) {
|
||||
platform/graphics/texmap/TextureMapperGL.cpp \
|
||||
platform/graphics/texmap/TextureMapperShaderManager.cpp
|
||||
|
||||
- INCLUDEPATH += $$PWD/platform/graphics/gpu
|
||||
+ INCLUDEPATH += $$PWD/platform/graphics/gpu /usr/include/GLSLANG
|
||||
|
||||
contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
|
||||
!contains(QT_CONFIG, opengles2) {
|
||||
diff -up qtwebkit-opensource-src-5.0.2/Source/WebCore/WebCore.pri.system_angle qtwebkit-opensource-src-5.0.2/Source/WebCore/WebCore.pri
|
||||
--- qtwebkit-opensource-src-5.0.2/Source/WebCore/WebCore.pri.system_angle 2013-05-25 07:24:57.718118687 -0500
|
||||
+++ qtwebkit-opensource-src-5.0.2/Source/WebCore/WebCore.pri 2013-05-25 09:24:18.318809566 -0500
|
||||
@@ -214,12 +214,13 @@ enable?(WEB_AUDIO) {
|
||||
|
||||
use?(3D_GRAPHICS) {
|
||||
win32: {
|
||||
- win32-g++: {
|
||||
+ win32-g++*: {
|
||||
# Make sure OpenGL libs are after the webcore lib so MinGW can resolve symbols
|
||||
contains(QT_CONFIG, opengles2) {
|
||||
CONFIG(debug, debug|release):contains(QT_CONFIG, angle) {
|
||||
LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG
|
||||
} else {
|
||||
+ INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include/GLSLANG
|
||||
LIBS += $$QMAKE_LIBS_OPENGL_ES2
|
||||
}
|
||||
} else {
|
||||
@@ -228,6 +229,8 @@ use?(3D_GRAPHICS) {
|
||||
}
|
||||
} else {
|
||||
contains(QT_CONFIG, opengles2): LIBS += -lEGL
|
||||
+ INCLUDEPATH += /usr/include/GLSLANG
|
||||
+ LIBS += -ltranslator_glsl -ltranslator_common -lpreprocessor
|
||||
}
|
||||
}
|
||||
|
||||
diff -up qtwebkit-opensource-src-5.0.2/Source/WebKit2/Target.pri.system_angle qtwebkit-opensource-src-5.0.2/Source/WebKit2/Target.pri
|
||||
--- qtwebkit-opensource-src-5.0.2/Source/WebKit2/Target.pri.system_angle 2013-04-08 19:11:42.000000000 -0500
|
||||
+++ qtwebkit-opensource-src-5.0.2/Source/WebKit2/Target.pri 2013-05-25 07:24:57.723118634 -0500
|
||||
@@ -938,7 +938,10 @@ enable?(TOUCH_EVENTS) {
|
||||
|
||||
enable?(GEOLOCATION): QT += location
|
||||
|
||||
-use?(3D_GRAPHICS): WEBKIT += angle
|
||||
+use?(3D_GRAPHICS) {
|
||||
+ WEBKIT += angle
|
||||
+ INCLUDEPATH += /usr/include/GLSLANG
|
||||
+}
|
||||
|
||||
use?(PLUGIN_BACKEND_XLIB) {
|
||||
DEFINES += XP_UNIX
|
||||
diff -up qtwebkit-opensource-src-5.0.2/Source/WebKit/WebKit1.pro.system_angle qtwebkit-opensource-src-5.0.2/Source/WebKit/WebKit1.pro
|
||||
--- qtwebkit-opensource-src-5.0.2/Source/WebKit/WebKit1.pro.system_angle 2013-04-08 19:11:39.000000000 -0500
|
||||
+++ qtwebkit-opensource-src-5.0.2/Source/WebKit/WebKit1.pro 2013-05-25 07:24:57.722118644 -0500
|
||||
@@ -92,7 +92,10 @@ HEADERS += \
|
||||
INCLUDEPATH += \
|
||||
$$PWD/qt/WebCoreSupport
|
||||
|
||||
-use?(3D_GRAPHICS): WEBKIT += angle
|
||||
+use?(3D_GRAPHICS) {
|
||||
+ WEBKIT += angle
|
||||
+ INCLUDEPATH += /usr/include/GLSLANG
|
||||
+}
|
||||
|
||||
enable?(GEOLOCATION) {
|
||||
HEADERS += \
|
||||
diff -up qtwebkit-opensource-src-5.0.2/Tools/qmake/mkspecs/features/webkit_modules.prf.system_angle qtwebkit-opensource-src-5.0.2/Tools/qmake/mkspecs/features/webkit_modules.prf
|
||||
--- qtwebkit-opensource-src-5.0.2/Tools/qmake/mkspecs/features/webkit_modules.prf.system_angle 2013-04-08 19:11:53.000000000 -0500
|
||||
+++ qtwebkit-opensource-src-5.0.2/Tools/qmake/mkspecs/features/webkit_modules.prf 2013-05-25 07:24:57.723118634 -0500
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
# Reorder libraries so that the link and include order is correct,
|
||||
# and make sure the case matches the original case.
|
||||
-libraries = WebKit1 WebKit2 WebCore ANGLE JavaScriptCore WTF
|
||||
+libraries = WebKit1 WebKit2 WebCore JavaScriptCore WTF
|
||||
for(library, libraries) {
|
||||
contains(WEBKIT, $$lower($$library)) {
|
||||
WEBKIT -= $$lower($$library)
|
||||
diff -up qtwebkit-opensource-src-5.0.2/Tools/qmake/mkspecs/modules/angle.prf.system_angle qtwebkit-opensource-src-5.0.2/Tools/qmake/mkspecs/modules/angle.prf
|
||||
diff -up qtwebkit-opensource-src-5.0.2/WebKit.pro.system_angle qtwebkit-opensource-src-5.0.2/WebKit.pro
|
||||
--- qtwebkit-opensource-src-5.0.2/WebKit.pro.system_angle 2013-04-08 19:11:32.000000000 -0500
|
||||
+++ qtwebkit-opensource-src-5.0.2/WebKit.pro 2013-05-25 07:24:57.720118666 -0500
|
||||
@@ -18,11 +18,11 @@ JavaScriptCore.file = Source/JavaScriptC
|
||||
JavaScriptCore.makefile = Makefile.JavaScriptCore
|
||||
SUBDIRS += JavaScriptCore
|
||||
|
||||
-use?(3D_GRAPHICS) {
|
||||
- ANGLE.file = Source/ThirdParty/ANGLE/ANGLE.pro
|
||||
- ANGLE.makefile = Makefile.ANGLE
|
||||
- SUBDIRS += ANGLE
|
||||
-}
|
||||
+#use?(3D_GRAPHICS) {
|
||||
+# ANGLE.file = Source/ThirdParty/ANGLE/ANGLE.pro
|
||||
+# ANGLE.makefile = Makefile.ANGLE
|
||||
+# SUBDIRS += ANGLE
|
||||
+#}
|
||||
|
||||
WebCore.file = Source/WebCore/WebCore.pro
|
||||
WebCore.makefile = Makefile.WebCore
|
2
sources
2
sources
@ -1 +1 @@
|
||||
b711b3f32646d72cd281b3c17ab6d14e qtwebkit-opensource-src-5.4.2.tar.xz
|
||||
681328edb539b8fa3a273b38c90b3e31 qtwebkit-opensource-src-5.5.1.tar.xz
|
||||
|
@ -1,57 +0,0 @@
|
||||
Index: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp
|
||||
===================================================================
|
||||
--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp (revision 136430)
|
||||
+++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp (revision 142567)
|
||||
@@ -33,7 +33,14 @@
|
||||
namespace WebCore {
|
||||
|
||||
-inline static int getValidationResultValue(const ShHandle compiler, ShShaderInfo shaderInfo)
|
||||
-{
|
||||
- int value = -1;
|
||||
+// Temporary typedef to support an incompatible change in the ANGLE API.
|
||||
+#if !defined(ANGLE_SH_VERSION) || ANGLE_SH_VERSION < 108
|
||||
+typedef int ANGLEGetInfoType;
|
||||
+#else
|
||||
+typedef size_t ANGLEGetInfoType;
|
||||
+#endif
|
||||
+
|
||||
+inline static ANGLEGetInfoType getValidationResultValue(const ShHandle compiler, ShShaderInfo shaderInfo)
|
||||
+{
|
||||
+ ANGLEGetInfoType value = 0;
|
||||
ShGetInfo(compiler, shaderInfo, &value);
|
||||
return value;
|
||||
@@ -56,13 +63,11 @@
|
||||
}
|
||||
|
||||
- int numSymbols = getValidationResultValue(compiler, symbolType);
|
||||
- if (numSymbols < 0)
|
||||
- return false;
|
||||
-
|
||||
- int maxNameLength = getValidationResultValue(compiler, symbolMaxNameLengthType);
|
||||
+ ANGLEGetInfoType numSymbols = getValidationResultValue(compiler, symbolType);
|
||||
+
|
||||
+ ANGLEGetInfoType maxNameLength = getValidationResultValue(compiler, symbolMaxNameLengthType);
|
||||
if (maxNameLength <= 1)
|
||||
return false;
|
||||
|
||||
- int maxMappedNameLength = getValidationResultValue(compiler, SH_MAPPED_NAME_MAX_LENGTH);
|
||||
+ ANGLEGetInfoType maxMappedNameLength = getValidationResultValue(compiler, SH_MAPPED_NAME_MAX_LENGTH);
|
||||
if (maxMappedNameLength <= 1)
|
||||
return false;
|
||||
@@ -72,7 +77,7 @@
|
||||
Vector<char, 256> mappedNameBuffer(maxMappedNameLength);
|
||||
|
||||
- for (int i = 0; i < numSymbols; ++i) {
|
||||
+ for (ANGLEGetInfoType i = 0; i < numSymbols; ++i) {
|
||||
ANGLEShaderSymbol symbol;
|
||||
- int nameLength = -1;
|
||||
+ ANGLEGetInfoType nameLength = 0;
|
||||
switch (symbolType) {
|
||||
case SH_ACTIVE_ATTRIBUTES:
|
||||
@@ -88,5 +93,5 @@
|
||||
return false;
|
||||
}
|
||||
- if (nameLength <= 0)
|
||||
+ if (!nameLength)
|
||||
return false;
|
||||
|
Loading…
Reference in New Issue
Block a user