[FOSS-GPS] osm-gps-map patches for FoxtrotGPS
Joshua Judson Rosen
rozzin at geekspace.com
Thu Dec 30 06:28:43 EST 2010
Joshua Judson Rosen <rozzin at geekspace.com> writes:
>
> John Stowers <john.stowers.lists at gmail.com> writes:
> > On Sat, 2010-12-25 at 09:30 -0500, Joshua Judson Rosen wrote:
> > > John Stowers <john.stowers.lists at gmail.com> writes:
> > > >
> > > > On Thu, 2010-11-04 at 12:48 -0400, Joshua Judson Rosen wrote:
> > > > >
> > > > > Did you have any thoughts on adding a `zoom offset' control
> > > > > to osm-gps-map?
> > > >
> > > > Sorry, I don't know what you mean by this, would you care to explain?
> > >
> > > Something like this:
> >
> > Thanks, applied. I remember talking about this with you previously.
>
> Thanks :)
>
> > Is there anything else you need from osm-gps-map, I am looking to do a
> > release this week.
>
> I think that's basically it, as far as I'm aware;
> attached are some patches that I've been applying locally
> to get osm-gps-map to build and run on Debian 5.0 (Lenny),
> in case anyone else wants them, but I'm not sure that I'd say
> any of them are particularly important fixes to have upstream--
> especially given that Squeeze/6.0 appears due soon.
Really attached, this time....
--
"Don't be afraid to ask (λf.((λx.xx) (λr.f(rr))))."
-------------- next part --------------
>From e41a8db3d3d34ae49b2d6e1f8562f96213293974 Mon Sep 17 00:00:00 2001
From: Joshua Judson Rosen <rozzin at geekspace.com>
Date: Tue, 28 Dec 2010 20:46:35 -0500
Subject: [PATCH] Define a gtk_widget_get_window() backward-compatibility macro.
---
src/private.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/private.h b/src/private.h
index 33c89f9..ca9328f 100644
--- a/src/private.h
+++ b/src/private.h
@@ -95,6 +95,7 @@ int g_strcmp0(const char *str1, const char *str2)
#define gtk_widget_get_has_window(widget) (!GTK_WIDGET_NO_WINDOW (widget))
#define gtk_widget_get_state(widget) ((widget)->state)
#define gtk_widget_get_visible(widget) (GTK_WIDGET_VISIBLE (widget))
+#define gtk_widget_get_window(widget) ((widget)->window)
#define gtk_widget_set_window(widget, _window) ((widget)->window = _window)
#endif /* GTK+ < 2.18.0 */
--
1.5.6.5
>From fb207c9b3237793da55c9345401617561c047231 Mon Sep 17 00:00:00 2001
From: Joshua Judson Rosen <rozzin at geekspace.com>
Date: Tue, 28 Dec 2010 21:01:03 -0500
Subject: [PATCH] Reduce GTK+ requirement from 2.14 to 2.12.
Note that gtk+ 2.12 doesn't understand the <requires> element in GtkBuilder files.
---
configure.ac | 2 +-
examples/mapviewer.ui | 1 -
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 74ec67a..7013545 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
# Library dependencies
PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.16])
-PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.14])
+PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.12])
PKG_CHECK_MODULES(CAIRO, [cairo >= 1.6])
# The mapviewer demo also calls g_thread_init, so it needs to link against
diff --git a/examples/mapviewer.ui b/examples/mapviewer.ui
index 2942104..165d279 100644
--- a/examples/mapviewer.ui
+++ b/examples/mapviewer.ui
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<interface>
- <requires lib="gtk+" version="2.14"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkWindow" id="window1">
<property name="default_width">400</property>
--
1.5.6.5
>From 89819ab3cd16c8f728b58669910142f3bb3d8a4e Mon Sep 17 00:00:00 2001
From: Joshua Judson Rosen <rozzin at geekspace.com>
Date: Tue, 28 Dec 2010 21:01:43 -0500
Subject: [PATCH] Reduce gtk-doc requirement from 1.12 to 1.10.
---
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7013545..a70419b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,7 @@ AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
LT_VERSION_INFO=2:1:0
AC_SUBST(LT_VERSION_INFO)
-GTK_DOC_CHECK([1.12])
+GTK_DOC_CHECK([1.10])
GOBJECT_INTROSPECTION_CHECK([0.6.7])
GNOME_COMPILE_WARNINGS([maximum])
GNOME_MAINTAINER_MODE_DEFINES
--
1.5.6.5
>From 4ec9ffe6661d443093e14b5ee49c31367fe10bc1 Mon Sep 17 00:00:00 2001
From: Joshua Judson Rosen <rozzin at geekspace.com>
Date: Tue, 28 Dec 2010 21:13:16 -0500
Subject: [PATCH] Reduce Autoconf requirement from 2.62 to 2.61.
---
configure.ac | 2 +-
python/configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index a70419b..c2131f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.62])
+AC_PREREQ([2.61])
AC_INIT([osm-gps-map],
[0.7.3],
[http://github.com/nzjrs/osm-gps-map/issues],
diff --git a/python/configure.ac b/python/configure.ac
index e51d70d..4f5f99d 100644
--- a/python/configure.ac
+++ b/python/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.62])
+AC_PREREQ([2.61])
AC_INIT([python-osmgpsmap],
[0.7.3],
[http://github.com/nzjrs/osm-gps-map/issues],
--
1.5.6.5
>From 66ffb01d6b82ec98889e75a712a6f47f5fe3e158 Mon Sep 17 00:00:00 2001
From: Joshua Judson Rosen <rozzin at geekspace.com>
Date: Wed, 29 Dec 2010 20:50:38 -0500
Subject: [PATCH] Python 2.5 requires *args and **kwargs to follow positional and keyword args.
---
examples/mapviewer.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/mapviewer.py b/examples/mapviewer.py
index ae23493..f47d7ed 100755
--- a/examples/mapviewer.py
+++ b/examples/mapviewer.py
@@ -229,9 +229,9 @@ Enter an repository URL to fetch map tiles from in the box below. Special metach
def cache_clicked(self, button):
bbox = self.osm.get_bbox()
self.osm.download_maps(
- *bbox,
zoom_start=self.osm.props.zoom,
- zoom_end=self.osm.props.max_zoom
+ zoom_end=self.osm.props.max_zoom,
+ *bbox
)
def map_clicked(self, osm, event):
--
1.5.6.5
More information about the FOSS-GPS
mailing list