diff options
| author | Junqian Gordon Xu <xjqian@gmail.com> | 2008-05-13 16:55:52 +0000 |
|---|---|---|
| committer | Junqian Gordon Xu <xjqian@gmail.com> | 2008-05-13 16:55:52 +0000 |
| commit | 835267608c74569996f06057d52801c9cc841adb (patch) | |
| tree | 6ac274315a2f024f915e2e7a9c8d4135467eb9f3 /packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch | |
| parent | fc84e99b863d7d65abd8f0dfc4784e5999e9f0c8 (diff) | |
gpsdrive-2.10pre4: add missing bb and patches during merge conflict.
Diffstat (limited to 'packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch')
| -rw-r--r-- | packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch new file mode 100644 index 0000000000..c51c80931c --- /dev/null +++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch @@ -0,0 +1,18 @@ +Index: src/map_handler.c +=================================================================== +--- aa/src/map_handler.c (Revision 1699) ++++ aa/src/map_handler.c (Revision 1700) +@@ -660,9 +660,12 @@ + if (maploaded) + gdk_pixbuf_unref (image); + ++#ifdef MAPNIK + if ( !strcmp (filename,"mapnik") ) { + limage = gdk_pixbuf_new_from_data(get_mapnik_imagedata(), GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL); +- } else { ++ } else ++#endif ++ { + limage = gdk_pixbuf_new_from_file (filename, NULL); + if (limage == NULL) + { |