Hello community, here is the log from the commit of package qgroundcontrol for openSUSE:Factory checked in at 2018-01-01 22:36:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qgroundcontrol (Old) and /work/SRC/openSUSE:Factory/.qgroundcontrol.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qgroundcontrol" Mon Jan 1 22:36:22 2018 rev:2 rq:560981 version:3.2.7 Changes: -------- --- /work/SRC/openSUSE:Factory/qgroundcontrol/qgroundcontrol.changes 2017-12-12 21:22:15.384493229 +0100 +++ /work/SRC/openSUSE:Factory/.qgroundcontrol.new/qgroundcontrol.changes 2018-01-01 22:37:58.505015856 +0100 @@ -1,0 +2,14 @@ +Mon Jan 1 09:55:15 UTC 2018 - [email protected] + +- update to version 3.2.7 + * Bring fixes from master to Stable + * Remove debuggable to hopefully get back auto-stable build update +- fixing build with Qt 5.10 with patch based on upstream pull request + (5923.patch) + +------------------------------------------------------------------- +Mon Nov 6 13:52:53 UTC 2017 - [email protected] + +- update to version 3.2.5 + +------------------------------------------------------------------- Old: ---- qgroundcontrol-3.2.4.tar.xz New: ---- 5923.patch qgroundcontrol-3.2.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qgroundcontrol.spec ++++++ --- /var/tmp/diff_new_pack.rN1fZ7/_old 2018-01-01 22:38:02.811578009 +0100 +++ /var/tmp/diff_new_pack.rN1fZ7/_new 2018-01-01 22:38:02.819575338 +0100 @@ -1,7 +1,7 @@ # # spec file for package qgroundcontrol # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,53 +19,55 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines Name: qgroundcontrol -Version: 3.2.4 +Version: 3.2.7 Release: 0 Summary: An operator control unit / ground control software for micro air vehicles License: GPL-3.0 Group: Other Url: http://www.qgroundcontrol.org/ Source0: qgroundcontrol-%{version}.tar.xz +# modified patch from upstream pull request to fix qt 5.10 builds +Patch0: 5923.patch Patch2: fix-install.patch # ModemManager has the broken design to grab any serial port first # as background daemon. this breaks any other app which needs to access the device # on boot up (for firmware update here) Conflicts: ModemManager %if 0%{?fedora_version} +BuildRequires: SDL-devel +BuildRequires: SDL2-devel +BuildRequires: alsa-lib-devel BuildRequires: qt5-qtbase-devel >= 5.7 -BuildRequires: qt5-qtsvg-devel -BuildRequires: qt5-qtscript-devel -BuildRequires: qt5-qtmultimedia-devel BuildRequires: qt5-qtlocation-devel +BuildRequires: qt5-qtmultimedia-devel +BuildRequires: qt5-qtscript-devel +BuildRequires: qt5-qtserialport-devel +BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-qttools-devel BuildRequires: qt5-qtwebkit-devel -BuildRequires: qt5-qtserialport-devel -BuildRequires: SDL-devel -BuildRequires: SDL2-devel -BuildRequires: alsa-lib-devel %else -BuildRequires: libqt5-qtbase-devel >= 5.7 +BuildRequires: alsa-devel +BuildRequires: libQt5QuickControls2-devel +BuildRequires: libQt5WebKitWidgets-devel +BuildRequires: libQt5Widgets-devel +BuildRequires: libSDL-devel +BuildRequires: libSDL2-devel BuildRequires: libqt5-qtbase-common-devel -BuildRequires: libqt5-qtsvg-devel -BuildRequires: libqt5-qtscript-devel +BuildRequires: libqt5-qtbase-devel >= 5.7 BuildRequires: libqt5-qtlocation-devel BuildRequires: libqt5-qtlocation-private-headers-devel BuildRequires: libqt5-qtmultimedia-devel -BuildRequires: libqt5-qttools-devel -BuildRequires: libQt5Widgets-devel -BuildRequires: libQt5WebKitWidgets-devel -BuildRequires: libQt5QuickControls2-devel +BuildRequires: libqt5-qtscript-devel BuildRequires: libqt5-qtserialport-devel -BuildRequires: libSDL-devel -BuildRequires: libSDL2-devel -BuildRequires: alsa-devel +BuildRequires: libqt5-qtsvg-devel +BuildRequires: libqt5-qttools-devel %endif +BuildRequires: espeak-devel BuildRequires: libicu-devel BuildRequires: libsndfile-devel BuildRequires: libudev-devel BuildRequires: openssl-devel -BuildRequires: espeak-devel # is not building atm #BuildRequires: libxbee3-devel BuildRequires: fdupes @@ -83,6 +85,7 @@ %prep %setup -q +%patch0 -p1 %patch2 -p1 mkdir build ++++++ 5923.patch ++++++ diff --git a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp index f856dec93..088d97ffa 100644 --- a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp +++ b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp @@ -96,6 +96,16 @@ QGeoTiledMappingManagerEngineQGC::QGeoTiledMappingManagerEngineQGC(const QVarian * Google and Bing don't seem kosher at all. This was based on original code from OpenPilot and heavily modified to be used in QGC. */ +// In Qt 5.10 QGeoMapType need QGeoCameraCapabilities as argument +// E.g: https://github.com/qt/qtlocation/blob/2b230b0a10d898979e9d5193f4da2e408b397fe3/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp#L167 +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) +#define QGCGEOMAPTYPE(a,b,c,d,e,f) QGeoMapType(a,b,c,d,e,f,QByteArray("QGroundControl"), cameraCaps) +#elif QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) +#define QGCGEOMAPTYPE(a,b,c,d,e,f) QGeoMapType(a,b,c,d,e,f,QByteArray("QGroundControl")) +#else +#define QGCGEOMAPTYPE(a,b,c,d,e,f) QGeoMapType(a,b,c,d,e,f) +#endif + //-- IMPORTANT // Changes here must reflect those in QGCMapEngine.cpp ++++++ _service ++++++ --- /var/tmp/diff_new_pack.rN1fZ7/_old 2018-01-01 22:38:02.855563323 +0100 +++ /var/tmp/diff_new_pack.rN1fZ7/_new 2018-01-01 22:38:02.883553978 +0100 @@ -2,8 +2,8 @@ <service name="tar_scm" mode="disabled"> <param name="url">git://github.com/mavlink/qgroundcontrol.git</param> <param name="scm">git</param> - <param name="revision">v3.2.4</param> - <param name="version">3.2.4</param> + <param name="revision">v3.2.7</param> + <param name="version">3.2.7</param> <param name="exclude">lib</param> <!-- not working atm <param name="exclude">mavlink</param> ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.rN1fZ7/_old 2018-01-01 22:38:02.899548637 +0100 +++ /var/tmp/diff_new_pack.rN1fZ7/_new 2018-01-01 22:38:02.899548637 +0100 @@ -1,4 +1,4 @@ -qgroundcontrol (3.2.4-0) trusty; urgency=low +qgroundcontrol (3.2.7-0) trusty; urgency=low * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP> ++++++ qgroundcontrol-3.2.4.tar.xz -> qgroundcontrol-3.2.7.tar.xz ++++++ /work/SRC/openSUSE:Factory/qgroundcontrol/qgroundcontrol-3.2.4.tar.xz /work/SRC/openSUSE:Factory/.qgroundcontrol.new/qgroundcontrol-3.2.7.tar.xz differ: char 27, line 1 ++++++ qgroundcontrol.dsc ++++++ --- /var/tmp/diff_new_pack.rN1fZ7/_old 2018-01-01 22:38:02.975523271 +0100 +++ /var/tmp/diff_new_pack.rN1fZ7/_new 2018-01-01 22:38:02.975523271 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: qgroundcontrol -Version: 3.2.4-0 +Version: 3.2.7-0 Binary: qgroundcontrol Maintainer: Adrian Schroeter <[email protected]> Architecture: all
