summaryrefslogtreecommitdiff
path: root/packages/openmoko-projects.merge/tangogps
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2008-03-20 06:21:19 +0000
committerGraeme Gregory <dp@xora.org.uk>2008-03-20 06:21:19 +0000
commit1008c8c2925767928b47d87b1e4b64004ea3d51b (patch)
tree82252a9ceacb07c076fa68c7afeb9636356d1264 /packages/openmoko-projects.merge/tangogps
parent2ac70b712f904c0cd5bad14711a6e92ffae2c157 (diff)
merge
Diffstat (limited to 'packages/openmoko-projects.merge/tangogps')
-rw-r--r--packages/openmoko-projects.merge/tangogps/.mtn2git_empty0
-rw-r--r--packages/openmoko-projects.merge/tangogps/global-config-h.patch30
2 files changed, 30 insertions, 0 deletions
diff --git a/packages/openmoko-projects.merge/tangogps/.mtn2git_empty b/packages/openmoko-projects.merge/tangogps/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko-projects.merge/tangogps/.mtn2git_empty
diff --git a/packages/openmoko-projects.merge/tangogps/global-config-h.patch b/packages/openmoko-projects.merge/tangogps/global-config-h.patch
new file mode 100644
index 0000000000..973710c942
--- /dev/null
+++ b/packages/openmoko-projects.merge/tangogps/global-config-h.patch
@@ -0,0 +1,30 @@
+Index: tangoGPS-0.7/src/globals.c
+===================================================================
+--- tangoGPS-0.7.orig/src/globals.c 2008-03-13 14:21:02.000000000 +0800
++++ tangoGPS-0.7/src/globals.c 2008-03-13 14:28:49.000000000 +0800
+@@ -3,11 +3,11 @@
+ * License GPLv2
+ ****************************************************************************/
+
++#include "globals.h"
++
+ #include <gtk/gtk.h>
+ #include <gps.h>
+
+-#include "globals.h"
+-
+ GdkPixmap *pixmap = NULL;
+ GtkWidget *window1 = NULL;
+ GtkWidget *window2 = NULL;
+Index: tangoGPS-0.7/src/globals.h
+===================================================================
+--- tangoGPS-0.7.orig/src/globals.h 2008-03-13 14:27:46.000000000 +0800
++++ tangoGPS-0.7/src/globals.h 2008-03-13 14:27:48.000000000 +0800
+@@ -1,3 +1,7 @@
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #include <gtk/gtk.h>
+ #include <gconf/gconf-client.h>
+