Hello community, here is the log from the commit of package gpsbabel for openSUSE:Factory checked in at 2016-07-03 12:27:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpsbabel (Old) and /work/SRC/openSUSE:Factory/.gpsbabel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpsbabel" Changes: -------- --- /work/SRC/openSUSE:Factory/gpsbabel/gpsbabel.changes 2016-06-07 23:48:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gpsbabel.new/gpsbabel.changes 2016-07-03 12:27:50.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Jun 30 13:04:44 UTC 2016 - [email protected] + +- Updated to 1.5.3 + * no changelog available +- refreshed 2 patches: + * 0002-gpsbabel-1.4-em-shapelib.patch + * 0006-Use-system-zlib.patch +- added patch: + * 0007-Use-system-minizip.patch + +------------------------------------------------------------------- Old: ---- gpsbabel-1.5.2.tar.gz New: ---- 0007-Use-system-minizip.patch gpsbabel-1.5.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpsbabel.spec ++++++ --- /var/tmp/diff_new_pack.pO1wPS/_old 2016-07-03 12:27:52.000000000 +0200 +++ /var/tmp/diff_new_pack.pO1wPS/_new 2016-07-03 12:27:52.000000000 +0200 @@ -18,7 +18,7 @@ %global translationdir %{_datadir}/qt5/translations Name: gpsbabel -Version: 1.5.2 +Version: 1.5.3 Release: 0 Summary: Converts GPS waypoint, route and track data from one format type to another License: GPL-2.0+ @@ -36,9 +36,12 @@ 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 BuildRequires: autoconf BuildRequires: libqt5-qtbase-devel BuildRequires: libusb-devel +BuildRequires: minizip-devel BuildRequires: pkgconfig BuildRequires: shapelib-devel BuildRequires: update-desktop-files @@ -70,8 +73,7 @@ %package gui Summary: Qt GUI interface for GPSBabel -Group: Applications/Engineering -# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"; +Group: Hardware/Other Requires: %{name} = %{version}-%{release} Requires(post): update-desktop-files Requires(postun): update-desktop-files @@ -87,6 +89,7 @@ %patch3 -p1 %patch4 -p1 %patch6 -p1 +%patch7 -p1 # Get rid of bundled zlib # configure --with-zlib=system is not enough, ++++++ 0002-gpsbabel-1.4.3-use-system-shapelib.patch ++++++ --- /var/tmp/diff_new_pack.pO1wPS/_old 2016-07-03 12:27:52.000000000 +0200 +++ /var/tmp/diff_new_pack.pO1wPS/_new 2016-07-03 12:27:52.000000000 +0200 @@ -11,10 +11,10 @@ shape.cc | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) -Index: gpsbabel-1.5.2/Makefile.in +Index: gpsbabel-1.5.3/Makefile.in =================================================================== ---- gpsbabel-1.5.2.orig/Makefile.in -+++ gpsbabel-1.5.2/Makefile.in +--- gpsbabel-1.5.3.orig/Makefile.in ++++ gpsbabel-1.5.3/Makefile.in @@ -100,7 +100,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 @@ -22,18 +22,18 @@ -SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o +SHAPE=-lshp - 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 \ -@@ -113,7 +113,7 @@ LIBOBJS = queue.o route.o waypt.o filter - inifile.o garmin_fs.o gbsleep.o units.o @GBSER@ gbser.o \ - gbfile.o parse.o session.o src/core/xmlstreamwriter.o \ - src/core/usasciicodec.o \ -- $(PALM_DB) $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS) -+ $(PALM_DB) $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS) + MINIZIP=zlib/contrib/minizip/zip.o \ + zlib/contrib/minizip/ioapi.o +@@ -119,7 +119,7 @@ LIBOBJS = queue.o route.o waypt.o filter + src/core/xmlstreamwriter.o \ + src/core/usasciicodec.o\ + src/core/ziparchive.o \ +- $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS) ++ $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS) OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@ DEPFILES = $(OBJS:.o=.d) -@@ -141,10 +141,10 @@ gui linux-gui mac-gui mac-gui-dmg msvc-b +@@ -148,10 +148,10 @@ toolinfo all: gpsbabel$(EXEEXT) gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@ @@ -46,7 +46,7 @@ Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \ gbversion.h.in gui/setup.iss.in -@@ -880,11 +880,7 @@ sbp.o: sbp.cc defs.h config.h queue.h zl +@@ -891,11 +891,7 @@ sbp.o: sbp.cc defs.h config.h queue.h zl 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 \ @@ -59,10 +59,10 @@ 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 \ -Index: gpsbabel-1.5.2/configure +Index: gpsbabel-1.5.3/configure =================================================================== ---- gpsbabel-1.5.2.orig/configure -+++ gpsbabel-1.5.2/configure +--- gpsbabel-1.5.3.orig/configure ++++ gpsbabel-1.5.3/configure @@ -5183,7 +5183,7 @@ done @@ -80,10 +80,10 @@ "zlib/empty") CONFIG_FILES="$CONFIG_FILES zlib/empty" ;; "gui/makelinuxdist.sh") CONFIG_FILES="$CONFIG_FILES gui/makelinuxdist.sh" ;; -Index: gpsbabel-1.5.2/configure.in +Index: gpsbabel-1.5.3/configure.in =================================================================== ---- gpsbabel-1.5.2.orig/configure.in -+++ gpsbabel-1.5.2/configure.in +--- gpsbabel-1.5.3.orig/configure.in ++++ gpsbabel-1.5.3/configure.in @@ -397,7 +397,7 @@ AC_SUBST(QT_INC_OPT) AC_SUBST(QT_SYSINC_OPT) AC_SUBST(QT_LIBS) @@ -93,10 +93,10 @@ AC_CONFIG_FILES([gui/makelinuxdist.sh], [chmod +x gui/makelinuxdist.sh]) AC_OUTPUT -Index: gpsbabel-1.5.2/shape.cc +Index: gpsbabel-1.5.3/shape.cc =================================================================== ---- gpsbabel-1.5.2.orig/shape.cc -+++ gpsbabel-1.5.2/shape.cc +--- gpsbabel-1.5.3.orig/shape.cc ++++ gpsbabel-1.5.3/shape.cc @@ -20,7 +20,7 @@ */ ++++++ 0006-Use-system-zlib.patch ++++++ --- /var/tmp/diff_new_pack.pO1wPS/_old 2016-07-03 12:27:52.000000000 +0200 +++ /var/tmp/diff_new_pack.pO1wPS/_new 2016-07-03 12:27:52.000000000 +0200 @@ -8,24 +8,24 @@ gbfile.cc | 5 + 2 files changed, 220 insertions(+), 245 deletions(-) -diff --git a/Makefile.in b/Makefile.in -index 751ec29..7276f85 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -102,10 +102,7 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \ - - SHAPE=-lshp +Index: gpsbabel-1.5.3/Makefile.in +=================================================================== +--- gpsbabel-1.5.3.orig/Makefile.in ++++ gpsbabel-1.5.3/Makefile.in +@@ -105,10 +105,7 @@ SHAPE=-lshp + MINIZIP=zlib/contrib/minizip/zip.o \ + zlib/contrib/minizip/ioapi.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 +- zlib/gzwrite.o zlib/zutil.o $(MINIZIP) +ZLIB=-lz + LIBOBJS = queue.o route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \ - csv_util.o strptime.o grtcirc.o util_crc.o xmlgeneric.o \ -@@ -418,93 +415,93 @@ cov-upload: FORCE - cov-upload +@@ -432,93 +429,93 @@ toolinfo: + -$(QMAKE) -v # Machine generated from here down. -alan.o: alan.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \ @@ -157,7 +157,7 @@ gbfile.h cet.h inifile.h session.h src/core/datetime.h cet_util.h \ grtcirc.h jeeps/gps.h jeeps/gpsport.h jeeps/gpsdevice.h \ jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \ -@@ -512,82 +509,82 @@ garmin.o: garmin.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ +@@ -526,82 +523,82 @@ garmin.o: garmin.cc defs.h config.h queu jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h \ jeeps/gpsserial.h garmin_tables.h garmin_fs.h garmin_device_xml.h garmin_device_xml.o: garmin_device_xml.cc defs.h config.h queue.h \ @@ -270,7 +270,7 @@ cet.h inifile.h session.h src/core/datetime.h cet_util.h garmin_fs.h \ jeeps/gps.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ -@@ -595,79 +592,79 @@ gpx.o: gpx.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \ +@@ -609,79 +606,79 @@ gpx.o: gpx.cc defs.h config.h queue.h zl jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h garmin_tables.h \ src/core/logging.h src/core/file.h src/core/xmlstreamwriter.h \ src/core/xmltag.h @@ -375,7 +375,7 @@ cet.h inifile.h session.h src/core/datetime.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ -@@ -675,89 +672,89 @@ jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h mac/libusb/usb.h \ +@@ -689,89 +686,89 @@ jeeps/gpslibusb.o: jeeps/gpslibusb.cc co jeeps/gpsproj.h jeeps/garminusb.h jeeps/gpsusbcommon.h \ jeeps/../garmin_device_xml.h jeeps/gpsmath.o: jeeps/gpsmath.cc jeeps/gps.h jeeps/../defs.h config.h \ @@ -484,7 +484,7 @@ mac/libusb/darwin.o: mac/libusb/darwin.c config.h mac/libusb/usbi.h \ mac/libusb/usb.h mac/libusb/error.h mac/libusb/descriptors.o: mac/libusb/descriptors.c mac/libusb/usbi.h \ -@@ -766,257 +763,230 @@ mac/libusb/error.o: mac/libusb/error.c mac/libusb/usb.h \ +@@ -780,257 +777,230 @@ mac/libusb/error.o: mac/libusb/error.c m mac/libusb/error.h mac/libusb/usb.o: mac/libusb/usb.c mac/libusb/usbi.h mac/libusb/usb.h \ mac/libusb/error.h @@ -843,10 +843,10 @@ + internal_styles.cc: mkstyle.sh $(srcdir)/style/*.style $(srcdir)/mkstyle.sh > internal_styles.cc || (rm -f internal_styles.cc ; exit 1) -diff --git a/gbfile.cc b/gbfile.cc -index 22fc16b..5c6d211 100644 ---- a/gbfile.cc -+++ b/gbfile.cc +Index: gpsbabel-1.5.3/gbfile.cc +=================================================================== +--- gpsbabel-1.5.3.orig/gbfile.cc ++++ gpsbabel-1.5.3/gbfile.cc @@ -21,6 +21,11 @@ */ @@ -859,6 +859,3 @@ #include "gbfile.h" #include "src/core/logging.h" --- -2.1.0 - ++++++ 0007-Use-system-minizip.patch ++++++ >From 504065f4b55e9817e4d09da8dc16067c512a7e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <[email protected]> Date: Sun, 3 Jan 2016 16:05:20 +0100 Subject: [PATCH 7/7] Use system minizip. --- Makefile.in | 5 ++--- src/core/ziparchive.cc | 2 +- src/core/ziparchive.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) Index: gpsbabel-1.5.3/Makefile.in =================================================================== --- gpsbabel-1.5.3.orig/Makefile.in +++ gpsbabel-1.5.3/Makefile.in @@ -102,8 +102,7 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \ SHAPE=-lshp -MINIZIP=zlib/contrib/minizip/zip.o \ - zlib/contrib/minizip/ioapi.o +MINIZIP=-lminizip ZLIB=-lz @@ -116,7 +115,7 @@ LIBOBJS = queue.o route.o waypt.o filter src/core/xmlstreamwriter.o \ src/core/usasciicodec.o\ src/core/ziparchive.o \ - $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS) + $(GARMIN) $(JEEPS) @ZLIB@ $(MINIZIP) $(FMTS) $(FILTERS) OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@ DEPFILES = $(OBJS:.o=.d) Index: gpsbabel-1.5.3/src/core/ziparchive.cc =================================================================== --- gpsbabel-1.5.3.orig/src/core/ziparchive.cc +++ gpsbabel-1.5.3/src/core/ziparchive.cc @@ -23,7 +23,7 @@ #include "defs.h" #include "src/core/logging.h" -#include "zlib/contrib/minizip/zip.h" +#include <minizip/zip.h> #include <QtCore/QFile> #include <QtCore/QDebug> Index: gpsbabel-1.5.3/src/core/ziparchive.h =================================================================== --- gpsbabel-1.5.3.orig/src/core/ziparchive.h +++ gpsbabel-1.5.3/src/core/ziparchive.h @@ -21,7 +21,7 @@ #include <QtCore/QString> #include <QtCore/QStringList> -#include "zlib/contrib/minizip/zip.h" +#include <minizip/zip.h> class ZipArchive { ++++++ gpsbabel-1.5.2.tar.gz -> gpsbabel-1.5.3.tar.gz ++++++ /work/SRC/openSUSE:Factory/gpsbabel/gpsbabel-1.5.2.tar.gz /work/SRC/openSUSE:Factory/.gpsbabel.new/gpsbabel-1.5.3.tar.gz differ: char 5, line 1
