rpms
/
qt5-qtwebkit
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

5.2.0-0.1.alpha 

- 5.2.0-alpha
- -doc subpkg
- use gstreamer1 (where available)
This commit is contained in:
Rex Dieter 2013-10-02 09:30:17 -05:00
parent cc5022175b
commit 2f4d5322a9
4 changed files with 57 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
/qtwebkit-opensource-src-5.0.2.tar.xz
/qtwebkit-opensource-src-5.1.1.tar.xz
/qtwebkit-opensource-src-5.2.0-alpha.tar.xz

62
qt5-qtwebkit.spec
View File

@ -1,19 +1,28 @@
%global qt_module qtwebkit
%define pre alpha
# define to build docs, need to undef this for bootstrapping
# where qt5-qttools builds are not yet available
%define docs 1
Summary: Qt5 - QtWebKit components
Name: qt5-qtwebkit
Version: 5.1.1
Release: 1%{?dist}
Version: 5.2.0
Release: 0.1.%{pre}%{?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/
Source0: http://download.qt-project.org/official_releases/qt/5.1/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
%if 0%{?pre:1}
Source0: http://download.qt-project.org/development_releases/qt/5.2/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz
%else
Source0: http://download.qt-project.org/official_releases/qt/5.2/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
%endif
# qt5-qtjsbackend (and qtdeclarative) supports only ix86, x86_64 and arm , and so do we here
ExclusiveArch: %{ix86} x86_64 %{arm}
# http://bugzilla.redhat.com/1005482
ExcludeArch: ppc64 ppc
# Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too
Patch1: webkit-qtwebkit-2.2-tp1-pluginpath.patch
@ -35,7 +44,6 @@ Patch6: webkit-commit-142567.patch
BuildRequires: angleproject-devel angleproject-static
%endif
BuildRequires: qt5-qtbase-devel >= %{version}
BuildRequires: qt5-qtdeclarative-devel >= %{version}
@ -43,17 +51,18 @@ BuildRequires: bison
BuildRequires: chrpath
BuildRequires: flex
BuildRequires: gperf
BuildRequires: libicu-devel
BuildRequires: libjpeg-devel
BuildRequires: pkgconfig(gio-2.0) pkgconfig(glib-2.0)
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(gl)
# gstreamer media support
BuildRequires: pkgconfig(gstreamer-0.10) pkgconfig(gstreamer-app-0.10)
%if 0%{?fedora} || 0%{?rhel} > 6
# gstreamer media support
BuildRequires: pkgconfig(gstreamer-1.0) pkgconfig(gstreamer-app-1.0)
BuildRequires: pkgconfig(icu-i18n)
BuildRequires: pkgconfig(libwebp)
%else
# gstreamer media support
BuildRequires: pkgconfig(gstreamer-0.10) pkgconfig(gstreamer-app-0.10)
BuildRequires: libicu-devel
%endif
BuildRequires: pkgconfig(libpng)
@ -81,6 +90,17 @@ Requires: qt5-qtdeclarative-devel%{?_isa}
%description devel
%{summary}.
%if 0%{?docs}
%package doc
Summary: API documentation for %{name}
Requires: %{name} = %{version}-%{release}
# for qhelpgenerator
BuildRequires: qt5-qttools-devel
BuildArch: noarch
%description doc
%{summary}.
%endif
%prep
%setup -q -n qtwebkit-opensource-src-%{version}%{?pre:-%{pre}}
@ -96,7 +116,7 @@ Requires: qt5-qtdeclarative-devel%{?_isa}
echo "nuke bundled code..."
# nuke bundled code
mkdir Source/ThirdParty/orig
mv Source/ThirdParty/{glu/,gtest/,gyp/,mt19937ar.c,qunit/} \
mv Source/ThirdParty/{gtest/,qunit/} \
Source/ThirdParty/orig/
%if 0%{?system_angle}
@ -110,11 +130,18 @@ mv Source/ThirdParty/ANGLE/ \
make %{?_smp_mflags}
%if 0%{?docs}
make %{?_smp_mflags} docs
%endif
%install
make install INSTALL_ROOT=%{buildroot}
%if 0%{?docs}
make install_docs INSTALL_ROOT=%{buildroot}
%endif
## .prl file love (maybe consider just deleting these -- rex
# nuke dangling reference(s) to %%buildroot, excessive (.la-like) libs
sed -i \
@ -145,7 +172,7 @@ popd
%files
%doc Source/WebCore/LICENSE*
%doc ChangeLog VERSION
%doc ChangeLog* VERSION
%{_qt5_libdir}/libQt5WebKit.so.5*
%{_qt5_libdir}/libQt5WebKitWidgets.so.5*
%{_qt5_libexecdir}/QtWebPluginProcess
@ -160,8 +187,19 @@ popd
%{_qt5_libdir}/pkgconfig/Qt5*.pc
%{_qt5_archdatadir}/mkspecs/modules/*.pri
%if 0%{?docs}
%files doc
%{_qt5_docdir}/qtwebkit.qch
%{_qt5_docdir}/qtwebkit/
%endif
%changelog
* Wed Oct 02 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.1.alpha
- 5.2.0-alpha
- -doc subpkg
- use gstreamer1 (where available)
* Wed Aug 28 2013 Rex Dieter <rdieter@fedoraproject.org> 5.1.1-1
- 5.1.1

10
qtwebkit-save_memory.patch
View File

@ -1,7 +1,7 @@
diff -up qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri.save_memory qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri
--- qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri.save_memory 2013-08-28 11:11:19.218230963 -0500
+++ qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri 2013-08-28 11:12:34.855410992 -0500
@@ -296,6 +296,8 @@ mac {
diff -up qtwebkit-opensource-src-5.2.0-alpha/Source/WebCore/WebCore.pri.save_memory qtwebkit-opensource-src-5.2.0-alpha/Source/WebCore/WebCore.pri
--- qtwebkit-opensource-src-5.2.0-alpha/Source/WebCore/WebCore.pri.save_memory 2013-10-01 22:26:15.648285154 -0500
+++ qtwebkit-opensource-src-5.2.0-alpha/Source/WebCore/WebCore.pri 2013-10-01 22:27:41.299383226 -0500
@@ -304,6 +304,8 @@ mac {
}
unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections
unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
@ -9,4 +9,4 @@ diff -up qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri.save_memory qt
+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
contains(DEFINES, ENABLE_OPENCL=1) {
enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1

2
sources
View File

@ -1 +1 @@
70e956dafcee1969de53d4de7b4691ad qtwebkit-opensource-src-5.1.1.tar.xz
1a2a5958564737ed260758ac2ca4dee8 qtwebkit-opensource-src-5.2.0-alpha.tar.xz