Compare commits
15 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
3c4f7b129c | ||
|
f819e6434b | ||
|
72c9c199e0 | ||
|
cc472f1c3b | ||
|
a5f50d1bae | ||
|
10197d68e9 | ||
|
0a2711afb2 | ||
|
38ecf8775a | ||
|
21a443aa7d | ||
|
fc91246cc0 | ||
|
d9ac54fc94 | ||
|
2a6636f8e9 | ||
|
0db2d0d80f | ||
|
f922c0e224 | ||
|
52dd168f53 |
103
qtwebkit.spec
103
qtwebkit.spec
@ -1,3 +1,8 @@
|
|||||||
|
# qtwebkit is known not to work properly with LTO at this point. Some of the issues
|
||||||
|
# are being worked on upstream and disabling LTO should be re-evaluated as
|
||||||
|
# we update this change. Until such time...
|
||||||
|
# Disable LTO
|
||||||
|
%global _lto_cflags %{nil}
|
||||||
|
|
||||||
%global _hardened_build 1
|
%global _hardened_build 1
|
||||||
|
|
||||||
@ -5,28 +10,10 @@ Name: qtwebkit
|
|||||||
Summary: Qt WebKit bindings
|
Summary: Qt WebKit bindings
|
||||||
|
|
||||||
Version: 2.3.4
|
Version: 2.3.4
|
||||||
Release: 21%{?dist}
|
Release: 32%{?dist}
|
||||||
|
|
||||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||||
URL: http://trac.webkit.org/wiki/QtWebKit
|
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
|
Source0: http://download.kde.org/stable/qtwebkit-2.3/%{version}/src/qtwebkit-%{version}.tar.gz
|
||||||
# qmake wrapper
|
# qmake wrapper
|
||||||
Source1: qmake.sh
|
Source1: qmake.sh
|
||||||
@ -60,6 +47,7 @@ Patch101: webkit-qtwebkit-23-private_browsing.patch
|
|||||||
|
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: gperf
|
BuildRequires: gperf
|
||||||
BuildRequires: libicu-devel
|
BuildRequires: libicu-devel
|
||||||
BuildRequires: libjpeg-devel
|
BuildRequires: libjpeg-devel
|
||||||
@ -94,6 +82,11 @@ BuildRequires: ruby ruby(rubygems)
|
|||||||
BuildRequires: pkgconfig(QtLocation) >= 1.2
|
BuildRequires: pkgconfig(QtLocation) >= 1.2
|
||||||
BuildRequires: pkgconfig(QtSensors) >= 1.2
|
BuildRequires: pkgconfig(QtSensors) >= 1.2
|
||||||
%endif
|
%endif
|
||||||
|
# workaround bad embedded png files, https://bugzilla.redhat.com/1639422
|
||||||
|
BuildRequires: findutils
|
||||||
|
BuildRequires: pngcrush
|
||||||
|
BuildRequires: perl-File-Find perl-FindBin perl-lib perl-English
|
||||||
|
|
||||||
Obsoletes: qt-webkit < 1:4.9.0
|
Obsoletes: qt-webkit < 1:4.9.0
|
||||||
Provides: qt-webkit = 2:%{version}-%{release}
|
Provides: qt-webkit = 2:%{version}-%{release}
|
||||||
Provides: qt4-webkit = 2:%{version}-%{release}
|
Provides: qt4-webkit = 2:%{version}-%{release}
|
||||||
@ -141,13 +134,19 @@ Provides: qt4-webkit-devel%{?_isa} = 2:%{version}-%{release}
|
|||||||
|
|
||||||
install -m755 -D %{SOURCE1} bin/qmake
|
install -m755 -D %{SOURCE1} bin/qmake
|
||||||
|
|
||||||
|
# find/fix pngs with "libpng warning: iCCP: known incorrect sRGB profile"
|
||||||
|
find -name \*.png | xargs -n3 pngcrush -ow -fix
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
# add an unversioned python symlink to python2 to the PATH (FTBFS #1736570)
|
||||||
|
mkdir python2-unversioned-command
|
||||||
|
ln -s %{__python2} python2-unversioned-command/python
|
||||||
|
|
||||||
CFLAGS="%{optflags}"; export CFLAGS
|
CFLAGS="%{optflags}"; export CFLAGS
|
||||||
CXXFLAGS="%{optflags}"; export CXXFLAGS
|
CXXFLAGS="%{optflags}"; export CXXFLAGS
|
||||||
LDFLAGS="%{?__global_ldflags}"; export LDFLAGS
|
LDFLAGS="%{?__global_ldflags}"; export LDFLAGS
|
||||||
PATH=`pwd`/bin:%{_qt4_bindir}:$PATH; export PATH
|
PATH=`pwd`/python2-unversioned-command:`pwd`/bin:%{_qt4_bindir}:$PATH; export PATH
|
||||||
QMAKEPATH=`pwd`/Tools/qmake; export QMAKEPATH
|
QMAKEPATH=`pwd`/Tools/qmake; export QMAKEPATH
|
||||||
QTDIR=%{_qt4_prefix}; export QTDIR
|
QTDIR=%{_qt4_prefix}; export QTDIR
|
||||||
|
|
||||||
@ -167,32 +166,10 @@ WEBKITOUTPUTDIR=`pwd`; export WEBKITOUTPUTDIR
|
|||||||
--system-malloc
|
--system-malloc
|
||||||
popd
|
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
|
%install
|
||||||
make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}/Release
|
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
|
## pkgconfig love
|
||||||
# drop Libs.private, it contains buildroot references, and
|
# drop Libs.private, it contains buildroot references, and
|
||||||
# we don't support static linking libQtWebKit anyway
|
# we don't support static linking libQtWebKit anyway
|
||||||
@ -202,14 +179,10 @@ mv QtWebKit.pc.new QtWebKit.pc
|
|||||||
popd
|
popd
|
||||||
|
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%ldconfig_scriptlets
|
||||||
%postun -p /sbin/ldconfig
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%{_qt4_libdir}/libQtWebKit.so.4*
|
%{_qt4_libdir}/libQtWebKit.so.4*
|
||||||
%ifarch %{ix86}
|
|
||||||
%{_qt4_libdir}/sse2/libQtWebKit.so.4*
|
|
||||||
%endif
|
|
||||||
%if 0%{?_qt4_importdir:1}
|
%if 0%{?_qt4_importdir:1}
|
||||||
%{_qt4_importdir}/QtWebKit/
|
%{_qt4_importdir}/QtWebKit/
|
||||||
%endif
|
%endif
|
||||||
@ -223,6 +196,42 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 31 2020 Than Ngo <than@redhat.com> - 2.3.4-32
|
||||||
|
- Fixed FTBFS
|
||||||
|
|
||||||
|
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-31
|
||||||
|
- Second attempt - Rebuilt for
|
||||||
|
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-30
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-29
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Aug 11 2019 Kevin Kofler <Kevin@tigcc.ticalc.org> - 2.3.4-28
|
||||||
|
- Remove obsolete comments about source tarball generation (an upstream release
|
||||||
|
tarball has been used for years and there is and will be no better source)
|
||||||
|
- Drop the extra no-sse2 build on i686, Fedora has required SSE2 since F29
|
||||||
|
|
||||||
|
* Sun Aug 11 2019 Kevin Kofler <Kevin@tigcc.ticalc.org> - 2.3.4-27
|
||||||
|
- Fix FTBFS due to unversioned python no longer being Python 2 (#1736570)
|
||||||
|
|
||||||
|
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-26
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-25
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Nov 24 2018 Rex Dieter <rdieter@fedoraproject.org> - 2.3.4-24
|
||||||
|
- QtWebkit bundles malformed PNG files (#1639422)
|
||||||
|
|
||||||
|
* Sat Jul 21 2018 Rex Dieter <rdieter@fedoraproject.org> - 2.3.4-23
|
||||||
|
- BR: %%_bindir/python gcc-c++ (#1606056)
|
||||||
|
|
||||||
|
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-22
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
* Sun Mar 18 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.3.4-21
|
* Sun Mar 18 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.3.4-21
|
||||||
- Update Python 2 dependency declarations to new packaging standards
|
- Update Python 2 dependency declarations to new packaging standards
|
||||||
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
|
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
|
||||||
|
Loading…
Reference in New Issue
Block a user