Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gpsbabel for openSUSE:Factory checked in at 2021-06-29 22:42:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpsbabel (Old) and /work/SRC/openSUSE:Factory/.gpsbabel.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpsbabel" Tue Jun 29 22:42:50 2021 rev:35 rq:902700 version:1.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gpsbabel/gpsbabel.changes 2020-02-04 19:53:25.561324146 +0100 +++ /work/SRC/openSUSE:Factory/.gpsbabel.new.2625/gpsbabel.changes 2021-06-29 22:42:54.746846137 +0200 @@ -1,0 +2,28 @@ +Sun Jun 27 12:56:37 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Remove the unneeded QtWebKit build dependency. + +------------------------------------------------------------------- +Mon May 31 17:38:51 UTC 2021 - tom stevens <[email protected]> + +- Update to 1.7.0 +- Replace 0003-gpsbabel-1.4.3-gmapbase.patch with + 0003-gpsbabel-1.7.0-gmapbase.patch +- Added patches + * 0009-PR611-system-libs.patch + This adds configurability of libraries to the qmake build. + It is from upstream pull request 611. + * 0010-translations.patch + This allows gpsbabelfe to find the translation files. +- Obsolete patches + * 0002-gpsbabel-1.4.3-use-system-shapelib.patch + * 0006-Use-system-zlib.patch + * 0007-Use-system-minizip.patch + * 0008-Fix-QString-casting-build-failures.patch +- Update build system + * use qmake to build client. Upstream is dropping support for configure. +- Fix packging + * include missing translation files + * use correct version of pdf documentation + +------------------------------------------------------------------- @@ -291 +318,0 @@ - Old: ---- 0002-gpsbabel-1.4.3-use-system-shapelib.patch 0003-gpsbabel-1.4.3-gmapbase.patch 0006-Use-system-zlib.patch 0007-Use-system-minizip.patch 0008-Fix-QString-casting-build-failures.patch gpsbabel-1.5.0.pdf gpsbabel-1.5.4.tar.gz New: ---- 0003-gpsbabel-1.7.0-gmapbase.patch 0009-PR611-system-libs.patch 0010-translations.patch gpsbabel-1.7.0.pdf gpsbabel_1_7_0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpsbabel.spec ++++++ --- /var/tmp/diff_new_pack.rraVBM/_old 2021-06-29 22:42:55.946847721 +0200 +++ /var/tmp/diff_new_pack.rraVBM/_new 2021-06-29 22:42:55.950847726 +0200 @@ -1,7 +1,7 @@ # # spec file for package gpsbabel # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,43 +18,36 @@ %global translationdir %{_datadir}/qt5/translations Name: gpsbabel -Version: 1.5.4 +Version: 1.7.0 Release: 0 Summary: Converts GPS waypoint, route and track data from one format type to another License: GPL-2.0-or-later Group: Hardware/Other URL: http://www.gpsbabel.org/ -Source: %{name}-%{version}.tar.gz -Source1: http://www.gpsbabel.org/htmldoc-1.5.0/%{name}-1.5.0.pdf +Source: https://github.com/GPSBabel/gpsbabel/archive/refs/tags/%{name}_1_7_0.tar.gz +Source1: http://www.gpsbabel.org/htmldoc-%{version}/%{name}-%{version}.pdf Source2: %{name}.png Source21: style3.css -# Use system shapelib - not suitable for upstream in this form. -Patch2: 0002-gpsbabel-1.4.3-use-system-shapelib.patch # Pickup gmapbase.html from /usr/share/gpsbabel -Patch3: 0003-gpsbabel-1.4.3-gmapbase.patch +Patch3: 0003-gpsbabel-1.7.0-gmapbase.patch # No automatic phone home by default (RHBZ 668865) Patch4: 0004-gpsbabel-1.4.3-nosolicitation.patch -# Use system zlib -Patch6: 0006-Use-system-zlib.patch -# Use system minizip -Patch7: 0007-Use-system-minizip.patch -# Fix build failures due to implicit QString casting -Patch8: 0008-Fix-QString-casting-build-failures.patch -BuildRequires: autoconf +# Add qmake support for system libraries. +Patch9: 0009-PR611-system-libs.patch +# Pickup translations from /usr/share/qt5/translations +Patch10: 0010-translations.patch BuildRequires: libqt5-qtbase-devel -BuildRequires: libusb-devel -BuildRequires: minizip-devel +BuildRequires: libusb-1_0-devel BuildRequires: pkgconfig -BuildRequires: shapelib-devel BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Designer) BuildRequires: pkgconfig(Qt5Help) BuildRequires: pkgconfig(Qt5UiTools) +BuildRequires: pkgconfig(Qt5WebChannel) BuildRequires: pkgconfig(Qt5WebEngineWidgets) -BuildRequires: pkgconfig(Qt5WebKit) -BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(shapelib) BuildRequires: pkgconfig(zlib) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -80,42 +73,28 @@ Group: Hardware/Other Requires: %{name} = %{version}-%{release} Requires(post): update-desktop-files -Requires(postun): update-desktop-files +Requires(postun):update-desktop-files %description gui Qt GUI interface for GPSBabel %prep -%setup -q +%autosetup -p1 -n gpsbabel-gpsbabel_1_7_0 # Use system shapelib instead of bundled partial shapelib rm -rf shapelib -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 # Get rid of bundled zlib -# configure --with-zlib=system is not enough, -# building still accesses bundled zlib headers rm -rf zlib/* -touch zlib/empty.in cp -p %{SOURCE21} gpsbabel.org-style3.css -# Avoid calling autoconf from Makefile -touch -r configure.in configure Makefile.in - # Fixup categories for .desktop file sed -i \ -e 's:Utility;::g' \ gui/gpsbabel.desktop %build -export CXXFLAGS="%{optflags} -fPIC" -%configure\ - --with-zlib=system +%qmake5 PREFIX=%{_prefix} WITH_LIBUSB=system WITH_SHAPELIB=pkgconfig WITH_ZLIB=pkgconfig make %{?_smp_mflags} cp %{SOURCE1} %{name}.pdf @@ -131,11 +110,14 @@ make -C gui DESTDIR=%{buildroot} install -install -m 0755 -p gui/objects/gpsbabelfe-bin %{buildroot}/%{_bindir} +install -m 0755 -d %{buildroot}/%{_bindir} +install -m 0755 -p gpsbabel %{buildroot}/%{_bindir} +install -m 0755 -p gui/objects/gpsbabelfe %{buildroot}/%{_bindir} install -m 0755 -d %{buildroot}/%{_datadir}/%{name} install -m 0644 -p gui/gmapbase.html %{buildroot}/%{_datadir}/%{name}/ install -m 0755 -d %{buildroot}/%{translationdir} -install -m 0644 -p gui/gpsbabel*_*.qm %{buildroot}/%{translationdir}/ +install -m 0644 -p gui/gpsbabelfe_*.qm %{buildroot}/%{translationdir}/ +install -m 0644 -p gui/coretool/gpsbabel_*.qm %{buildroot}/%{translationdir}/ install -m 0755 -d %{buildroot}/%{_datadir}/applications install -m 0644 gui/gpsbabel.desktop %{buildroot}/%{_datadir}/applications @@ -155,9 +137,10 @@ %files %defattr(-,root,root) -%doc AUTHORS COPYING README* %{name}.pdf +%doc AUTHORS README* %{name}.pdf +%license COPYING %{_bindir}/gpsbabel -%{_bindir}/gpsbabelfe-bin +%{_bindir}/gpsbabelfe %{_datadir}/applications/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/* ++++++ 0003-gpsbabel-1.4.3-gmapbase.patch -> 0003-gpsbabel-1.7.0-gmapbase.patch ++++++ --- /work/SRC/openSUSE:Factory/gpsbabel/0003-gpsbabel-1.4.3-gmapbase.patch 2015-06-02 10:04:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gpsbabel.new.2625/0003-gpsbabel-1.7.0-gmapbase.patch 2021-06-29 22:42:54.650846010 +0200 @@ -1,38 +1,25 @@ -From 563b847b51bd225df3585b9740fa6f678fb2f26d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <[email protected]> -Date: Tue, 15 Apr 2014 05:20:16 +0200 -Subject: [PATCH 3/6] gpsbabel-1.4.3-gmapbase - - Pickup gmapbase.html from /usr/share/gpsbabel. ---- - gui/map.cc | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - diff --git a/gui/map.cc b/gui/map.cc -index 3284376..dc8cec8 100644 +index a55c752e..d8656c97 100644 --- a/gui/map.cc +++ b/gui/map.cc -@@ -34,6 +34,10 @@ +@@ -44,6 +44,10 @@ + #include <vector> #include "appname.h" - #include "dpencode.h" +#ifndef PKGDATADIR +#define PKGDATADIR "/usr/share/gpsbabel" +#endif + - //------------------------------------------------------------------------ - static QString stripDoubleQuotes(const QString s) { - QString out; -@@ -60,7 +64,8 @@ Map::Map(QWidget *parent, - connect(this,SIGNAL(loadFinished(bool)), - this,SLOT(loadFinishedX(bool))); - this->logTimeX("Start map constuctor"); + using std::string; + using std::vector; + +@@ -90,7 +94,8 @@ Map::Map(QWidget* parent, + connect(mclicker, SIGNAL(logTime(QString)), this, SLOT(logTime(QString))); + #endif + - QString baseFile = QApplication::applicationDirPath() + "/gmapbase.html"; + QString baseFile = PKGDATADIR; + baseFile += "/gmapbase.html"; if (!QFile(baseFile).exists()) { - QMessageBox::critical(0, appName, - tr("Missing \"gmapbase.html\" file. Check installation")); --- -2.1.0 - + QMessageBox::critical(nullptr, appName, + tr("Missing \"gmapbase.html\" file. Check installation")); ++++++ 0009-PR611-system-libs.patch ++++++ ++++ 714 lines (skipped) ++++++ 0010-translations.patch ++++++ diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc index 22b2b449..f0f1fde4 100644 --- a/gui/mainwindow.cc +++ b/gui/mainwindow.cc @@ -71,6 +71,10 @@ #include "version_mismatch.h" // for VersionMismatch +#ifndef DATADIR +#define DATADIR "/usr/share" +#endif + const int BabelData::noType_ = -1; const int BabelData::fileType_ = 0; @@ -219,8 +223,8 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) ui_.outputWindow->setReadOnly(true); - langPath_ = QApplication::applicationDirPath(); - langPath_.append("/translations/"); + langPath_ = DATADIR; + langPath_.append("/qt5/translations/"); // Start up in the current system language. loadLanguage(QLocale::system().name()); ++++++ gpsbabel-1.5.0.pdf -> gpsbabel-1.7.0.pdf ++++++ (binary differes)
