Hello community, here is the log from the commit of package qgroundcontrol for openSUSE:Factory checked in at 2018-03-08 10:59:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qgroundcontrol (Old) and /work/SRC/openSUSE:Factory/.qgroundcontrol.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qgroundcontrol" Thu Mar 8 10:59:58 2018 rev:3 rq:584082 version:3.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qgroundcontrol/qgroundcontrol.changes 2018-01-01 22:37:58.505015856 +0100 +++ /work/SRC/openSUSE:Factory/.qgroundcontrol.new/qgroundcontrol.changes 2018-03-08 11:00:08.863592401 +0100 @@ -1,0 +2,32 @@ +Wed Mar 7 18:26:13 UTC 2018 - adr...@suse.de + +- get rid of espeak +- use system qwt (submission by alois use_system_qwt.patch) +- add gstreamer dependencies + +------------------------------------------------------------------- +Wed Mar 7 08:23:22 UTC 2018 - adr...@suse.de + +- update to version 3.3.0 + * Settings + - Local NMEA GPS device support. + - Video Recording save settings. + * Setup + - Parameter Editor - Searching updates as you type characters for near immediate response to searches. + - Joystick - Android joystick support. + * Plan + - NEW - Structure Scan Pattern - Create a multi-layered flight pattern that captures images over vertical surfaces (polygonal or circular). Used for 3d model generation or vertical surface inspection. + - Fixed Wing Landing Pattern - You can now adjust the distance from the loiter to land point by either distance or glide slope fall rate. + - PX4 GeoFence and Rally Point support. + - Terrain height display in lower Mission Item altitude display + * Fly + - Start/Stop video recording. + - Better display of vehicle icons when connected to multiple vehicles. + - Multi-Vehicle View supports commands which apply to all vehicles. + - Displays vehicles reported from ADS-B sensor. + * Analyze + - Mavlink console - New support for communicating with Mavlink console. + - Log Download - Moved from Menu to Analyze view. +- drop merged qt 5.10 fix (5923.patch) + +------------------------------------------------------------------- Old: ---- 5923.patch qgroundcontrol-3.2.7.tar.xz New: ---- qgroundcontrol-3.3.0.tar.xz use_system_qwt.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qgroundcontrol.spec ++++++ --- /var/tmp/diff_new_pack.qiPeqo/_old 2018-03-08 11:00:15.679346056 +0100 +++ /var/tmp/diff_new_pack.qiPeqo/_new 2018-03-08 11:00:15.679346056 +0100 @@ -19,51 +19,45 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines Name: qgroundcontrol -Version: 3.2.7 +Version: 3.3.0 Release: 0 Summary: An operator control unit / ground control software for micro air vehicles -License: GPL-3.0 +License: GPL-3.0-only 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 +Patch3: use_system_qwt.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-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: python2 +BuildRequires: systemd-devel %else -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-qtbase-devel >= 5.7 -BuildRequires: libqt5-qtlocation-devel +BuildRequires: libudev-devel +%endif BuildRequires: libqt5-qtlocation-private-headers-devel -BuildRequires: libqt5-qtmultimedia-devel -BuildRequires: libqt5-qtscript-devel -BuildRequires: libqt5-qtserialport-devel -BuildRequires: libqt5-qtsvg-devel -BuildRequires: libqt5-qttools-devel + +BuildRequires: pkgconfig(Qt5Core) >= 5.7 +BuildRequires: pkgconfig(Qt5MultimediaWidgets) +BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: pkgconfig(Qt5Positioning) +BuildRequires: pkgconfig(Qt5ScriptTools) +BuildRequires: pkgconfig(Qt5SerialPort) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5TextToSpeech) +BuildRequires: pkgconfig(Qt5UiTools) +BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRequires: pkgconfig(Qt5Widgets) +%if 0%{?suse_version} >= 1500 +BuildRequires: pkgconfig(Qt5Qwt6) %endif -BuildRequires: espeak-devel +BuildRequires: SDL2-devel +BuildRequires: gstreamer-devel +BuildRequires: gstreamer-plugins-base-devel BuildRequires: libicu-devel BuildRequires: libsndfile-devel BuildRequires: libudev-devel @@ -85,8 +79,10 @@ %prep %setup -q -%patch0 -p1 %patch2 -p1 +%if 0%{?suse_version} >= 1500 +%patch3 -p1 +%endif mkdir build %build @@ -104,11 +100,11 @@ install -p -m 0644 ../deploy/qgroundcontrol.desktop %{buildroot}/usr/share/applications/ install -p -m 0644 ../resources/icons/qgroundcontrol.png %{buildroot}/usr/share/pixmaps/ sed -i -e 's/^Categories=.*/Categories=Development;Building;/' %{buildroot}/usr/share/applications/qgroundcontrol.desktop -%fdupes %{buildroot}/%{_prefix} +%fdupes %{buildroot}%{_prefix} %files %defattr(0644,root,root,-) -%doc license.txt README.md +%doc COPYING.md README.md %attr(0755,root,root) %{_bindir}/QGroundControl %{_datadir}/%{name} /usr/share/applications/* ++++++ _service ++++++ --- /var/tmp/diff_new_pack.qiPeqo/_old 2018-03-08 11:00:15.739343888 +0100 +++ /var/tmp/diff_new_pack.qiPeqo/_new 2018-03-08 11:00:15.739343888 +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.7</param> - <param name="version">3.2.7</param> + <param name="revision">v3.3.0</param> + <param name="version">3.3.0</param> <param name="exclude">lib</param> <!-- not working atm <param name="exclude">mavlink</param> ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.qiPeqo/_old 2018-03-08 11:00:15.787342153 +0100 +++ /var/tmp/diff_new_pack.qiPeqo/_new 2018-03-08 11:00:15.791342009 +0100 @@ -1,4 +1,4 @@ -qgroundcontrol (3.2.7-0) trusty; urgency=low +qgroundcontrol (3.3.0-0) trusty; urgency=low * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP> ++++++ qgroundcontrol-3.2.7.tar.xz -> qgroundcontrol-3.3.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/qgroundcontrol/qgroundcontrol-3.2.7.tar.xz /work/SRC/openSUSE:Factory/.qgroundcontrol.new/qgroundcontrol-3.3.0.tar.xz differ: char 26, line 1 ++++++ qgroundcontrol.dsc ++++++ --- /var/tmp/diff_new_pack.qiPeqo/_old 2018-03-08 11:00:15.991334780 +0100 +++ /var/tmp/diff_new_pack.qiPeqo/_new 2018-03-08 11:00:15.999334492 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: qgroundcontrol -Version: 3.2.7-0 +Version: 3.3.0-0 Binary: qgroundcontrol Maintainer: Adrian Schroeter <adr...@suse.de> Architecture: all ++++++ use_system_qwt.patch ++++++ Index: qgroundcontrol-3.3.0/QGCExternalLibs.pri =================================================================== --- qgroundcontrol-3.3.0.orig/QGCExternalLibs.pri +++ qgroundcontrol-3.3.0/QGCExternalLibs.pri @@ -75,9 +75,7 @@ DEFINES += NOMINMAX # [REQUIRED] QWT plotting library dependency. Provides plotting capabilities. # !MobileBuild { -include(libs/qwt.pri) -DEPENDPATH += libs/qwt -INCLUDEPATH += libs/qwt +PKGCONFIG += Qt5Qwt6 } # @@ -93,7 +91,7 @@ MacBuild { -F$$BASEDIR/libs/lib/Frameworks \ -framework SDL2 } else:LinuxBuild { - PKGCONFIG = sdl2 + PKGCONFIG += sdl2 } else:WindowsBuild { INCLUDEPATH += $$BASEDIR/libs/lib/sdl2/msvc/include