Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gpxsee for openSUSE:Factory checked in at 2022-10-11 18:02:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpxsee (Old) and /work/SRC/openSUSE:Factory/.gpxsee.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpxsee" Tue Oct 11 18:02:26 2022 rev:94 rq:1009255 version:11.6 Changes: -------- --- /work/SRC/openSUSE:Factory/gpxsee/gpxsee.changes 2022-09-29 18:12:59.351212123 +0200 +++ /work/SRC/openSUSE:Factory/.gpxsee.new.2275/gpxsee.changes 2022-10-11 18:05:00.738032672 +0200 @@ -1,0 +2,8 @@ +Mon Oct 10 00:56:00 CEST 2022 - [email protected] + +- Update to version 11.6 + * Fixed tracks/routes line style configuration (introduced in + 11.5). + * Fixed KML StyleMap handling. + +------------------------------------------------------------------- Old: ---- GPXSee-11.5.tar.gz New: ---- GPXSee-11.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpxsee.spec ++++++ --- /var/tmp/diff_new_pack.p8x1ap/_old 2022-10-11 18:05:01.274033538 +0200 +++ /var/tmp/diff_new_pack.p8x1ap/_new 2022-10-11 18:05:01.274033538 +0200 @@ -19,7 +19,7 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines Name: gpxsee -Version: 11.5 +Version: 11.6 Release: 1 Summary: GPS log file visualization and analysis tool License: GPL-3.0-only ++++++ GPXSee-11.5.tar.gz -> GPXSee-11.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-11.5/.appveyor.yml new/GPXSee-11.6/.appveyor.yml --- old/GPXSee-11.5/.appveyor.yml 2022-09-26 23:00:34.000000000 +0200 +++ new/GPXSee-11.6/.appveyor.yml 2022-10-08 19:39:15.000000000 +0200 @@ -1,4 +1,4 @@ -version: 11.5.{build} +version: 11.6.{build} configuration: - Release @@ -11,7 +11,7 @@ OPENSSLDIR: C:\OpenSSL-v111-Win64\bin matrix: - QTDIR: C:\Qt\5.15\msvc2019_64 - - QTDIR: C:\Qt\6.3\msvc2019_64 + - QTDIR: C:\Qt\6.4\msvc2019_64 NSISDEF: /DQT6 install: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-11.5/.github/workflows/android.yml new/GPXSee-11.6/.github/workflows/android.yml --- old/GPXSee-11.5/.github/workflows/android.yml 2022-09-26 23:00:34.000000000 +0200 +++ new/GPXSee-11.6/.github/workflows/android.yml 2022-10-08 19:39:15.000000000 +0200 @@ -22,19 +22,19 @@ - name: Run sdkmanager update run: ${ANDROID_HOME}/tools/bin/sdkmanager --update - name: Install android platform, platform-tools, build-tools and ndk - run: ${ANDROID_HOME}/tools/bin/sdkmanager --install "cmdline-tools;latest" "platform-tools" "platforms;android-31" "build-tools;31.0.0" "ndk;22.1.7171670" + run: ${ANDROID_HOME}/tools/bin/sdkmanager --install "cmdline-tools;latest" "platform-tools" "platforms;android-31" "build-tools;31.0.0" "ndk;23.1.7779620" - name: Setup NDK path - run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/22.1.7171670/" >> $GITHUB_ENV + run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/23.1.7779620/" >> $GITHUB_ENV - name: Install Qt (Desktop) uses: jurplel/install-qt-action@v2 with: aqtversion: '==2.1.0' - version: '6.3.1' + version: '6.4.0' - name: Install Qt (Android) uses: jurplel/install-qt-action@v2 with: aqtversion: '==2.1.0' - version: '6.3.1' + version: '6.4.0' target: 'android' arch: 'android_armv7' modules: qtpositioning qt5compat diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-11.5/gpxsee.pro new/GPXSee-11.6/gpxsee.pro --- old/GPXSee-11.5/gpxsee.pro 2022-09-26 23:00:34.000000000 +0200 +++ new/GPXSee-11.6/gpxsee.pro 2022-10-08 19:39:15.000000000 +0200 @@ -3,7 +3,7 @@ } else { TARGET = GPXSee } -VERSION = 11.5 +VERSION = 11.6 QT += core \ gui \ @@ -558,6 +558,7 @@ message("OpenSSL not found, building without HTTPS support!") } + ANDROID_TARGET_SDK_VERSION = 31 ANDROID_VERSION_NAME = $$VERSION ANDROID_VERSION_CODE = $$versionCode($$ANDROID_VERSION_NAME) ANDROID_PACKAGE_SOURCE_DIR = $$PWD/pkg/android diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-11.5/lang/gpxsee_ca.ts new/GPXSee-11.6/lang/gpxsee_ca.ts --- old/GPXSee-11.5/lang/gpxsee_ca.ts 2022-09-26 23:00:34.000000000 +0200 +++ new/GPXSee-11.6/lang/gpxsee_ca.ts 2022-10-08 19:39:15.000000000 +0200 @@ -556,7 +556,7 @@ <message> <location filename="../src/GUI/gui.cpp" line="432"/> <source>Use styles</source> - <translation type="unfinished"></translation> + <translation>Empra estils</translation> </message> <message> <location filename="../src/GUI/gui.cpp" line="439"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-11.5/pkg/android/AndroidManifest.xml new/GPXSee-11.6/pkg/android/AndroidManifest.xml --- old/GPXSee-11.5/pkg/android/AndroidManifest.xml 2022-09-26 23:00:34.000000000 +0200 +++ new/GPXSee-11.6/pkg/android/AndroidManifest.xml 2022-10-08 19:39:15.000000000 +0200 @@ -4,7 +4,7 @@ <!-- %%INSERT_FEATURES --> <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:smallScreens="true"/> <application android:name="org.qtproject.qt.android.bindings.QtApplication" android:extractNativeLibs="true" android:hardwareAccelerated="true" android:label="-- %%INSERT_APP_NAME%% --" android:requestLegacyExternalStorage="true" android:allowNativeHeapPointerTagging="false" android:icon="@drawable/icon"> - <activity android:name="org.qtproject.qt.android.bindings.QtActivity" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:label="-- %%INSERT_APP_NAME%% --" android:launchMode="singleTop" android:screenOrientation="unspecified"> + <activity android:name="org.qtproject.qt.android.bindings.QtActivity" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:label="-- %%INSERT_APP_NAME%% --" android:launchMode="singleTop" android:screenOrientation="unspecified" android:exported="true"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-11.5/pkg/gpxsee64.nsi new/GPXSee-11.6/pkg/gpxsee64.nsi --- old/GPXSee-11.5/pkg/gpxsee64.nsi 2022-09-26 23:00:34.000000000 +0200 +++ new/GPXSee-11.6/pkg/gpxsee64.nsi 2022-10-08 19:39:15.000000000 +0200 @@ -37,7 +37,7 @@ ; The name of the installer Name "GPXSee" ; Program version -!define VERSION "11.5" +!define VERSION "11.6" ; The file to write OutFile "GPXSee-${VERSION}_x64.exe" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-11.5/src/GUI/pathitem.cpp new/GPXSee-11.6/src/GUI/pathitem.cpp --- old/GPXSee-11.5/src/GUI/pathitem.cpp 2022-09-26 23:00:34.000000000 +0200 +++ new/GPXSee-11.6/src/GUI/pathitem.cpp 2022-10-08 19:39:15.000000000 +0200 @@ -200,7 +200,8 @@ Qt::PenStyle PathItem::penStyle() const { - return _useStyle ? Qt::SolidLine : _penStyle; + return (_useStyle && _path.style().style() != Qt::NoPen) + ? _path.style().style() : _penStyle; } void PathItem::setPenStyle(Qt::PenStyle style) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-11.5/src/data/geojsonparser.cpp new/GPXSee-11.6/src/data/geojsonparser.cpp --- old/GPXSee-11.5/src/data/geojsonparser.cpp 2022-09-26 23:00:34.000000000 +0200 +++ new/GPXSee-11.6/src/data/geojsonparser.cpp 2022-10-08 19:39:15.000000000 +0200 @@ -74,7 +74,7 @@ width = o["stroke-width"].toDouble(); } - track.setStyle(LineStyle(color, width)); + track.setStyle(LineStyle(color, width, Qt::SolidLine)); } static void setWaypointProperties(Waypoint &waypoint, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-11.5/src/data/kmlparser.cpp new/GPXSee-11.6/src/data/kmlparser.cpp --- old/GPXSee-11.5/src/data/kmlparser.cpp 2022-09-26 23:00:34.000000000 +0200 +++ new/GPXSee-11.6/src/data/kmlparser.cpp 2022-10-08 19:39:15.000000000 +0200 @@ -525,7 +525,7 @@ } void KMLParser::photoOverlay(const Ctx &ctx, QVector<Waypoint> &waypoints, - PointStyleMap &pointStyles) + PointStyleMap &pointStyles, QMap<QString, QString> &map) { QString img, id; Waypoint w; @@ -548,7 +548,7 @@ style(ctx.dir, pointStyles, unused, unused2); id = QString(); } else if (_reader.name() == QLatin1String("StyleMap")) - styleMap(pointStyles, unused, unused2); + styleMap(map); else if (_reader.name() == QLatin1String("Icon")) img = icon(); else if (_reader.name() == QLatin1String("Point")) @@ -560,7 +560,11 @@ } if (!w.coordinates().isNull()) { - w.setStyle(pointStyles.value(id)); + PointStyleMap::iterator pit = pointStyles.find(id); + if (pit == pointStyles.end()) + pit = pointStyles.find(map.value(id)); + w.setStyle(pit == pointStyles.end() + ? PointStyle(QColor(0x55, 0x55, 0x55)) : *pit); img.replace(re, "0"); if (!QUrl(img).scheme().isEmpty()) @@ -611,7 +615,8 @@ void KMLParser::placemark(const Ctx &ctx, QList<TrackData> &tracks, QList<Area> &areas, QVector<Waypoint> &waypoints, PointStyleMap &pointStyles, - PolygonStyleMap &polyStyles, LineStyleMap &lineStyles) + PolygonStyleMap &polyStyles, LineStyleMap &lineStyles, + QMap<QString, QString> &map) { QString name, desc, phone, address, id; QDateTime timestamp; @@ -634,7 +639,7 @@ style(ctx.dir, pointStyles, polyStyles, lineStyles); id = QString(); } else if (_reader.name() == QLatin1String("StyleMap")) - styleMap(pointStyles, polyStyles, lineStyles); + styleMap(map); else if (_reader.name() == QLatin1String("MultiGeometry")) multiGeometry(tracks, areas, waypoints); else if (_reader.name() == QLatin1String("Point")) { @@ -662,8 +667,14 @@ } PointStyleMap::iterator pit = pointStyles.find(id); + if (pit == pointStyles.end()) + pit = pointStyles.find(map.value(id)); LineStyleMap::iterator lit = lineStyles.find(id); + if (lit == lineStyles.end()) + lit = lineStyles.find(map.value(id)); PolygonStyleMap::iterator ait = polyStyles.find(id); + if (ait == polyStyles.end()) + ait = polyStyles.find(map.value(id)); for (int i = wptIdx; i < waypoints.size(); i++) { Waypoint &w = waypoints[i]; @@ -680,7 +691,7 @@ t.setName(name); t.setDescription(desc); t.setStyle(lit == lineStyles.end() - ? LineStyle(QColor(0x55, 0x55, 0x55), 2) : *lit); + ? LineStyle(QColor(0x55, 0x55, 0x55), 2, Qt::SolidLine) : *lit); } for (int i = areaIdx; i < areas.size(); i++) { Area &a = areas[i]; @@ -779,11 +790,10 @@ _reader.skipCurrentElement(); } - styles.insert(id, LineStyle(c, width)); + styles.insert(id, LineStyle(c, width, Qt::SolidLine)); } -void KMLParser::styleMapPair(const QString &id, PointStyleMap &pointStyles, - PolygonStyleMap &polyStyles, LineStyleMap &lineStyles) +void KMLParser::styleMapPair(const QString &id, QMap<QString, QString> &map) { QString key, url; @@ -796,21 +806,17 @@ _reader.skipCurrentElement(); } - if (key == "normal") { - pointStyles.insert(id, pointStyles.value(url)); - polyStyles.insert(id, polyStyles.value(url)); - lineStyles.insert(id, lineStyles.value(url)); - } + if (key == "normal") + map.insert(id, url); } -void KMLParser::styleMap(PointStyleMap &pointStyles, - PolygonStyleMap &polyStyles, LineStyleMap &lineStyles) +void KMLParser::styleMap(QMap<QString, QString> &map) { QString id = _reader.attributes().value("id").toString(); while (_reader.readNextStartElement()) { if (_reader.name() == QLatin1String("Pair")) - styleMapPair(id, pointStyles, polyStyles, lineStyles); + styleMapPair(id, map); else _reader.skipCurrentElement(); } @@ -836,19 +842,19 @@ void KMLParser::folder(const Ctx &ctx, QList<TrackData> &tracks, QList<Area> &areas, QVector<Waypoint> &waypoints, PointStyleMap &pointStyles, PolygonStyleMap &polyStyles, - LineStyleMap &lineStyles) + LineStyleMap &lineStyles, QMap<QString, QString> &map) { while (_reader.readNextStartElement()) { if (_reader.name() == QLatin1String("Document")) document(ctx, tracks, areas, waypoints); else if (_reader.name() == QLatin1String("Folder")) folder(ctx, tracks, areas, waypoints, pointStyles, polyStyles, - lineStyles); + lineStyles, map); else if (_reader.name() == QLatin1String("Placemark")) placemark(ctx, tracks, areas, waypoints, pointStyles, polyStyles, - lineStyles); + lineStyles, map); else if (_reader.name() == QLatin1String("PhotoOverlay")) - photoOverlay(ctx, waypoints, pointStyles); + photoOverlay(ctx, waypoints, pointStyles, map); else _reader.skipCurrentElement(); } @@ -860,22 +866,23 @@ PointStyleMap pointStyles; PolygonStyleMap polyStyles; LineStyleMap lineStyles; + QMap<QString, QString> map; while (_reader.readNextStartElement()) { if (_reader.name() == QLatin1String("Document")) document(ctx, tracks, areas, waypoints); else if (_reader.name() == QLatin1String("Folder")) folder(ctx, tracks, areas, waypoints, pointStyles, polyStyles, - lineStyles); + lineStyles, map); else if (_reader.name() == QLatin1String("Placemark")) placemark(ctx, tracks, areas, waypoints, pointStyles, polyStyles, - lineStyles); + lineStyles, map); else if (_reader.name() == QLatin1String("PhotoOverlay")) - photoOverlay(ctx, waypoints, pointStyles); + photoOverlay(ctx, waypoints, pointStyles, map); else if (_reader.name() == QLatin1String("Style")) style(ctx.dir, pointStyles, polyStyles, lineStyles); else if (_reader.name() == QLatin1String("StyleMap")) - styleMap(pointStyles, polyStyles, lineStyles); + styleMap(map); else _reader.skipCurrentElement(); } @@ -887,18 +894,19 @@ PointStyleMap pointStyles; PolygonStyleMap polyStyles; LineStyleMap lineStyles; + QMap<QString, QString> map; while (_reader.readNextStartElement()) { if (_reader.name() == QLatin1String("Document")) document(ctx, tracks, areas, waypoints); else if (_reader.name() == QLatin1String("Folder")) folder(ctx, tracks, areas, waypoints, pointStyles, polyStyles, - lineStyles); + lineStyles, map); else if (_reader.name() == QLatin1String("Placemark")) placemark(ctx, tracks, areas, waypoints, pointStyles, polyStyles, - lineStyles); + lineStyles, map); else if (_reader.name() == QLatin1String("PhotoOverlay")) - photoOverlay(ctx, waypoints, pointStyles); + photoOverlay(ctx, waypoints, pointStyles, map); else _reader.skipCurrentElement(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-11.5/src/data/kmlparser.h new/GPXSee-11.6/src/data/kmlparser.h --- old/GPXSee-11.5/src/data/kmlparser.h 2022-09-26 23:00:34.000000000 +0200 +++ new/GPXSee-11.6/src/data/kmlparser.h 2022-10-08 19:39:15.000000000 +0200 @@ -34,14 +34,16 @@ QVector<Waypoint> &waypoints); void folder(const Ctx &ctx, QList<TrackData> &tracks, QList<Area> &areas, QVector<Waypoint> &waypoints, PointStyleMap &pointStyles, - PolygonStyleMap &polyStyles, LineStyleMap &lineStyles); + PolygonStyleMap &polyStyles, LineStyleMap &lineStyles, + QMap<QString, QString> &map); void placemark(const Ctx &ctx, QList<TrackData> &tracks, QList<Area> &areas, QVector<Waypoint> &waypoints, PointStyleMap &pointStyles, - PolygonStyleMap &polyStyles, LineStyleMap &lineStyles); + PolygonStyleMap &polyStyles, LineStyleMap &lineStyles, + QMap<QString, QString> &map); void multiGeometry(QList<TrackData> &tracks, QList<Area> &areas, QVector<Waypoint> &waypoints); void photoOverlay(const Ctx &ctx, QVector<Waypoint> &waypoints, - PointStyleMap &pointStyles); + PointStyleMap &pointStyles, QMap<QString, QString> &map); void track(SegmentData &segment); void multiTrack(TrackData &t); void lineString(SegmentData &segment); @@ -68,10 +70,8 @@ QString styleUrl(); void style(const QDir &dir, PointStyleMap &pointStyles, PolygonStyleMap &polyStyles, LineStyleMap &lineStyles); - void styleMapPair(const QString &id, PointStyleMap &pointStyles, - PolygonStyleMap &polyStyles, LineStyleMap &lineStyles); - void styleMap(PointStyleMap &pointStyles, PolygonStyleMap &polyStyles, - LineStyleMap &lineStyles); + void styleMapPair(const QString &id, QMap<QString, QString> &map); + void styleMap(QMap<QString, QString> &map); void iconStyle(const QDir &dir, const QString &id, PointStyleMap &style); void polyStyle(const QString &id, PolygonStyleMap &styles); void lineStyle(const QString &id, LineStyleMap &styles); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-11.5/src/data/style.h new/GPXSee-11.6/src/data/style.h --- old/GPXSee-11.5/src/data/style.h 2022-09-26 23:00:34.000000000 +0200 +++ new/GPXSee-11.6/src/data/style.h 2022-10-08 19:39:15.000000000 +0200 @@ -44,16 +44,19 @@ class LineStyle { public: - LineStyle() : _width(-1) {} - LineStyle(const QColor &color, qreal width = -1) - : _color(color), _width(width) {} + LineStyle() : _width(-1), _style(Qt::NoPen) {} + LineStyle(const QColor &color, qreal width = -1, + Qt::PenStyle style = Qt::NoPen) + : _color(color), _width(width), _style(style) {} const QColor &color() const {return _color;} qreal width() const {return _width;} + Qt::PenStyle style() const {return _style;} private: QColor _color; qreal _width; + Qt::PenStyle _style; }; #endif // STYLE_H ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.p8x1ap/_old 2022-10-11 18:05:01.778034353 +0200 +++ /var/tmp/diff_new_pack.p8x1ap/_new 2022-10-11 18:05:01.782034360 +0200 @@ -1,5 +1,5 @@ pkgname=gpxsee -pkgver=11.5 +pkgver=11.6 pkgrel=1 pkgdesc='GPS log files visualizing and analyzing tool' arch=('i686' 'x86_64') ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.p8x1ap/_old 2022-10-11 18:05:01.806034398 +0200 +++ /var/tmp/diff_new_pack.p8x1ap/_new 2022-10-11 18:05:01.810034405 +0200 @@ -1,3 +1,11 @@ +gpxsee (11.6) stable; urgency=low + + * Fixed tracks/routes line style configuration (introduced in + 11.5). + * Fixed KML StyleMap handling. + + -- Martin Tuma <[email protected]> Mon, 10 Oct 2022 01:00:08 +0200 + gpxsee (11.5) stable; urgency=low * Added support for data styles. ++++++ gpxsee.dsc ++++++ --- /var/tmp/diff_new_pack.p8x1ap/_old 2022-10-11 18:05:01.866034495 +0200 +++ /var/tmp/diff_new_pack.p8x1ap/_new 2022-10-11 18:05:01.870034502 +0200 @@ -1,10 +1,10 @@ Format: 1.0 Source: gpxsee -Version: 11.5-1 +Version: 11.6-1 Binary: gpxsee Maintainer: Martin Tuma <[email protected]> Architecture: any Build-Depends: debhelper (>= 9), qtbase5-dev, qtbase5-private-dev, qtbase5-dev-tools, qt5-qmake, qttools5-dev-tools, libqt5opengl5-dev, qtpositioning5-dev, libqt5svg5-dev Files: - 00000000000000000000000000000000 0 GPXSee-11.5.tar.gz + 00000000000000000000000000000000 0 GPXSee-11.6.tar.gz
