---- gpsbabel-1.5.1/gui/map.cc.orig 2013-12-31 02:01:14.000000000 +0100
-+++ gpsbabel-1.5.1/gui/map.cc 2014-11-23 10:52:00.923720369 +0100
-@@ -60,7 +60,7 @@
- connect(this,SIGNAL(loadFinished(bool)),
- this,SLOT(loadFinishedX(bool)));
- this->logTimeX("Start map constuctor");
+diff -ruNp gpsbabel-1.6.0.orig/gui/map.cc gpsbabel-1.6.0/gui/map.cc
+--- gpsbabel-1.6.0.orig/gui/map.cc 2019-05-02 10:26:47.000000000 +0200
++++ gpsbabel-1.6.0/gui/map.cc 2019-08-06 03:14:24.165967852 +0200
+@@ -90,7 +90,7 @@ Map::Map(QWidget* parent,
+ connect(mclicker, SIGNAL(logTime(QString)), this, SLOT(logTime(QString)));
+ #endif
+
- QString baseFile = QApplication::applicationDirPath() + "/gmapbase.html";
+ QString baseFile = "/usr/share/gpsbabel/gmapbase.html";
if (!QFile(baseFile).exists()) {
- QMessageBox::critical(0, appName,
- tr("Missing \"gmapbase.html\" file. Check installation"));
+ QMessageBox::critical(nullptr, appName,
+ tr("Missing \"gmapbase.html\" file. Check installation"));
-diff -ruN gpsbabel-1.3.5/Makefile.in gpsbabel-1.3.5-new/Makefile.in
---- gpsbabel-1.3.5/Makefile.in 2008-04-26 06:49:34.000000000 -0400
-+++ gpsbabel-1.3.5-new/Makefile.in 2008-05-09 11:35:53.000000000 -0400
-@@ -130,7 +130,7 @@
- rm -f $(OBJS) gpsbabel gpsbabel.exe
+diff -ruNp gpsbabel-1.6.0.orig/Makefile.in gpsbabel-1.6.0/Makefile.in
+--- gpsbabel-1.6.0.orig/Makefile.in 2019-05-02 10:26:47.000000000 +0200
++++ gpsbabel-1.6.0/Makefile.in 2019-08-06 03:08:26.267616865 +0200
+@@ -181,7 +181,7 @@ clean:
+ $(srcdir)/test-all -W
- configure: configure.in
+ configure: configure.ac
- autoconf
+# autoconf
tag:
- cvs commit
+ # svn commit
---- gpsbabel-1.5.4/Makefile.in.orig 2018-11-01 11:49:25.061806677 +0100
-+++ gpsbabel-1.5.4/Makefile.in 2018-11-01 11:51:00.111159677 +0100
-@@ -119,7 +119,7 @@
+diff -ruNp gpsbabel-1.6.0.orig/Makefile.in gpsbabel-1.6.0/Makefile.in
+--- gpsbabel-1.6.0.orig/Makefile.in 2019-05-02 10:26:47.000000000 +0200
++++ gpsbabel-1.6.0/Makefile.in 2019-08-06 03:16:08.729486021 +0200
+@@ -121,7 +121,7 @@ LIBOBJS = route.o waypt.o filter_vecs.o
+ src/core/textstream.o \
+ src/core/usasciicodec.o \
src/core/xmlstreamwriter.o \
- src/core/usasciicodec.o\
- src/core/ziparchive.o \
- $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS)
+ $(GARMIN) $(JEEPS) $(FMTS) $(FILTERS) $(SHAPE) @ZLIB@
OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
+++ /dev/null
---- gpsbabel-gpsbabel_1_5_4/shape.cc~ 2018-12-12 10:42:31.597454151 +0100
-+++ gpsbabel-gpsbabel_1_5_4/shape.cc 2018-12-12 10:44:35.680635553 +0100
-@@ -20,7 +20,7 @@
-
- */
- #include "defs.h"
--#include <libshp/shapefil.h>
-+#include <shapefil.h>
- #include <stdlib.h>
-
- #if SHAPELIB_ENABLED
-based on https://github.com/gpsbabel/gpsbabel/commit/8bf7ad22e5d4e6d3e365fd81a7f183978cdc2fe5
-
-diff --git a/Makefile.in b/Makefile.in
-index 5b792f46f..1edc25e7e 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -106,7 +114,7 @@ MINIZIP=zlib/contrib/minizip/zip.o \
- ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \
- zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \
- zlib/uncompr.o zlib/gzlib.o zlib/gzclose.o zlib/gzread.o \
-- zlib/gzwrite.o zlib/zutil.o $(MINIZIP)
-+ zlib/gzwrite.o zlib/zutil.o
-
-
- LIBOBJS = queue.o route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \
-@@ -117,7 +125,7 @@ LIBOBJS = queue.o route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \
+diff -ruNp gpsbabel-1.6.0.orig/Makefile.in gpsbabel-1.6.0/Makefile.in
+--- gpsbabel-1.6.0.orig/Makefile.in 2019-05-02 10:26:47.000000000 +0200
++++ gpsbabel-1.6.0/Makefile.in 2019-08-06 03:31:17.476367571 +0200
+@@ -121,7 +121,7 @@ LIBOBJS = route.o waypt.o filter_vecs.o
+ src/core/textstream.o \
+ src/core/usasciicodec.o \
src/core/xmlstreamwriter.o \
- src/core/usasciicodec.o\
- src/core/ziparchive.o \
- $(GARMIN) $(JEEPS) $(FMTS) $(FILTERS) $(SHAPE) @ZLIB@
+ $(GARMIN) $(JEEPS) $(FMTS) $(FILTERS) $(SHAPE) @ZLIB@ @MINIZIP@
OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
DEPFILES = $(OBJS:.o=.d)
-diff --git a/config.h.in b/config.h.in
-index f669911cf..f553d8520 100644
---- a/config.h.in
-+++ b/config.h.in
+diff -ruNp gpsbabel-1.6.0.orig/config.h.in gpsbabel-1.6.0/config.h.in
+--- gpsbabel-1.6.0.orig/config.h.in 2019-05-02 10:26:47.000000000 +0200
++++ gpsbabel-1.6.0/config.h.in 2019-08-06 03:32:15.346105354 +0200
@@ -21,6 +21,9 @@
/* Define to 1 if you have the `m' library (-lm). */
#undef HAVE_LIBM
/* Defined if you have libusb */
#undef HAVE_LIBUSB
-@@ -72,6 +75,9 @@
+@@ -66,6 +69,9 @@
/* 1 to enable as many formats as possible */
#undef MAXIMAL_ENABLED
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
-diff --git a/configure.ac b/configure.ac
-index bfa5f6609..0a49f627a 100644
---- a/configure.in
-+++ b/configure.in
-@@ -121,9 +121,29 @@ AS_CASE([$with_zlib], ["system"], [
- AC_MSG_RESULT(no)
- ;;
- *) ZLIB="\$(ZLIB)"
-+ ZLIB_CPP="-I\$(srcdir)/zlib"
- AC_MSG_RESULT(using included version);;
- esac
+diff -ruNp gpsbabel-1.6.0.orig/configure.ac gpsbabel-1.6.0/configure.ac
+--- gpsbabel-1.6.0.orig/configure.ac 2019-05-02 10:26:47.000000000 +0200
++++ gpsbabel-1.6.0/configure.ac 2019-08-06 03:34:20.233539240 +0200
+@@ -128,6 +128,22 @@ AS_CASE([$with_zlib], ["system"], [
+ AC_SUBST(ZLIB_CPP)
+ AC_SUBST(ZLIB)
-+AC_SUBST(ZLIB_CPP)
-+AC_SUBST(ZLIB)
-+
+AC_MSG_CHECKING([whether to support zlib's minizip])
+AC_ARG_WITH([libminizip],
+ [AS_HELP_STRING(
+ AC_MSG_RESULT([using included version])
+])
+AC_SUBST(MINIZIP)
-+
- case "$target" in
- *-*-mingw32*)
++
+ AS_CASE(["$target"], [*-*-mingw32*], [
FILEINFO=fileinfo.o
-@@ -265,7 +284,6 @@ AC_SUBST(USB_LIBS)
- AC_SUBST(USB_CFLAGS)
- AC_SUBST(OSJEEPS)
- AC_SUBST(GBSER)
--AC_SUBST(ZLIB)
-
- dnl Linux HID support
- AS_CASE(["$target"], [*-linux-*], [
-@@ -336,7 +354,7 @@ AC_MSG_RESULT([$DOCDIR])
-
- # AC_CHECK_HEADERS([fcntl.h inttypes.h libintl.h limits.h malloc.h stddef.h stdint.h stdlib.h string.h strings.h sys/ioctl.h sys/time.h termios.h unistd.h])
- # set up HAVE_STDARG_H for zlib.
--AC_CHECK_HEADERS([stdarg.h])
-+AC_CHECK_HEADERS([unistd.h stdarg.h])
-
- # Checks for typedefs, structures, and compiler characteristics.
- # AC_C_CONST
-diff --git a/defs.h b/defs.h
-index ea2bc0ac5..98e025f16 100644
---- a/defs.h
-+++ b/defs.h
-@@ -28,7 +28,7 @@
- #if HAVE_LIBZ
- #include <zlib.h>
- #elif !ZLIB_INHIBITED
--#include "zlib/zlib.h"
-+#include "zlib.h"
- #endif
- #include "gbfile.h"
- #include "inifile.h"
-diff --git a/src/core/ziparchive.cc b/src/core/ziparchive.cc
-index d4b5dcacc..947444505 100644
---- a/src/core/ziparchive.cc
-+++ b/src/core/ziparchive.cc
-@@ -23,7 +23,11 @@
-
- #include "defs.h"
- #include "src/core/logging.h"
-+#ifdef HAVE_LIBMINIZIP
-+#include <minizip/zip.h>
-+#else
- #include "zlib/contrib/minizip/zip.h"
-+#endif
-
- #include <QtCore/QFile>
- #include <QtCore/QDebug>
-diff --git a/src/core/ziparchive.h b/src/core/ziparchive.h
-index 0c9f8f27b..e91da17e2 100644
---- a/src/core/ziparchive.h
-+++ b/src/core/ziparchive.h
-@@ -21,7 +21,12 @@
-
- #include <QtCore/QString>
- #include <QtCore/QStringList>
-+#include "defs.h"
-+#ifdef HAVE_LIBMINIZIP
-+#include <minizip/zip.h>
-+#else
- #include "zlib/contrib/minizip/zip.h"
-+#endif
-
- class ZipArchive
- {
+ AS_IF([test "$CC" = "gcc"], [
Summary: GPSBabel - convert GPS waypoint, route and track data
Summary(pl.UTF-8): GPSBabel - konwertowanie danych GPS: waypointów, tras i śladów
Name: gpsbabel
-Version: 1.5.4
-Release: 3
+Version: 1.6.0
+Release: 0.1
License: GPL v2+
Group: Applications/Engineering
# Source0Download via POST form at https://www.gpsbabel.org/download.html#downloading
# token=$(curl -s http://www.gpsbabel.org/download.html | sed -rne 's/.*gpsbabel-'$version'\.tar\.gz.*token.*value="([^"]+)".*/\1/p' | head -n1)
# curl -F "token=$token" -F "dl=gpsbabel-$version.tar.gz" http://www.gpsbabel.org/plan9.php -o gpsbabel-$version.tar.gz
Source0: https://github.com/gpsbabel/gpsbabel/archive/%{name}_%{fver}.tar.gz
-# Source0-md5: 0f2d422dbae82f939564cf8305a4654c
+# Source0-md5: accb9f923ebe1b2d2a00c67d0e1dc430
Source1: %{name}.desktop
Source2: %{name}.png
Patch0: %{name}-auto.patch
Patch1: use-system-shapelib.patch
Patch2: gmapbase.patch
Patch3: %{name}-link.patch
-Patch4: qt.patch
-Patch5: privacy.patch
-Patch6: %{name}-shapelib-shapefil-h-location.patch
-Patch7: %{name}-system-minizip.patch
+Patch4: privacy.patch
+Patch5: %{name}-system-minizip.patch
URL: http://www.gpsbabel.org/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
# Use system shapelib instead of bundled partial shapelib
mv shapelib{,.bundled}
%if %{with qt5}
install -d $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name},%{translationdir}}
-install -p gui/objects/gpsbabelfe-bin $RPM_BUILD_ROOT%{_bindir}
install -p gui/gpsbabel*_*.qm $RPM_BUILD_ROOT%{translationdir}
cp -p gui/gmapbase.html $RPM_BUILD_ROOT%{_datadir}/%{name}
#%find_lang %{name} --with-qt --all-name
# TODO: patch find lang
cat <<EOF > %{name}.lang
-%lang(de) %{translationdir}/gpsbabel_de.qm
-%lang(es) %{translationdir}/gpsbabel_es.qm
-%lang(fr) %{translationdir}/gpsbabel_fr.qm
-%lang(hu) %{translationdir}/gpsbabel_hu.qm
-%lang(it) %{translationdir}/gpsbabel_it.qm
%lang(de) %{translationdir}/gpsbabelfe_de.qm
%lang(es) %{translationdir}/gpsbabelfe_es.qm
%lang(fr) %{translationdir}/gpsbabelfe_fr.qm
%files gui -f %{name}.lang
%defattr(644,root,root,755)
%doc gui/{AUTHORS,README*,TODO}
-%attr(755,root,root) %{_bindir}/gpsbabelfe-bin
%{_desktopdir}/gpsbabel.desktop
%{_iconsdir}/hicolor/*/apps/gpsbabel.png
%dir %{_datadir}/%{name}
+++ /dev/null
---- gpsbabel-gpsbabel_1_5_4/tef_xml.cc.orig 2017-01-02 06:05:19.000000000 +0100
-+++ gpsbabel-gpsbabel_1_5_4/tef_xml.cc 2018-11-01 12:04:19.187883183 +0100
-@@ -72,11 +72,11 @@
- bool valid = false;
-
- foreach(QXmlStreamAttribute attr, *attrv) {
-- if (attr.name().compare("Comment", Qt::CaseInsensitive) == 0) {
-- if (attr.value().compare("TourExchangeFormat", Qt::CaseInsensitive) == 0) {
-+ if (attr.name().compare(QByteArrayLiteral("Comment"), Qt::CaseInsensitive) == 0) {
-+ if (attr.value().compare(QByteArrayLiteral("TourExchangeFormat"), Qt::CaseInsensitive) == 0) {
- valid = true;
- }
-- } else if (attr.name().compare("Version", Qt::CaseInsensitive) == 0) {
-+ } else if (attr.name().compare(QByteArrayLiteral("Version"), Qt::CaseInsensitive) == 0) {
- version = attr.value().toString().toDouble();
- }
- }
-@@ -95,9 +95,9 @@
- {
- route = route_head_alloc();
- foreach(QXmlStreamAttribute attr, *attrv) {
-- if (attr.name().compare("Name", Qt::CaseInsensitive) == 0) {
-+ if (attr.name().compare(QByteArrayLiteral("Name"), Qt::CaseInsensitive) == 0) {
- route->rte_name = attr.value().toString().trimmed();
-- } else if (attr.name().compare("Software", Qt::CaseInsensitive) == 0) {
-+ } else if (attr.name().compare(QByteArrayLiteral("Software"), Qt::CaseInsensitive) == 0) {
- route->rte_desc = attr.value().toString().trimmed();
- }
- }
-@@ -248,20 +248,20 @@
- QString attrstr = attr.value().toString();
- QByteArray attrtext = attrstr.toUtf8();
-
-- if (attr.name().compare("SegDescription", Qt::CaseInsensitive) == 0) {
-+ if (attr.name().compare(QByteArrayLiteral("SegDescription"), Qt::CaseInsensitive) == 0) {
- wpt_tmp->shortname = attrstr.trimmed();
-- } else if (attr.name().compare("PointDescription", Qt::CaseInsensitive) == 0) {
-+ } else if (attr.name().compare(QByteArrayLiteral("PointDescription"), Qt::CaseInsensitive) == 0) {
- wpt_tmp->description = attrstr.trimmed();
-- } else if (attr.name().compare("ViaStation", Qt::CaseInsensitive) == 0 &&
-- attr.value().compare("true", Qt::CaseInsensitive) == 0) {
-+ } else if (attr.name().compare(QByteArrayLiteral("ViaStation"), Qt::CaseInsensitive) == 0 &&
-+ attr.value().compare(QByteArrayLiteral("true"), Qt::CaseInsensitive) == 0) {
- wpt_tmp->wpt_flags.fmt_use = 1; /* only a flag */
-
- /* new in TEF V2 */
-- } else if (attr.name().compare("Instruction", Qt::CaseInsensitive) == 0) {
-+ } else if (attr.name().compare(QByteArrayLiteral("Instruction"), Qt::CaseInsensitive) == 0) {
- wpt_tmp->description = attrstr.trimmed();
-- } else if (attr.name().compare("Altitude", Qt::CaseInsensitive) == 0) {
-+ } else if (attr.name().compare(QByteArrayLiteral("Altitude"), Qt::CaseInsensitive) == 0) {
- wpt_tmp->altitude = attrstr.toDouble();
-- } else if (attr.name().compare("TimeStamp", Qt::CaseInsensitive) == 0) {
-+ } else if (attr.name().compare(QByteArrayLiteral("TimeStamp"), Qt::CaseInsensitive) == 0) {
- /* nothing for the moment */
- }
- }
-Use system shapelib - not suitable for upstream in this form.
-
---- gpsbabel-1.5.1/configure.in.orig 2014-11-23 10:08:03.673956695 +0100
-+++ gpsbabel-1.5.1/configure.in 2014-11-23 10:36:15.211127830 +0100
-@@ -340,7 +340,7 @@
- AC_SUBST(QT_SYSINC_OPT)
- AC_SUBST(QT_LIBS)
-
--AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty])
-+AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty])
- AC_CONFIG_FILES([gui/makelinuxdist.sh], [chmod +x gui/makelinuxdist.sh])
- AC_OUTPUT
-
---- gpsbabel-1.5.4/Makefile.in.orig 2018-11-01 11:23:12.597708780 +0100
-+++ gpsbabel-1.5.4/Makefile.in 2018-11-01 11:26:35.878954083 +0100
-@@ -100,7 +100,7 @@
+diff -ruNp gpsbabel-1.6.0.orig/Makefile.in gpsbabel-1.6.0/Makefile.in
+--- gpsbabel-1.6.0.orig/Makefile.in 2019-05-02 10:26:47.000000000 +0200
++++ gpsbabel-1.6.0/Makefile.in 2019-08-06 03:12:10.122585490 +0200
+@@ -105,7 +105,7 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \
# Extra modules in Jeeps that we don't use
# jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o
-SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o
+SHAPE=-lshp
- MINIZIP=zlib/contrib/minizip/zip.o \
- zlib/contrib/minizip/ioapi.o
-@@ -894,11 +894,7 @@
- session.o: session.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
- gbfile.h cet.h inifile.h session.h src/core/datetime.h
- shape.o: shape.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
-- gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+ ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \
+ zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \
+@@ -909,11 +909,7 @@ sbp.o: sbp.cc defs.h config.h zlib/zlib.
+ session.o: session.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \
+ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
+ shape.o: shape.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \
+- inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
- shapelib/shapefil.h
-shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h
-shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h
-shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h
-+ gbfile.h cet.h inifile.h session.h src/core/datetime.h
- skyforce.o: skyforce.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
- gbfile.h cet.h inifile.h session.h src/core/datetime.h
- skytraq.o: skytraq.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
---- gpsbabel-1.5.4/shape.cc.orig 2018-11-01 11:23:12.597708780 +0100
-+++ gpsbabel-1.5.4/shape.cc 2018-11-01 11:29:59.950436006 +0100
-@@ -20,7 +20,7 @@
++ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
+ skyforce.o: skyforce.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \
+ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
+ skytraq.o: skytraq.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \
+diff -ruNp gpsbabel-1.6.0.orig/shape.cc gpsbabel-1.6.0/shape.cc
+--- gpsbabel-1.6.0.orig/shape.cc 2019-05-02 10:26:47.000000000 +0200
++++ gpsbabel-1.6.0/shape.cc 2019-08-06 03:12:55.459376594 +0200
+@@ -25,7 +25,7 @@
+ #include <QtCore/QVector>
- */
#include "defs.h"
-#include "shapelib/shapefil.h"
-+#include <libshp/shapefil.h>
- #include <stdlib.h>
++#include <shapefil.h>
+ #include <cstdlib>
#if SHAPELIB_ENABLED
projects / packages / gpsbabel.git / commitdiff