From: robertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Thu, 21 Feb 2013 06:50:17 +0000 (+0000)
Subject: Turn back on new GPX writer.  With this change, it passes for me on Centos 6.3
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~11^2~640
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d2795c1c5f66fac91a5b5557fa3f2edbcf3eb172;p=gpsbabel.git

Turn back on new GPX writer.  With this change, it passes for me on Centos 6.3
running in a VM.

The new GPX writer isn't actually *done* yet, but it'll get done only by
suffering...Pain builds character.
---

diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in
index 701ef69d9..2a30c6b66 100644
--- a/gpsbabel/Makefile.in
+++ b/gpsbabel/Makefile.in
@@ -52,7 +52,7 @@ LRELEASE=@LRELEASE@
 #DEBUGGING=-g $(EXTRA_DEBUGGING)
 # add -DDEBUG_MEM to turn on memory allocation logging
 GBCFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) -I$(srcdir) -I$(QT_INC) \
-	$(OPTIMIZATION) -DHAVE_CONFIG_H @CFLAGS@ -DNEWTIME -DOLDGPX
+	$(OPTIMIZATION) -DHAVE_CONFIG_H @CFLAGS@ -DNEWTIME -UOLDGPX
 LDFLAGS=$(EXTRA_LDFLAGS) @LDFLAGS@
 PREFIX=@prefix@
 INSTALL_DIR=$(DESTDIR)/$(PREFIX)
diff --git a/gpsbabel/gpx.cc b/gpsbabel/gpx.cc
index 2188e843c..6b905f1ce 100644
--- a/gpsbabel/gpx.cc
+++ b/gpsbabel/gpx.cc
@@ -2235,6 +2235,12 @@ gpx_write(void)
   gbfprintf(ofd, "  creator=\"" CREATOR_NAME_URL "\"\n");
   gbfprintf(ofd, "  xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n");
 #else
+  // FIXME: This write of a blank line is needed for Qt 4.6 (as on Centos 6.3)
+  // to include just enough whitespace between <xml/> and <gpx...> to pass
+  // diff -w.  It's here for now to shim compatibility with our zillion 
+  // reference files, but this blank link can go away some day.
+  writer.writeCharacters("\n");
+
   writer.setAutoFormatting(true);
   writer.writeStartElement("gpx");
   writer.writeAttribute("\n  version", gpx_wversion);