From ab154a507cd0cabf84f4822026075f22b35906a4 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Thu, 10 Jan 2008 09:03:03 +0000
Subject: roadmap: fix roadmap-gtk2, drop 1.0.12. * fix roadmap-gtk2 build and
 packaging (use Makefile supplied by upstream) * fix building gtk2 with agg
 support   Courtesy of Joshua * drop 1.0.12: old (2002 map), not upwards
 compatible, buggy, messy to patch, *              not working originally and
 nobody uses it anyway. * TODO: fix packaging of zroadmap (same as above),
 further unification of recipies

---
 packages/roadmap/roadmap-gtk2_1.1.0.bb | 43 ++++------------------------------
 1 file changed, 4 insertions(+), 39 deletions(-)

(limited to 'packages/roadmap/roadmap-gtk2_1.1.0.bb')

diff --git a/packages/roadmap/roadmap-gtk2_1.1.0.bb b/packages/roadmap/roadmap-gtk2_1.1.0.bb
index f638cf1fdd..5855413cbe 100644
--- a/packages/roadmap/roadmap-gtk2_1.1.0.bb
+++ b/packages/roadmap/roadmap-gtk2_1.1.0.bb
@@ -1,46 +1,11 @@
-require roadmap.inc
+require roadmap-gtk2.inc
 
-DEPENDS = "agg expat gtk+"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \
            file://cross.patch;patch=1;pnum=2 \
+           file://options.mk.patch;patch=1;pnum=2 \
            file://roadmap.desktop.patch;patch=1 \
-	   http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
-           file://zroadgps.png"
+	   http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz "
 
 S = "${WORKDIR}/roadmap-${PV}/src"
-
-DESKTOP = "GTK2"
-POPT = "NO"
-AGG = "rgba32"
-CFLAGS += " -I${STAGING_INCDIR}/atk-1.0 -I${STAGING_INCDIR}/cairo  -I${STAGING_INCDIR}/pango-1.0 \
-            -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_INCDIR}/gtk-2.0 -I${STAGING_LIBDIR}/gtk-2.0/include -I${S} "
-
-do_compile() {
-        oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a
-        oe_runmake -C gpx libgpx.a
-        oe_runmake -C unix libosroadmap.a
-	oe_runmake -C gtk2 gtkroadmap gtkroadgps
-}
-
-do_install() {
-        install -d ${D}${bindir}
-        install -d ${D}${datadir}/applications
-        install -d ${D}${datadir}/pixmaps
-        install -d ${D}${datadir}/roadmap
-
-        install -m 0755 gtk2/gtkroadmap ${D}${bindir}/roadmap
-        install -m 0755 gtk2/gtkroadgps ${D}${bindir}/roadgps
-
-        install -m 0644 icons/*png ${D}${datadir}/pixmaps/
-        install -m 0644 ${WORKDIR}/zroadgps.png ${D}${datadir}/pixmaps/roadgps.png
-        
-        install -m 0644 roadmap.desktop ${D}${datadir}/applications/
-        
-        install -m 0644 sprites preferences ${D}${datadir}/roadmap/
-	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
-}
-
-FILES_${PN} += "${datadir}/roadmap"
-
-- 
cgit v1.2.3