diff options
Diffstat (limited to 'sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_zlib.patch')
| -rw-r--r-- | sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_zlib.patch | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_zlib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_zlib.patch new file mode 100644 index 000000000000..ce3591715492 --- /dev/null +++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_zlib.patch @@ -0,0 +1,80 @@ +--- a/configure.in 2017-01-21 03:17:05.480317203 +0100 ++++ b/configure.in 2017-01-21 03:26:53.743671224 +0100 +@@ -402,7 +402,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 zlib/empty]) ++AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile]) + AC_CONFIG_FILES([gui/makelinuxdist.sh], [chmod +x gui/makelinuxdist.sh]) + AC_OUTPUT + +--- a/Makefile.in 2017-01-21 03:17:05.530317828 +0100 ++++ b/Makefile.in 2017-01-21 03:32:19.447032690 +0100 +@@ -102,14 +102,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 $(MINIZIP) +- ++ZLIB=-lz -lminizip + + 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 \ +@@ -119,7 +112,7 @@ + src/core/xmlstreamwriter.o \ + src/core/usasciicodec.o\ + src/core/ziparchive.o \ +- $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS) ++ $(GARMIN) $(JEEPS) $(FMTS) $(FILTERS) + OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@ + + DEPFILES = $(OBJS:.o=.d) +@@ -148,10 +141,10 @@ + all: gpsbabel$(EXEEXT) + + gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@ +- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) $(ZLIB) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ + + gpsbabel-debug: $(OBJS) +- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) $(ZLIB) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ + + Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \ + gbversion.h.in gui/setup.iss.in +--- a/src/core/ziparchive.cc 2017-01-02 06:05:19.000000000 +0100 ++++ b/src/core/ziparchive.cc 2017-01-21 03:51:30.402421165 +0100 +@@ -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> +@@ -89,4 +89,4 @@ + return true; + } + return false; +-} +\ No newline at end of file ++} +--- a/src/core/ziparchive.h 2017-01-02 06:05:19.000000000 +0100 ++++ b/src/core/ziparchive.h 2017-01-21 03:51:05.931115241 +0100 +@@ -21,7 +21,7 @@ + + #include <QtCore/QString> + #include <QtCore/QStringList> +-#include "zlib/contrib/minizip/zip.h" ++#include <minizip/zip.h> + + class ZipArchive + { |