X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=qt5-qtwebkit.spec;h=0c426045feff04e5c1d56117fba20e291064509a;hb=0ca16147d63997f3e2615ffe15c2855ed0377f6b;hp=dae10001327fb2e73074dc090641e4fa69a820ff;hpb=53fad3a350b22d0f2b5e3849f5cc795957da61d4;p=packages%2Fqt5-qtwebkit.git diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index dae1000..0c42604 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -4,28 +4,47 @@ # - system leveldb (requires memenv helper library) # NOTE: not splitting WebKit/WebKitWidgets, interdependencies are not clear # (e.g. WebProcess requires WebKitWidgets) +# - switch to building using cmake directly, reenable doc # # Conditional build: -%bcond_without qch # documentation in QCH format +%bcond_with bootstrap # disable features to able to build without installed qt5 +# -- build targets +%bcond_with doc # Documentation +# -- features %bcond_with qtmultimedia # QtMultimedia support +%if %{with bootstrap} +%undefine with_doc +%endif + +%define snap alpha2 + %define orgname qtwebkit -%define qtbase_ver %{version} -%define qtdeclarative_ver %{version} -%define qtlocation_ver %{version} -%define qtmultimedia_ver %{version} -%define qtsensors_ver %{version} -%define qttools_ver %{version} +%define qtbase_ver 5.11 +%define qtdeclarative_ver 5.11 +%define qtlocation_ver 5.11 +%define qtmultimedia_ver 5.11 +%define qtsensors_ver 5.11 +%define qttools_ver 5.11 Summary: The Qt5 WebKit libraries Summary(pl.UTF-8): Biblioteki Qt5 WebKit Name: qt5-%{orgname} -Version: 5.3.1 -Release: 1 +Version: 5.212.0 +Release: 0.%{snap}.1 License: LGPL v2+ Group: X11/Libraries -Source0: http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz -# Source0-md5: 0f2bb8af6be2306b2b4d194a7ebf6fcc -URL: http://qt-project.org/ +Source0: https://github.com/annulen/webkit/archive/qtwebkit-%{version}-%{snap}.tar.gz +# Source0-md5: 9216661f6626fe4224ac477adf8d4162 +# from FC +Patch100: qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch +Patch101: qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch +Patch102: qtwebkit-5.212.0_cmake_cmp0071.patch +Patch103: qtwebkit-5.212.0_fix_missing_sources.patch +Patch104: 0016-cmake-Import-ECMEnableSanitizers.patch +Patch105: 0031-Disable-ES6-Proxy-object.patch +Patch106: 0111-ECM-Update-ECMGeneratePkgConfigFile-to-latest-versio.patch +Patch107: 0012-cmake-Fix-include-dir-in-the-generated-pkg-config-fi.patch +URL: https://github.com/annulen/webkit BuildRequires: OpenGL-devel BuildRequires: Qt5Core-devel >= %{qtbase_ver} BuildRequires: Qt5Gui-devel >= %{qtbase_ver} @@ -40,6 +59,7 @@ BuildRequires: Qt5Sensors-devel >= %{qtsensors_ver} BuildRequires: Qt5Sql-devel >= %{qtbase_ver} BuildRequires: Qt5Widgets-devel >= %{qtbase_ver} BuildRequires: glib2-devel >= 2.0 +BuildRequires: gperf BuildRequires: gstreamer-devel >= 1.0 BuildRequires: gstreamer-plugins-base-devel >= 1.0 BuildRequires: libicu-devel @@ -50,7 +70,7 @@ BuildRequires: libxml2-devel >= 2.0 BuildRequires: libxslt-devel BuildRequires: pkgconfig BuildRequires: rpmbuild(macros) >= 1.654 -%if %{with qch} +%if %{with doc} BuildRequires: qt5-assistant >= %{qttools_ver} %endif BuildRequires: qt5-build >= %{qtbase_ver} @@ -63,6 +83,7 @@ BuildRequires: xorg-lib-libXcomposite-devel BuildRequires: xorg-lib-libXrender-devel BuildRequires: xz BuildRequires: zlib-devel +BuildConflicts: leveldb-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define specflags -fno-strict-aliasing @@ -161,33 +182,38 @@ Qt5 WebKit documentation in QCH format. Dokumentacja do bibliotek Qt5 WebKit w formacie QCH. %prep -%setup -q -n %{orgname}-opensource-src-%{version} +%setup -q -n webkit-qtwebkit-%{version}-%{snap} +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 +%patch103 -p1 +%patch104 -p1 +%patch105 -p1 +%patch106 -p1 +%patch107 -p1 %build qmake-qt5 \ %{?with_qtmultimedia:WEBKIT_CONFIG+=use_qtmultimedia} %{__make} -%{__make} %{!?with_qch:html_}docs +%{?with_doc:%{__make} docs} %install rm -rf $RPM_BUILD_ROOT %{__make} install \ INSTALL_ROOT=$RPM_BUILD_ROOT -%{__make} install_%{!?with_qch:html_}docs \ +%if %{with doc} +%{__make} install_docs \ INSTALL_ROOT=$RPM_BUILD_ROOT +%endif -# kill unnecessary -L%{_libdir} from *.la, *.prl, *.pc +# kill unnecessary -L%{_libdir} from *.pc %{__sed} -i -e "s,-L%{_libdir} \?,,g" \ - $RPM_BUILD_ROOT%{_libdir}/*.{la,prl} \ $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc # kill unwanted Libs.private (containing many bogus entries) from *.pc files %{__sed} -i -e '/^Libs\.private/d' $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc -# useless symlinks -%{__rm} $RPM_BUILD_ROOT%{_libdir}/libQt5*.so.5.? -# actually drop *.la, follow policy of not packaging them when *.pc exist -%{__rm} $RPM_BUILD_ROOT%{_libdir}/libQt5*.la %clean rm -rf $RPM_BUILD_ROOT @@ -209,15 +235,14 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/qt5/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so %{_libdir}/qt5/qml/QtWebKit/experimental/qmldir %dir %{_libdir}/qt5/libexec -%attr(755,root,root) %{_libdir}/qt5/libexec/QtWebPluginProcess %attr(755,root,root) %{_libdir}/qt5/libexec/QtWebProcess +%attr(755,root,root) %{_libdir}/qt5/libexec/QtWebDatabaseProcess +%attr(755,root,root) %{_libdir}/qt5/libexec/QtWebNetworkProcess %files -n Qt5WebKit-devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libQt5WebKit.so %attr(755,root,root) %{_libdir}/libQt5WebKitWidgets.so -%{_libdir}/libQt5WebKit.prl -%{_libdir}/libQt5WebKitWidgets.prl %{_includedir}/qt5/QtWebKit %{_includedir}/qt5/QtWebKitWidgets %{_pkgconfigdir}/Qt5WebKit.pc @@ -225,15 +250,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/cmake/Qt5WebKit %{_libdir}/cmake/Qt5WebKitWidgets %{qt5dir}/mkspecs/modules/qt_lib_webkit.pri -%{qt5dir}/mkspecs/modules/qt_lib_webkit_private.pri %{qt5dir}/mkspecs/modules/qt_lib_webkitwidgets.pri -%{qt5dir}/mkspecs/modules/qt_lib_webkitwidgets_private.pri +%if %{with doc} %files doc %defattr(644,root,root,755) %{_docdir}/qt5-doc/qtwebkit -%if %{with qch} %files doc-qch %defattr(644,root,root,755) %{_docdir}/qt5-doc/qtwebkit.qch