[gpsbabel] Add forgotten use-system-shapelib.patch

Hans Ulrich Niedermann ndim at fedoraproject.org
Tue Jan 11 19:32:17 UTC 2011


commit 42f48f1b2d90701503c18cfe17069ea182a80740
Author: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date:   Tue Jan 11 20:32:01 2011 +0100

    Add forgotten use-system-shapelib.patch

 gpsbabel-1.4.2-use-system-shapelib.patch |   74 ++++++++++++++++++++++++++++++
 1 files changed, 74 insertions(+), 0 deletions(-)
---
diff --git a/gpsbabel-1.4.2-use-system-shapelib.patch b/gpsbabel-1.4.2-use-system-shapelib.patch
new file mode 100644
index 0000000..58f2b05
--- /dev/null
+++ b/gpsbabel-1.4.2-use-system-shapelib.patch
@@ -0,0 +1,74 @@
+diff -ru gpsbabel-1.4.2/configure gpsbabel-1.4.2-shapelib/configure
+--- gpsbabel-1.4.2/configure	2010-10-10 21:04:52.000000000 +0200
++++ gpsbabel-1.4.2-shapelib/configure	2011-01-11 17:25:17.771847993 +0100
+@@ -4940,7 +4940,7 @@
+        { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+-ac_config_files="$ac_config_files Makefile gbversion.h gui/setup.iss gui/makelinuxdist.sh xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty"
++ac_config_files="$ac_config_files Makefile gbversion.h gui/setup.iss gui/makelinuxdist.sh xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -5504,7 +5504,6 @@
+     "tools/mkcapabilities") CONFIG_FILES="$CONFIG_FILES tools/mkcapabilities" ;;
+     "win32/gpsbabel.rc") CONFIG_FILES="$CONFIG_FILES win32/gpsbabel.rc" ;;
+     "jeeps/Makefile") CONFIG_FILES="$CONFIG_FILES jeeps/Makefile" ;;
+-    "shapelib/Makefile") CONFIG_FILES="$CONFIG_FILES shapelib/Makefile" ;;
+     "zlib/empty") CONFIG_FILES="$CONFIG_FILES zlib/empty" ;;
+ 
+   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+diff -ru gpsbabel-1.4.2/configure.in gpsbabel-1.4.2-shapelib/configure.in
+--- gpsbabel-1.4.2/configure.in	2010-10-10 21:04:52.000000000 +0200
++++ gpsbabel-1.4.2-shapelib/configure.in	2011-01-11 17:22:01.785437703 +0100
+@@ -421,6 +421,6 @@
+ else
+        AC_MSG_RESULT(no)
+ fi
+-AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss gui/makelinuxdist.sh xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty])
++AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss gui/makelinuxdist.sh xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty])
+ AC_OUTPUT
+ 
+diff -ru gpsbabel-1.4.2/Makefile.in gpsbabel-1.4.2-shapelib/Makefile.in
+--- gpsbabel-1.4.2/Makefile.in	2011-01-11 17:27:22.684760413 +0100
++++ gpsbabel-1.4.2-shapelib/Makefile.in	2011-01-11 17:24:31.275511027 +0100
+@@ -87,7 +87,7 @@
+ 
+ @PALM_DB_CMT at PALM_DB=pdbfile.o
+ 
+-SHAPE=shapelib/shpopen.o shapelib/dbfopen.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 \
+@@ -818,8 +818,7 @@
+ session.o: session.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
+   zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h
+ shape.o: shape.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
+-  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  shapelib/shapefil.h
++  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h
+ skyforce.o: skyforce.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
+   zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h strptime.h
+ skytraq.o: skytraq.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
+@@ -1092,8 +1091,6 @@
+   jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
+   jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
+   jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h
+-shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h config.h
+-shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h config.h
+ zlib/adler32.o: zlib/adler32.c zlib/zlib.h zlib/zconf.h
+ zlib/compress.o: zlib/compress.c zlib/zlib.h zlib/zconf.h
+ zlib/crc32.o: zlib/crc32.c zlib/zutil.h zlib/zlib.h zlib/zconf.h \
+diff -ru gpsbabel-1.4.2/shape.c gpsbabel-1.4.2-shapelib/shape.c
+--- gpsbabel-1.4.2/shape.c	2010-05-31 23:15:10.000000000 +0200
++++ gpsbabel-1.4.2-shapelib/shape.c	2011-01-11 17:26:19.521297747 +0100
+@@ -20,7 +20,7 @@
+ 
+  */
+ #include "defs.h"
+-#include "shapelib/shapefil.h"
++#include <libshp/shapefil.h>
+ 
+ #if SHAPELIB_ENABLED
+ static SHPHandle ihandle;


More information about the scm-commits mailing list