From b8b96a7fa303aa7c44268bd622cd1bce298a9b3b6cb2ee829901e48723863001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Thu, 23 May 2024 21:55:29 +0000 Subject: [PATCH] Accepting request 1176595 from home:tumic:GPXSee GPXSee 13.2 + switch to Qt6 OBS-URL: https://build.opensuse.org/request/show/1176595 OBS-URL: https://build.opensuse.org/package/show/graphics/gpxsee?expand=0&rev=258 --- GPXSee-13.19.tar.gz | 3 -- GPXSee-13.20.tar.gz | 3 ++ PKGBUILD | 12 +++--- debian.changelog | 9 ++++ gpxsee.changes | 10 +++++ gpxsee.dsc | 4 +- gpxsee.spec | 103 +++++++++++++++++++++----------------------- 7 files changed, 79 insertions(+), 65 deletions(-) delete mode 100644 GPXSee-13.19.tar.gz create mode 100644 GPXSee-13.20.tar.gz diff --git a/GPXSee-13.19.tar.gz b/GPXSee-13.19.tar.gz deleted file mode 100644 index 5c5a9ba..0000000 --- a/GPXSee-13.19.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e35d1bbc2b562969bb356cd6a5515f70696a870ac8255a590a55c15fc2f1f52a -size 5613645 diff --git a/GPXSee-13.20.tar.gz b/GPXSee-13.20.tar.gz new file mode 100644 index 0000000..fd2ba15 --- /dev/null +++ b/GPXSee-13.20.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f390d0d1ea360730915a2c8526b196b56a8ec68c2f6009f50e686428cb8ebb8e +size 5621055 diff --git a/PKGBUILD b/PKGBUILD index 6e9f432..8133926 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,20 +1,22 @@ pkgname=gpxsee -pkgver=13.19 +pkgver=13.20 pkgrel=1 pkgdesc='GPS log files visualizing and analyzing tool' arch=('i686' 'x86_64') url="http://www.gpxsee.org/" license=('GPL3') -depends=('qt5-base' 'qt5-imageformats' 'qt5-svg' 'qt5-location' 'qt5-svg' 'qt5-serialport') -makedepends=('qt5-tools') +depends=('qt6-imageformats' 'qt6-positioning' 'qt6-svg' + 'qt6-serialport' 'hicolor-icon-theme') +makedepends=('qt6-tools') +optdepends=('qtpbfimageplugin-qt6: Mapbox vector tiles (MVT) files support') provides=("${pkgname}=${pkgver}") source=("GPXSee-${pkgver}.tar.gz") sha256sums=('SKIP') build() { cd GPXSee-${pkgver} - lrelease gpxsee.pro - qmake PREFIX=/usr gpxsee.pro + /usr/lib/qt6/lrelease-pro gpxsee.pro + qmake6 PREFIX=/usr gpxsee.pro make } diff --git a/debian.changelog b/debian.changelog index 9f4302b..e6e14bb 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,12 @@ +gpxsee (13.20) stable; urgency=low + + * Improved hillshading rendering. + * Use the map DEM data for hillshading on IMG maps. + * Added support for TCX course points icons. + * Various DEM related fixes. + + -- Martin Tuma Wed, 22 May 2024 22:48:44 +0200 + gpxsee (13.19) stable; urgency=low * Added support for FIT course icons. diff --git a/gpxsee.changes b/gpxsee.changes index 4941a80..e5d08ff 100644 --- a/gpxsee.changes +++ b/gpxsee.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed May 22 22:43:05 CEST 2024 - tumic@cbox.cz + +- Update to version 13.20 + * Improved hillshading rendering. + * Use the map DEM data for hillshading on IMG maps. + * Added support for TCX course points icons. + * Various DEM related fixes. + * Switched to Qt6. + ------------------------------------------------------------------- Sat Apr 20 21:32:42 CEST 2024 - tumic@cbox.cz diff --git a/gpxsee.dsc b/gpxsee.dsc index 470b071..9ac796a 100644 --- a/gpxsee.dsc +++ b/gpxsee.dsc @@ -1,9 +1,9 @@ Format: 1.0 Source: gpxsee -Version: 13.19-1 +Version: 13.20-1 Binary: gpxsee Maintainer: Martin Tuma 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, libqt5serialport5-dev Files: - 00000000000000000000000000000000 0 GPXSee-13.19.tar.gz + 00000000000000000000000000000000 0 GPXSee-13.20.tar.gz diff --git a/gpxsee.spec b/gpxsee.spec index e07eaac..c205767 100644 --- a/gpxsee.spec +++ b/gpxsee.spec @@ -19,7 +19,7 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines Name: gpxsee -Version: 13.19 +Version: 13.20 Release: 1 Summary: GPS log file visualization and analysis tool License: GPL-3.0-only @@ -29,55 +29,52 @@ Source0: https://github.com/tumic0/GPXSee/archive/%{version}/GPXSee-%{ver BuildRequires: gcc-c++ BuildRequires: make -%if 0%{?centos_version} >= 800 -BuildRequires: gdb-headless -%endif -%if 0%{?fedora_version} || 0%{?centos_version} >= 800 -BuildRequires: qt5-qtbase -BuildRequires: qt5-qtbase-gui -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtbase-private-devel -BuildRequires: qt5-qtlocation-devel -BuildRequires: qt5-qtsvg-devel -BuildRequires: qt5-qtserialport-devel -BuildRequires: qt5-linguist -Recommends: qt5-qtimageformats -Recommends: qt5-qtpbfimageformat +%if 0%{?fedora_version} +BuildRequires: qt6-qtbase +BuildRequires: qt6-qtbase-gui +BuildRequires: qt6-qtbase-devel +BuildRequires: qt6-qtbase-private-devel +BuildRequires: qt6-qtlocation-devel +BuildRequires: qt6-qtsvg-devel +BuildRequires: qt6-qtserialport-devel +BuildRequires: qt6-linguist +Recommends: qt6-qtimageformats +Recommends: qt6-qtpbfimageformat %else %if 0%{?suse_version} -BuildRequires: libQt5Core-devel -BuildRequires: libQt5Concurrent-devel -BuildRequires: libQt5Gui-devel -BuildRequires: libQt5Gui-private-headers-devel -BuildRequires: libQt5Widgets-devel -BuildRequires: libQt5Network-devel -BuildRequires: libQt5PrintSupport-devel -BuildRequires: libQt5OpenGL-devel -BuildRequires: libQt5Sql-devel -BuildRequires: libQt5Svg-devel -BuildRequires: libQt5SerialPort-devel -BuildRequires: libqt5-qtlocation-devel -BuildRequires: libqt5-linguist -Recommends: libQt5Sql5-sqlite -Recommends: libqt5-qtimageformats -Recommends: libqt5-qtpbfimageformat +BuildRequires: qt6-core-devel +BuildRequires: qt6-concurrent-devel +BuildRequires: qt6-gui-devel +BuildRequires: qt6-gui-private-devel +BuildRequires: qt6-widgets-devel +BuildRequires: qt6-network-devel +BuildRequires: qt6-printsupport-devel +BuildRequires: qt6-openglwidgets-devel +BuildRequires: qt6-sql-devel +BuildRequires: qt6-svg-devel +BuildRequires: qt6-serialport-devel +BuildRequires: qt6-positioning-devel +BuildRequires: qt6-tools-linguist +Recommends: qt6-sql-sqlite +Recommends: qt6-imageformats +Recommends: qt6-qtpbfimageformat %else # Mageia -BuildRequires: libqt5core-devel -BuildRequires: libqt5gui-devel -BuildRequires: libqt5concurrent-devel -BuildRequires: libqt5widgets-devel -BuildRequires: libqt5network-devel -BuildRequires: libqt5printsupport-devel -BuildRequires: libqt5opengl-devel -BuildRequires: libqt5sql-devel -BuildRequires: libqt5svg-devel -BuildRequires: libqt5location-devel -BuildRequires: libqt5serialport-devel -BuildRequires: qttools5 -Recommends: qtimageformats5 -Recommends: libqt5-database-plugin-sqlite -Recommends: libqt5-qtpbfimageformat +BuildRequires: libqt6core-devel +BuildRequires: libqt6gui-devel +BuildRequires: libqt6concurrent-devel +BuildRequires: libqt6widgets-devel +BuildRequires: libqt6network-devel +BuildRequires: libqt6printsupport-devel +BuildRequires: libqt6openglwidgets-devel +BuildRequires: libqt6sql-devel +BuildRequires: libqt6svg-devel +BuildRequires: libqt6positioning-devel +BuildRequires: libqt6serialport-devel +BuildRequires: qttools6 +Recommends: qtimageformats6 +Recommends: libqt6-database-plugin-sqlite +Recommends: libqt6-qtpbfimageformat %endif %endif @@ -91,16 +88,11 @@ TomTom OV2&ITN, ONmove OMD/GHP and geotagged JPEG files. %build %if 0%{?suse_version} -lrelease-qt5 gpxsee.pro -%{qmake5} gpxsee.pro +lrelease6 gpxsee.pro +%{qmake6} gpxsee.pro %else -%if 0%{?fedora_version} || 0%{?centos_version} >= 800 -lrelease-qt5 gpxsee.pro -%{qmake_qt5} gpxsee.pro -%else -lrelease gpxsee.pro -%{qmake_qt5} gpxsee.pro -%endif +lrelease-qt6 gpxsee.pro +%{qmake_qt6} gpxsee.pro %endif make %{?_smp_mflags} @@ -148,6 +140,7 @@ fi %{_datadir}/%{name}/* %{_datadir}/applications/* %{_datadir}/metainfo/* +%{_datadir}/icons/hicolor %{_datadir}/icons/hicolor/* %{_datadir}/mime/packages/*