Hello community, here is the log from the commit of package qgroundcontrol for openSUSE:Factory checked in at 2019-11-12 11:55:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qgroundcontrol (Old) and /work/SRC/openSUSE:Factory/.qgroundcontrol.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qgroundcontrol" Tue Nov 12 11:55:08 2019 rev:11 rq:737405 version:3.6.0~pre.1570775458.0d1bb4844 Changes: -------- --- /work/SRC/openSUSE:Factory/qgroundcontrol/qgroundcontrol.changes 2019-08-19 23:02:27.455445727 +0200 +++ /work/SRC/openSUSE:Factory/.qgroundcontrol.new.2990/qgroundcontrol.changes 2019-11-12 11:56:28.815410967 +0100 @@ -1,0 +2,8 @@ +Fri Oct 11 07:35:32 UTC 2019 - Adrian Schröter <adr...@suse.de> + +- update to 3.6 pre-release + * fixes build for factory + * dropping obsolete use_system_qwt.patch + * require Qt 5.11 or higher + +------------------------------------------------------------------- Old: ---- qgroundcontrol-3.5.4.obscpio use_system_qwt.patch New: ---- qgroundcontrol-3.6.0~pre.1570775458.0d1bb4844.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qgroundcontrol.spec ++++++ --- /var/tmp/diff_new_pack.2F3MuC/_old 2019-11-12 11:56:37.895420641 +0100 +++ /var/tmp/diff_new_pack.2F3MuC/_new 2019-11-12 11:56:37.935420684 +0100 @@ -19,7 +19,7 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines Name: qgroundcontrol -Version: 3.5.4 +Version: 3.6.0~pre.1570775458.0d1bb4844 Release: 0 Summary: An operator control unit / ground control software for micro air vehicles License: GPL-3.0-only @@ -27,7 +27,6 @@ Url: http://www.qgroundcontrol.org/ Source0: qgroundcontrol-%{version}.tar.xz 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) @@ -41,7 +40,7 @@ %endif BuildRequires: pkgconfig(Qt5Charts) -BuildRequires: pkgconfig(Qt5Core) >= 5.7 +BuildRequires: pkgconfig(Qt5Core) >= 5.11 BuildRequires: pkgconfig(Qt5MultimediaWidgets) BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5Positioning) @@ -81,9 +80,6 @@ %prep %setup -q %patch2 -p1 -%if 0%{?suse_version} >= 1500 -%patch3 -p1 -%endif mkdir build %build ++++++ _service ++++++ --- /var/tmp/diff_new_pack.2F3MuC/_old 2019-11-12 11:56:38.391421170 +0100 +++ /var/tmp/diff_new_pack.2F3MuC/_new 2019-11-12 11:56:38.419421200 +0100 @@ -2,8 +2,8 @@ <service name="obs_scm" mode="disabled"> <param name="url">git://github.com/mavlink/qgroundcontrol.git</param> <param name="scm">git</param> - <param name="revision">v3.5.4</param> - <param name="version">3.5.4</param> + <param name="revision">master</param> + <param name="versionprefix">3.6.0~pre</param> <param name="exclude">lib</param> <!-- not working atm <param name="exclude">mavlink</param> ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.2F3MuC/_old 2019-11-12 11:56:38.683421481 +0100 +++ /var/tmp/diff_new_pack.2F3MuC/_new 2019-11-12 11:56:38.707421506 +0100 @@ -1,4 +1,4 @@ -qgroundcontrol (3.5.4-0) trusty; urgency=low +qgroundcontrol (3.6.0~pre.1570775458.0d1bb4844-0) trusty; urgency=low * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP> ++++++ fix-install.patch ++++++ --- /var/tmp/diff_new_pack.2F3MuC/_old 2019-11-12 11:56:38.875421685 +0100 +++ /var/tmp/diff_new_pack.2F3MuC/_new 2019-11-12 11:56:38.875421685 +0100 @@ -1,9 +1,22 @@ +diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri +index cef4da3d2..48f0e6675 100644 +--- a/QGCExternalLibs.pri ++++ b/QGCExternalLibs.pri +@@ -112,7 +112,7 @@ MacBuild { + -F$$BASEDIR/libs/lib/Frameworks \ + -framework SDL2 + } else:LinuxBuild { +- PKGCONFIG = sdl2 ++ PKGCONFIG += sdl2 + } else:WindowsBuild { + INCLUDEPATH += $$BASEDIR/libs/lib/sdl2/msvc/include + INCLUDEPATH += $$BASEDIR/libs/zlib/Windows/include diff --git a/QGCSetup.pri b/QGCSetup.pri -index a44926f73..aed9c3ab0 100644 +index 8d776634e..a8d37eb8e 100644 --- a/QGCSetup.pri +++ b/QGCSetup.pri -@@ -97,7 +97,7 @@ WindowsBuild { - QMAKE_POST_LINK += $$escape_expand(\\n) $$QT_BIN_DIR\\windeployqt --no-compiler-runtime --qmldir=$${BASEDIR_WIN}\\src $${DEPLOY_TARGET} +@@ -90,7 +90,7 @@ WindowsBuild { + QMAKE_POST_LINK += $$escape_expand(\\n) $$QT_BIN_DIR\\windeployqt --qmldir=$${BASEDIR_WIN}\\src $${DEPLOY_TARGET} } -LinuxBuild { ++++++ qgroundcontrol.dsc ++++++ --- /var/tmp/diff_new_pack.2F3MuC/_old 2019-11-12 11:56:38.907421719 +0100 +++ /var/tmp/diff_new_pack.2F3MuC/_new 2019-11-12 11:56:38.907421719 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: qgroundcontrol -Version: 3.5.4-0 +Version: 3.6.0~pre.1570775458.0d1bb4844-0 Binary: qgroundcontrol Maintainer: Adrian Schroeter <adr...@suse.de> Architecture: all ++++++ qgroundcontrol.obsinfo ++++++ --- /var/tmp/diff_new_pack.2F3MuC/_old 2019-11-12 11:56:38.931421745 +0100 +++ /var/tmp/diff_new_pack.2F3MuC/_new 2019-11-12 11:56:38.935421749 +0100 @@ -1,5 +1,5 @@ name: qgroundcontrol -version: 3.5.4 -mtime: 1564083653 -commit: c9948d19e34243e5717857b24b5a91edc543a9b8 +version: 3.6.0~pre.1570775458.0d1bb4844 +mtime: 1570775458 +commit: 0d1bb4844201f82de85fce44d07641c2f2c8e00a
