- Update Qt 5.7.0

This commit is contained in:
Helio Chissini de Castro 2016-07-16 00:52:34 +02:00
parent e988f7ce53
commit ef1aec5029
3 changed files with 18 additions and 42 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/qtwebkit-opensource-src-5.5.1.tar.xz
/qtwebkit-opensource-src-5.6.0.tar.xz
/qtwebkit-opensource-src-5.6.1-b889f46.tar.xz
/qtwebkit-opensource-src-5.7.0.tar.xz

View File

@ -3,40 +3,15 @@
%global _hardened_build 1
#global bootstrap 1
# 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
%if ! 0%{?bootstrap}
%ifarch %{arm} %{ix86} x86_64
%define docs 1
%endif
%endif
%global commit0 b889f460280ad98c89ede179bd3b9ce9cb02002b
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
Summary: Qt5 - QtWebKit components
Name: qt5-qtwebkit
Version: 5.6.1
Release: 3.%{shortcommit0}git%{?dist}
Name: qt5-qtwebkit
Version: 5.7.0
Release: 2%{?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://www.qt.io
%if 0%{?commit0:1}
# The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
# git clone git@github.com:qtproject/qtqebkit.git && cd qtwebkit
# git archive --prefix=qtwebkit-opensource-src-5.6.1/ origin/5.6.1 | tar -x -C ..
# cd ../qtwebkit-opensource-src-5.6.1 && syncqt.pl -version 5.6.1 Source/sync.profile && cd ..
# tar cfJ qt5-webkit-opensource-src-5.6.1.tar.xz qtwebkit-opensource-src-5.6.1/
Source0: %{qt_module}-opensource-src-%{version}-%{shortcommit0}.tar.xz
%else
Source0: http://download.qt.io/community_releases/5.6/%{version}/qtwebkit-opensource-src-%{version}.tar.xz
%endif
Source0: http://download.qt.io/official_releases/qt/5.7/%{version}/latest_src/submodules/qtwebkit-opensource-src-%{version}.tar.xz
## downstream patches
# Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too
@ -60,11 +35,11 @@ Patch109: 0009-Fixed-drawing-of-zoomed-border-image-with-repeat-mod.patch
BuildRequires: cmake
BuildRequires: qt5-qtbase-devel >= %{version}
BuildRequires: qt5-qtdeclarative-devel >= %{version}
BuildRequires: pkgconfig(Qt5Qml) >= %{version}
%if ! 0%{?bootstrap}
BuildRequires: qt5-qtsensors-devel
BuildRequires: qt5-qtlocation-devel
BuildRequires: qt5-qtwebchannel-devel
BuildRequires: pkgconfig(Qt5Sensors)
BuildRequires: pkgconfig(Qt5Location)
BuildRequires: pkgconfig(Qt5WebChannel)
%endif
BuildRequires: bison
BuildRequires: flex
@ -91,13 +66,10 @@ BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(xcomposite) pkgconfig(xrender)
BuildRequires: perl perl(version)
BuildRequires: perl(Digest::MD5) perl(Text::ParseWords) perl(Getopt::Long)
BuildRequires: ruby rubygems
%if 0%{?fedora}
BuildRequires: rubypick
%endif
BuildRequires: ruby rubypick rubygems
BuildRequires: zlib-devel
BuildRequires: qt5-qtbase-private-devel
BuildRequires: qt5-qtbase-private-devel
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
BuildRequires: qt5-qtdeclarative-private-devel
%{?_qt5:Requires: qt5-qtdeclarative%{?_isa} = %{_qt5_version}}
@ -156,7 +128,7 @@ pushd %{_target_platform}
%{qmake_qt5} .. \
%ifnarch %{arm} %{ix86} x86_64
DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0
DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0
%endif
# workaround, disable parallel compilation as it fails to compile in brew
@ -216,8 +188,11 @@ popd
%changelog
* Wed Jun 15 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-3.b889f46git
- drop pkgconfig-style deps
* Mon Jul 04 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.0-2
- Compiled with gcc
* Wed Jun 15 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.0-1
- Qt 5.7.0 release ( non git, official package )
* Tue Jun 14 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-2.b889f46git
- rebuild (glibc)

View File

@ -1 +1 @@
1a7f3953c457c57a942bdd6a92d198fb qtwebkit-opensource-src-5.6.1-b889f46.tar.xz
9379b8829639645c184fa63532035098 qtwebkit-opensource-src-5.7.0.tar.xz