Hello community, here is the log from the commit of package marble for openSUSE:Factory checked in at 2018-10-23 20:38:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/marble (Old) and /work/SRC/openSUSE:Factory/.marble.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "marble" Tue Oct 23 20:38:12 2018 rev:108 rq:643670 version:18.08.2 Changes: -------- --- /work/SRC/openSUSE:Factory/marble/marble.changes 2018-10-17 08:39:18.757963420 +0200 +++ /work/SRC/openSUSE:Factory/.marble.new/marble.changes 2018-10-23 20:38:15.856696707 +0200 @@ -1,0 +2,10 @@ +Sun Oct 21 09:10:15 UTC 2018 - [email protected] + +- Add Port-to-QtWebEngine.patch and build with QtWebEngine instead + of QtWebKit where possible +- Drop QtWebKit BuildRequires, no longer supported +- Add Fix-MarbleConfig.cmake-to-find-QtWebEngine.patch to fix + building against marble when QtWebEngine is used +- Add necessary requirements to the devel package + +------------------------------------------------------------------- New: ---- Fix-MarbleConfig.cmake-to-find-QtWebEngine.patch Port-to-QtWebEngine.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ marble.spec ++++++ --- /var/tmp/diff_new_pack.JdIkgB/_old 2018-10-23 20:38:17.016695321 +0200 +++ /var/tmp/diff_new_pack.JdIkgB/_new 2018-10-23 20:38:17.020695316 +0200 @@ -32,6 +32,10 @@ Group: Amusements/Teaching/Other Url: http://edu.kde.org Source0: marble-%{version}.tar.xz +# PATCH-FEATURE-UPSTREAM +Patch0: Port-to-QtWebEngine.patch +# PATCH-FIX-UPSTREAM +Patch1: Fix-MarbleConfig.cmake-to-find-QtWebEngine.patch BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: gpsd-devel @@ -54,22 +58,25 @@ BuildRequires: phonon4qt5-devel BuildRequires: pkgconfig BuildRequires: plasma-framework-devel -BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 -BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Designer) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Network) >= 5.2.0 -BuildRequires: pkgconfig(Qt5OpenGL) >= 5.2.0 -BuildRequires: pkgconfig(Qt5PrintSupport) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Quick) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Script) >= 5.2.0 -BuildRequires: pkgconfig(Qt5SerialPort) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Svg) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 -BuildRequires: pkgconfig(Qt5WebKitWidgets) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Concurrent) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Designer) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: pkgconfig(Qt5Script) +BuildRequires: pkgconfig(Qt5SerialPort) +BuildRequires: pkgconfig(Qt5Sql) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Test) +%ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64 +# Only include WebEngine on platforms where it is available +BuildRequires: pkgconfig(Qt5WebEngineWidgets) +%endif +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Xml) Requires: %{name}-data = %{version} Requires: libastro%{_so_astro} = %{version} Requires: libmarblewidget-qt5%{_so} = %{version} @@ -122,6 +129,11 @@ Group: Development/Libraries/KDE Requires: libastro%{_so_astro} = %{version} Requires: libmarblewidget-qt5%{_so} = %{version} +%ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64 +Requires: pkgconfig(Qt5WebEngineWidgets) +%endif +Requires: pkgconfig(Qt5Widgets) +Requires: pkgconfig(Qt5Xml) Obsoletes: marble5-devel < %{version} Provides: marble5-devel = %{version} @@ -162,6 +174,7 @@ %prep %setup -q -n marble-%{version} +%autopatch -p1 %build export SUSE_ASNEEDED=0 ++++++ Fix-MarbleConfig.cmake-to-find-QtWebEngine.patch ++++++ >From b8db30a58396060034ac76aa5f7d408b6c467d5f Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" <[email protected]> Date: Fri, 19 Oct 2018 17:40:43 +0200 Subject: Fix MarbleConfig.cmake file to update to port to QtWebEngine --- src/lib/marble/MarbleConfig.cmake.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/marble/MarbleConfig.cmake.in b/src/lib/marble/MarbleConfig.cmake.in index 4f6fc17..ec39b79 100644 --- a/src/lib/marble/MarbleConfig.cmake.in +++ b/src/lib/marble/MarbleConfig.cmake.in @@ -8,13 +8,15 @@ if (_CMakeFindDependencyMacro_FOUND) find_dependency(Qt5Xml @REQUIRED_QT_VERSION@) find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) if (NOT MARBLE_NO_WEBKITWIDGETS) - find_dependency(Qt5WebKitWidgets @REQUIRED_QT_VERSION@) + find_dependency(Qt5WebEngine @REQUIRED_QT_VERSION@) + find_dependency(Qt5WebEngineWidgets @REQUIRED_QT_VERSION@) endif() else() find_package(Qt5Xml REQUIRED) find_package(Qt5Widgets REQUIRED) if (NOT MARBLE_NO_WEBKITWIDGETS) - find_package(Qt5WebKitWidgets REQUIRED) + find_package(Qt5WebEngine REQUIRED) + find_package(Qt5WebEngineWidgets REQUIRED) endif() endif() -- cgit v0.11.2 ++++++ Port-to-QtWebEngine.patch ++++++ ++++ 799 lines (skipped)
