diff --git a/fix-missing-designerplugin.patch b/fix-missing-designerplugin.patch new file mode 100644 index 0000000..41d6670 --- /dev/null +++ b/fix-missing-designerplugin.patch @@ -0,0 +1,24 @@ +From f614d0a165d92af75d2aa2bfc286cd2687e03831 Mon Sep 17 00:00:00 2001 +From: Michal Klocek +Date: Thu, 13 Feb 2020 16:31:53 +0100 +Subject: [PATCH] Fix missing webenginview in designer plugin + +The feature name is 'webengine-widgets', but module name +is 'webenginewidgets'. + +Fixes: QTBUG-82123 +Change-Id: I501815dc74ca96527a888a708121c656447bf7a5 +Reviewed-by: Allan Sandfeld Jensen +--- + src/plugins/plugins.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro +index 71c24e6c2..50181aa19 100644 +--- a/src/plugins/plugins.pro ++++ b/src/plugins/plugins.pro +@@ -1,3 +1,3 @@ + TEMPLATE = subdirs +-qtHaveModule(webengine-widgets): qtHaveModule(designer): SUBDIRS += qwebengineview ++qtHaveModule(webenginewidgets): qtHaveModule(designer): SUBDIRS += qwebengineview + qtHaveModule(pdf): qtConfig(imageformatplugin): SUBDIRS += imageformats diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index f51adf7..d9a64c1 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Feb 19 10:17:00 UTC 2020 - Fabian Vogt + +- Update to 5.15.0-alpha: + * New feature release + * For more details please see: + https://wiki.qt.io/New_Features_in_Qt_5.15 +- Add patch to fix building the designer plugin: + * fix-missing-designerplugin.patch +- Move designer plugin into -devel subpackage +- Add packages for new Qt PDF module (which is technically separate + from WebEngine, but shares the source tarball) + ------------------------------------------------------------------- Mon Jan 27 13:14:47 UTC 2020 - Fabian Vogt diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec index 06f0559..092ad5f 100644 --- a/libqt5-qtwebengine.spec +++ b/libqt5-qtwebengine.spec @@ -21,48 +21,31 @@ %if %{?suse_version} > 1500 || 0%{?sle_version} > 150100 %bcond_without system_vpx -%else -%bcond_with system_vpx -%endif -%if 0%{?suse_version} > 1500 -# Needs ICU >= 63 +%bcond_without system_harfbuzz %bcond_without system_icu %else +%bcond_with system_vpx +%bcond_with system_harfbuzz %bcond_with system_icu %endif -%if %{?suse_version} >= 1330 || (0%{?is_opensuse} && 0%{?sle_version} >= 120200) %bcond_without system_ffmpeg -%else -%bcond_with system_ffmpeg -%endif -%if %{?suse_version} >= 1320 || (0%{?suse_version} == 1315 && 0%{?sle_version} >= 120200) %bcond_without system_minizip -%else -%bcond_with system_minizip -%endif -# Not even in Tumbleweed as of 2019-03-22 -%bcond_with system_harfbuzz -# This is just overall condition to contain everything we can't provide on SLE12 -%if 0%{?suse_version} >= 1320 || 0%{?is_opensuse} -%bcond_with sle_bundles -%else -%bcond_without sle_bundles -%endif + # spellchecking dictionary directory %global _qtwebengine_dictionaries_dir %{_libqt5_datadir}/qtwebengine_dictionaries Name: libqt5-qtwebengine -Version: 5.14.1 +Version: 5.15.0~alpha Release: 0 Summary: Qt 5 WebEngine Library License: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only Group: Development/Libraries/X11 URL: https://www.qt.io %define base_name libqt5 -%define real_version 5.14.1 -%define so_version 5.14.1 -%define tar_version qtwebengine-everywhere-src-5.14.1 -Source: https://download.qt.io/official_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz +%define real_version 5.15.0-alpha +%define so_version 5.15.0 +%define tar_version qtwebengine-everywhere-src-5.15.0-alpha +Source: https://download.qt.io/development_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf # PATCH-FIX-UPSTREAM armv6-ffmpeg-no-thumb.patch - Fix ffmpeg configuration for armv6 Patch1: armv6-ffmpeg-no-thumb.patch @@ -70,6 +53,8 @@ Patch1: armv6-ffmpeg-no-thumb.patch Patch2: disable-gpu-when-using-nouveau-boo-1005323.diff # PATCH-FIX-UPSTREAM 0001-fix-build-after-y2038-changes-in-glibc.patch Patch3: 0001-fix-build-after-y2038-changes-in-glibc.patch +# PATCH-FIX-UPSTREAM +Patch4: fix-missing-designerplugin.patch # http://www.chromium.org/blink not ported to PowerPC ExcludeArch: ppc ppc64 ppc64le s390 s390x # Try to fix i586 MemoryErrors with rpmlint @@ -171,17 +156,16 @@ BuildRequires: pkgconfig(xscrnsaver) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(zlib) -%if !%{with sle_bundles} BuildRequires: yasm-devel -%endif %if %{with system_minizip} BuildRequires: pkgconfig(minizip) %endif %if %{with system_harfbuzz} -BuildRequires: pkgconfig(harfbuzz) >= 2.0.0 +BuildRequires: pkgconfig(harfbuzz) >= 2.2.0 %endif %if %{with system_icu} -BuildRequires: pkgconfig(icu-i18n) >= 63.0 +BuildRequires: pkgconfig(icu-uc) >= 64.0 +BuildRequires: pkgconfig(icu-i18n) >= 64.0 %endif %if %{with system_vpx} BuildRequires: pkgconfig(vpx) >= 1.8.0 @@ -236,7 +220,7 @@ API guarantees. The packages that build against these have to require the exact Qt version. %package examples -Summary: Qt5 location examples +Summary: Qt5 WebEngine examples Group: Development/Libraries/X11 Requires: libqt5-qtquickcontrols2 Recommends: %{name}-devel @@ -244,6 +228,57 @@ Recommends: %{name}-devel %description examples Examples for the libqt5-qtwebengine module. +%package -n libQt5Pdf5 +Summary: Qt5 PDF library +Group: Development/Libraries/X11 + +%description -n libQt5Pdf5 +Main library of the Qt PDF module. + +%package -n libQt5PdfWidgets5 +Summary: Qt5 PDF library for Qt Widgets +Group: Development/Libraries/X11 + +%description -n libQt5PdfWidgets5 +Library of the Qt PDF module with support for Qt Widgets. + +%package -n libqt5-qtpdf-imports +Summary: Qt5 PDF module for QML +Group: Development/Libraries/X11 + +%description -n libqt5-qtpdf-imports +Qt Quick module for the Qt PDF library. + +%package -n libqt5-qtpdf-devel +Summary: Development files for the Qt5 PDF library +Group: Development/Libraries/X11 +Requires: libQt5Pdf5 = %{version} +Requires: libQt5PdfWidgets5 = %{version} + +%description -n libqt5-qtpdf-devel +You need this package if you want to compile programs with Qt PDF. + +%package -n libqt5-qtpdf-private-headers-devel +Summary: Non-ABI stable experimental API for the Qt5 PDF library +Group: Development/Libraries/C and C++ +BuildArch: noarch +Requires: libqt5-qtpdf-devel = %{version} +%requires_ge libqt5-qtbase-private-headers-devel + +%description -n libqt5-qtpdf-private-headers-devel +This package provides private headers of libqt5-qtpdf that are normally +not used by application development and that do not have any ABI or +API guarantees. The packages that build against these have to require +the exact Qt version. + +%package -n libqt5-qtpdf-examples +Summary: Qt5 PDF examples +Group: Development/Libraries/X11 +Recommends: libqt5-qtpdf-devel + +%description -n libqt5-qtpdf-examples +Examples for the libqt5-qtpdf module. + %prep %setup -q -n %{tar_version} sed -i 's|$(STRIP)|strip|g' src/core/core_module.pro @@ -259,16 +294,6 @@ sed -i -e '/toolprefix = /d' -e 's/\${toolprefix}//g' \ mkdir .git %endif -%if 0%{?suse_version} < 1330 -# WE checks the version of GCC qtbase was built with, not the version it's building with. -# ARGH! -echo "QT_GCC_MAJOR_VERSION = 7" > qtwebengine_new.pro -echo "QT_GCC_MINOR_VERSION = 2" >> qtwebengine_new.pro -echo "QT_CONFIG += c++14" >> qtwebengine_new.pro -cat qtwebengine.pro >> qtwebengine_new.pro -mv qtwebengine{_new,}.pro -%endif - %ifnarch x86_64 RPM_OPT_FLAGS="$RPM_OPT_FLAGS " export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-g / } @@ -302,11 +327,6 @@ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -Wno-return-type" # processes instead of its defaults. export NINJAFLAGS="%{_smp_mflags}" -%if 0%{?suse_version} < 1330 - export CC=gcc-7 - export CXX=g++-7 -%endif - make %{_smp_mflags} VERBOSE=1 %install @@ -332,8 +352,11 @@ sed -i '/find_package/!b;n;s/'%{so_version}/$(rpm -q --qf %%{version} libQt5Core mkdir -p %{buildroot}%{_qtwebengine_dictionaries_dir} %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig +%post -n libQt5Pdf5 -p /sbin/ldconfig +%postun -n libQt5Pdf5 -p /sbin/ldconfig +%post -n libQt5PdfWidgets5 -p /sbin/ldconfig +%postun -n libQt5PdfWidgets5 -p /sbin/ldconfig %if 0%{?suse_version} >= 1500 %filetriggerin -- %{_datadir}/hunspell @@ -349,36 +372,86 @@ done %endif %files -%defattr(-,root,root,755) %license LICENSE.* -%{_libqt5_libdir}/libQt*Web*.so.* -%{_datadir}/qt5/ -%dir %{_libqt5_libexecdir} +%{_libqt5_libdir}/libQt5WebEngine.so.* +%{_libqt5_libdir}/libQt5WebEngineCore.so.* +%{_libqt5_libdir}/libQt5WebEngineWidgets.so.* +%dir %{_datadir}/qt5/ +%dir %{_datadir}/qt5/translations/ +%{_datadir}/qt5/translations/qtwebengine_locales/ +%dir %{_datadir}/qt5/resources/ +%{_datadir}/qt5/resources/qtwebengine_* +%if %{without system_icu} +%{_datadir}/qt5/resources/icudtl.dat +%endif %dir %{_qtwebengine_dictionaries_dir} +%dir %{_libqt5_libexecdir} %{_libqt5_libexecdir}/QtWebEngineProcess %{_libqt5_archdatadir}/qml/QtWebEngine/ -%{_libqt5_plugindir}/designer/ %{_libqt5_bindir}/qwebengine_convert_dict %files private-headers-devel -%defattr(-,root,root,755) %license LICENSE.* -%{_libqt5_includedir}/*/%{so_version} +%{_libqt5_includedir}/QtWebEngine*/%{so_version} %files devel -%defattr(-,root,root,755) -%license LICENSE.* -%exclude %{_libqt5_includedir}/*/%{so_version} -%{_libqt5_includedir}/*/ -%{_libqt5_libdir}/cmake/Qt5*/ -%{_libqt5_libdir}/libQt*Web*.so -%{_libqt5_libdir}/libQt*Web*.prl -%{_libqt5_libdir}/qt5/mkspecs/modules/qt_lib_*.pri -%{_libqt5_libdir}/pkgconfig/Qt*Web*.pc +%exclude %{_libqt5_includedir}/QtWebEngine*/%{so_version} +%{_libqt5_includedir}/QtWebEngine*/ +%{_libqt5_libdir}/libQt5WebEngine*.so +%{_libqt5_libdir}/libQt5WebEngine*.prl +%{_libqt5_libdir}/pkgconfig/Qt5WebEngine*.pc +%{_libqt5_libdir}/qt5/mkspecs/modules/qt_lib_webengine*.pri +%dir %{_libqt5_libdir}/cmake/Qt5Designer/ +%{_libqt5_libdir}/cmake/Qt5Designer/Qt5Designer_QWebEngineViewPlugin.cmake +%dir %{_libqt5_plugindir}/designer/ +%{_libqt5_plugindir}/designer/libqwebengineview.so +%{_libqt5_libdir}/cmake/Qt5WebEngine*/ %files examples -%defattr(-,root,root,755) %license LICENSE.* -%{_libqt5_examplesdir}/ +%dir %{_libqt5_examplesdir} +%{_libqt5_examplesdir}/webengine*/ + +%files -n libQt5Pdf5 +%license LICENSE.* +%{_libqt5_libdir}/libQt5Pdf.so.* +%{_libqt5_archdatadir}/plugins/imageformats/libqpdf.so +# Not quite sure what this would be used by +%dir %{_libqt5_libdir}/cmake/ +%dir %{_libqt5_libdir}/cmake/Qt5Gui/ +%{_libqt5_libdir}/cmake/Qt5Gui/Qt5Gui_QPdfPlugin.cmake + +%files -n libQt5PdfWidgets5 +%license LICENSE.* +%{_libqt5_libdir}/libQt5PdfWidgets.so.* + +%files -n libqt5-qtpdf-imports +%license LICENSE.* +%{_libqt5_archdatadir}/qml/QtQuick/Pdf/ + +%files -n libqt5-qtpdf-private-headers-devel +%license LICENSE.* +%{_libqt5_includedir}/QtPdf/%{so_version} +%{_libqt5_includedir}/QtPdfWidgets/%{so_version} + +%files -n libqt5-qtpdf-devel +%license LICENSE.* +%exclude %{_libqt5_includedir}/QtPdf*/%{so_version} +%{_libqt5_includedir}/QtPdf/ +%{_libqt5_includedir}/QtPdfWidgets/ +%{_libqt5_libdir}/cmake/Qt5Pdf/ +%{_libqt5_libdir}/cmake/Qt5PdfWidgets/ +%{_libqt5_libdir}/libQt5Pdf.so +%{_libqt5_libdir}/libQt5PdfWidgets.so +%{_libqt5_libdir}/libQt5Pdf.prl +%{_libqt5_libdir}/libQt5PdfWidgets.prl +%{_libqt5_libdir}/qt5/mkspecs/modules/qt_lib_pdf*.pri +%{_libqt5_libdir}/pkgconfig/Qt5Pdf.pc +%{_libqt5_libdir}/pkgconfig/Qt5PdfWidgets.pc + +%files -n libqt5-qtpdf-examples +%license LICENSE.* +%dir %{_libqt5_examplesdir} +%{_libqt5_examplesdir}/pdf*/ %changelog diff --git a/qtwebengine-everywhere-src-5.14.1.tar.xz b/qtwebengine-everywhere-src-5.14.1.tar.xz deleted file mode 100644 index b54f2b5..0000000 --- a/qtwebengine-everywhere-src-5.14.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ec77040a876a83aa2a833ebfe7b3e88dcc167ceb317095eb226a0b8d455e887 -size 242438244 diff --git a/qtwebengine-everywhere-src-5.15.0-alpha.tar.xz b/qtwebengine-everywhere-src-5.15.0-alpha.tar.xz new file mode 100644 index 0000000..129dcff --- /dev/null +++ b/qtwebengine-everywhere-src-5.15.0-alpha.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c58f315299df8fecdc4ea9cf1d24a80a9b172d02b9770009cdbb9316c08817e6 +size 242596364