gpsbabel-system-minizip.patch

   1 based on https://github.com/gpsbabel/gpsbabel/commit/8bf7ad22e5d4e6d3e365fd81a7f183978cdc2fe5
   2
   3 diff --git a/Makefile.in b/Makefile.in
   4 index 5b792f46f..1edc25e7e 100644
   5 --- a/Makefile.in
   6 +++ b/Makefile.in
   7 @@ -106,7 +114,7 @@ MINIZIP=zlib/contrib/minizip/zip.o \
   8  ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \
   9         zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \
  10         zlib/uncompr.o zlib/gzlib.o zlib/gzclose.o zlib/gzread.o \
  11 -       zlib/gzwrite.o zlib/zutil.o $(MINIZIP)
  12 +       zlib/gzwrite.o zlib/zutil.o
  13
  14
  15  LIBOBJS = queue.o route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \
  16 @@ -117,7 +125,7 @@ LIBOBJS = queue.o route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \
  17           src/core/xmlstreamwriter.o \
  18           src/core/usasciicodec.o\
  19           src/core/ziparchive.o \
  20 -         $(GARMIN) $(JEEPS) $(FMTS) $(FILTERS) $(SHAPE) @ZLIB@
  21 +         $(GARMIN) $(JEEPS) $(FMTS) $(FILTERS) $(SHAPE) @ZLIB@ @MINIZIP@
  22  OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
  23
  24  DEPFILES = $(OBJS:.o=.d)
  25 diff --git a/config.h.in b/config.h.in
  26 index f669911cf..f553d8520 100644
  27 --- a/config.h.in
  28 +++ b/config.h.in
  29 @@ -21,6 +21,9 @@
  30  /* Define to 1 if you have the `m' library (-lm). */
  31  #undef HAVE_LIBM
  32
  33 +/* Define to 1 if you have the `minizip' library (-lminizip). */
  34 +#undef HAVE_LIBMINIZIP
  35 +
  36  /* Defined if you have libusb */
  37  #undef HAVE_LIBUSB
  38
  39 @@ -72,6 +75,9 @@
  40  /* 1 to enable as many formats as possible */
  41  #undef MAXIMAL_ENABLED
  42
  43 +/* 1 to inhibit our use of libminizip. */
  44 +#undef MINIZIP_INHIBITED
  45 +
  46  /* Define to the address where bug reports for this package should be sent. */
  47  #undef PACKAGE_BUGREPORT
  48
  49 diff --git a/configure.ac b/configure.ac
  50 index bfa5f6609..0a49f627a 100644
  51 --- a/configure.in
  52 +++ b/configure.in
  53 @@ -121,9 +121,29 @@ AS_CASE([$with_zlib], ["system"], [
  54         AC_MSG_RESULT(no)
  55         ;;
  56      *)         ZLIB="\$(ZLIB)"
  57 +       ZLIB_CPP="-I\$(srcdir)/zlib"
  58         AC_MSG_RESULT(using included version);;
  59    esac
  60
  61 +AC_SUBST(ZLIB_CPP)
  62 +AC_SUBST(ZLIB)
  63 +
  64 +AC_MSG_CHECKING([whether to support zlib's minizip])
  65 +AC_ARG_WITH([libminizip],
  66 +       [AS_HELP_STRING(
  67 +               [--with-libminizip=(included)|system|no],
  68 +               [])])
  69 +AS_CASE([$with_libminizip], ["system"], [
  70 +       AC_CHECK_LIB([minizip], [zipOpen64])
  71 +], ["no"], [
  72 +       AC_DEFINE(MINIZIP_INHIBITED, 1, [1 to inhibit our use of libminizip.])
  73 +       AC_MSG_RESULT([no])
  74 +], [
  75 +       MINIZIP="\$(MINIZIP)"
  76 +       AC_MSG_RESULT([using included version])
  77 +])
  78 +AC_SUBST(MINIZIP)
  79 +
  80  case "$target" in
  81      *-*-mingw32*)
  82         FILEINFO=fileinfo.o
  83 @@ -265,7 +284,6 @@ AC_SUBST(USB_LIBS)
  84  AC_SUBST(USB_CFLAGS)
  85  AC_SUBST(OSJEEPS)
  86  AC_SUBST(GBSER)
  87 -AC_SUBST(ZLIB)
  88
  89  dnl Linux HID support
  90  AS_CASE(["$target"], [*-linux-*], [
  91 @@ -336,7 +354,7 @@ AC_MSG_RESULT([$DOCDIR])
  92
  93  # 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])
  94  # set up HAVE_STDARG_H for zlib.
  95 -AC_CHECK_HEADERS([stdarg.h])
  96 +AC_CHECK_HEADERS([unistd.h stdarg.h])
  97
  98  # Checks for typedefs, structures, and compiler characteristics.
  99  # AC_C_CONST
 100 diff --git a/defs.h b/defs.h
 101 index ea2bc0ac5..98e025f16 100644
 102 --- a/defs.h
 103 +++ b/defs.h
 104 @@ -28,7 +28,7 @@
 105  #if HAVE_LIBZ
 106  #include <zlib.h>
 107  #elif !ZLIB_INHIBITED
 108 -#include "zlib/zlib.h"
 109 +#include "zlib.h"
 110  #endif
 111  #include "gbfile.h"
 112  #include "inifile.h"
 113 diff --git a/src/core/ziparchive.cc b/src/core/ziparchive.cc
 114 index d4b5dcacc..947444505 100644
 115 --- a/src/core/ziparchive.cc
 116 +++ b/src/core/ziparchive.cc
 117 @@ -23,7 +23,11 @@
 118
 119  #include "defs.h"
 120  #include "src/core/logging.h"
 121 +#ifdef HAVE_LIBMINIZIP
 122 +#include <minizip/zip.h>
 123 +#else
 124  #include "zlib/contrib/minizip/zip.h"
 125 +#endif
 126
 127  #include <QtCore/QFile>
 128  #include <QtCore/QDebug>
 129 diff --git a/src/core/ziparchive.h b/src/core/ziparchive.h
 130 index 0c9f8f27b..e91da17e2 100644
 131 --- a/src/core/ziparchive.h
 132 +++ b/src/core/ziparchive.h
 133 @@ -21,7 +21,12 @@
 134
 135  #include <QtCore/QString>
 136  #include <QtCore/QStringList>
 137 +#include "defs.h"
 138 +#ifdef HAVE_LIBMINIZIP
 139 +#include <minizip/zip.h>
 140 +#else
 141  #include "zlib/contrib/minizip/zip.h"
 142 +#endif
 143
 144  class  ZipArchive
 145  {