From 7475845b6e38dac34dde7297b1bb793897ed4f71 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Tue, 25 Dec 2007 06:25:26 +0000 Subject: roadmap: 2nd round of cleanup of (z)roadmap recipies * provide 1.0.12, 1.1.0, and 1.1.0_cvs for both gtk2 (roadmap-gtk2) and qt (zroadmap) * fix roadap-gtk2 packaging issue * config AGG=rgba32 for gtk2 (need testing for the correct AGG setting) * minor style fixes for zroadmap recipies --- packages/roadmap/files/qt/roadmap.desktop.patch | 16 -------- packages/roadmap/files/roadmap.desktop.patch | 16 ++++++++ .../roadmap/roadmap-gtk2-1.0.12/.mtn2git_empty | 0 .../roadmap-gtk2-1.0.12/roadgps.desktop.patch | 11 ++++++ packages/roadmap/roadmap-gtk2_1.0.12.bb | 44 +++++++++++++++++++++ packages/roadmap/roadmap-gtk2_1.1.0.bb | 46 ++++++++++++++++++++++ packages/roadmap/roadmap-gtk2_cvs.bb | 30 ++++++++------ .../roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch | 36 ----------------- packages/roadmap/zroadmap_1.0.12.bb | 9 ++++- packages/roadmap/zroadmap_1.1.0.bb | 13 ++++-- packages/roadmap/zroadmap_cvs.bb | 18 ++++----- 11 files changed, 161 insertions(+), 78 deletions(-) delete mode 100644 packages/roadmap/files/qt/roadmap.desktop.patch create mode 100644 packages/roadmap/files/roadmap.desktop.patch create mode 100644 packages/roadmap/roadmap-gtk2-1.0.12/.mtn2git_empty create mode 100644 packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch create mode 100644 packages/roadmap/roadmap-gtk2_1.0.12.bb create mode 100644 packages/roadmap/roadmap-gtk2_1.1.0.bb delete mode 100644 packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch (limited to 'packages/roadmap') diff --git a/packages/roadmap/files/qt/roadmap.desktop.patch b/packages/roadmap/files/qt/roadmap.desktop.patch deleted file mode 100644 index 98d5b06130..0000000000 --- a/packages/roadmap/files/qt/roadmap.desktop.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- src/roadmap.desktop.old 2007-12-08 23:15:45.000000000 -0600 -+++ src/roadmap.desktop 2007-12-08 23:17:48.000000000 -0600 -@@ -1,11 +1,8 @@ - [Desktop Entry] --Comment=RoadMap - Comment=Car Navigation System - Exec=roadmap --Icon=roadmap.png -+Icon=roadmap - Type=Application - Name=RoadMap - GenericName=Map Viewer --Categories=Application;Other;VectorGraphics;Graphics;Viewer;GTK; --FilePattern=*roadmap;*.rdm -- -+Categories=VectorGraphics;Graphics;Viewer;GTK; diff --git a/packages/roadmap/files/roadmap.desktop.patch b/packages/roadmap/files/roadmap.desktop.patch new file mode 100644 index 0000000000..98d5b06130 --- /dev/null +++ b/packages/roadmap/files/roadmap.desktop.patch @@ -0,0 +1,16 @@ +--- src/roadmap.desktop.old 2007-12-08 23:15:45.000000000 -0600 ++++ src/roadmap.desktop 2007-12-08 23:17:48.000000000 -0600 +@@ -1,11 +1,8 @@ + [Desktop Entry] +-Comment=RoadMap + Comment=Car Navigation System + Exec=roadmap +-Icon=roadmap.png ++Icon=roadmap + Type=Application + Name=RoadMap + GenericName=Map Viewer +-Categories=Application;Other;VectorGraphics;Graphics;Viewer;GTK; +-FilePattern=*roadmap;*.rdm +- ++Categories=VectorGraphics;Graphics;Viewer;GTK; diff --git a/packages/roadmap/roadmap-gtk2-1.0.12/.mtn2git_empty b/packages/roadmap/roadmap-gtk2-1.0.12/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch b/packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch new file mode 100644 index 0000000000..8f79b5503f --- /dev/null +++ b/packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch @@ -0,0 +1,11 @@ +--- src/qt/ipkg/zroadgps.desktop.old 2007-12-24 19:35:34.000000000 -0600 ++++ src/qt/ipkg/zroadgps.desktop 2007-12-24 19:37:12.000000000 -0600 +@@ -1,6 +1,7 @@ + [Desktop Entry] + Comment=RoadMap + Exec=roadgps +-Icon=zroadgps ++Icon=roadgps + Type=Application + Name=RoadMapGPS ++Categories=Graphics;Viewer;GTK; diff --git a/packages/roadmap/roadmap-gtk2_1.0.12.bb b/packages/roadmap/roadmap-gtk2_1.0.12.bb new file mode 100644 index 0000000000..e2ce5f2316 --- /dev/null +++ b/packages/roadmap/roadmap-gtk2_1.0.12.bb @@ -0,0 +1,44 @@ +require roadmap.inc + +DEPENDS = "gtk+" +PR = "r0" + +SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \ + file://roadmap.desktop.patch;patch=1 \ + file://roadgps.desktop.patch;patch=1 \ + http://www.roadmap.digitalomaha.net/maps-1.0.12/usdir.rdm.tgz \ + file://zroadgps.png " + +S = "${WORKDIR}/roadmap-${PV}/src" + +DESKTOP = "GTK2" +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 unix/libosroadmap.a + cd gtk2 && oe_runmake +} + +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 roadmap.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 qt/ipkg/zroadgps.desktop ${D}${datadir}/applications/roadgps.desktop + + install -m 0644 sprites schema preferences ${D}${datadir}/roadmap/ + install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ +} + +FILES_${PN} += "${datadir}/roadmap" + diff --git a/packages/roadmap/roadmap-gtk2_1.1.0.bb b/packages/roadmap/roadmap-gtk2_1.1.0.bb new file mode 100644 index 0000000000..f638cf1fdd --- /dev/null +++ b/packages/roadmap/roadmap-gtk2_1.1.0.bb @@ -0,0 +1,46 @@ +require roadmap.inc + +DEPENDS = "agg expat gtk+" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \ + file://cross.patch;patch=1;pnum=2 \ + file://roadmap.desktop.patch;patch=1 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ + file://zroadgps.png" + +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" + diff --git a/packages/roadmap/roadmap-gtk2_cvs.bb b/packages/roadmap/roadmap-gtk2_cvs.bb index 557c4a1096..2ece0de929 100644 --- a/packages/roadmap/roadmap-gtk2_cvs.bb +++ b/packages/roadmap/roadmap-gtk2_cvs.bb @@ -1,22 +1,26 @@ require roadmap.inc -DEPENDS = "expat gtk+" -PV = "1.0.12+cvs${SRCDATE}" -PR = "r1" +DEPENDS = "agg expat gtk+" +PV = "1.1.0+cvs${SRCDATE}" +PR = "r0" SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ file://cross.patch;patch=1;pnum=2 \ http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ - " + file://zroadgps.png" S = "${WORKDIR}/roadmap/src" -CFLAGS += " -I${S} " - +DESKTOP = "GTK2" +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 - oe_runmake gtk2 + 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() { @@ -25,11 +29,15 @@ do_install() { install -d ${D}${datadir}/pixmaps install -d ${D}${datadir}/roadmap - install -m 0755 gtk2/gtkroad* ${D}${bindir} + 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 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 sprites preferences ${D}${datadir}/roadmap/ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ } diff --git a/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch b/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch deleted file mode 100644 index 24fe1c9bdb..0000000000 --- a/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch +++ /dev/null @@ -1,36 +0,0 @@ - -# -# Signed off by Michael 'Mickey' Lauer -# - ---- src/qt/qt_main.cc~qt2-fixes-r1.patch -+++ src/qt/qt_main.cc -@@ -137,7 +137,7 @@ - switch (orientation[0]) { - case 't': - case 'T': break; -- -+#ifndef QWS - case 'b': - case 'B': moveDockWindow (toolBar, DockBottom); break; - -@@ -146,7 +146,7 @@ - - case 'r': - case 'R': moveDockWindow (toolBar, DockRight); break; -- -+#endif - default: roadmap_log (ROADMAP_FATAL, - "Invalid toolbar orientation %s", orientation); - } ---- src/qt/Makefile~qt2-fixes-r1.patch -+++ src/qt/Makefile -@@ -19,7 +19,7 @@ - - ifeq ($(DESKTOP),QPE) - CFLAGS += -I$(QTDIR)/include -DQWS -- LIBS += -lqte -lqpe -+ LIBS += -lqpe - INSTALLDIR=$(QTDIR) - endif - diff --git a/packages/roadmap/zroadmap_1.0.12.bb b/packages/roadmap/zroadmap_1.0.12.bb index 9a7b73d1a1..c7fc851d0d 100644 --- a/packages/roadmap/zroadmap_1.0.12.bb +++ b/packages/roadmap/zroadmap_1.0.12.bb @@ -4,8 +4,9 @@ PR = "r1" SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \ file://qt2-fixes.patch;pnum=2;patch=1 \ - http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ + http://www.roadmap.digitalomaha.net/maps-1.0.12/usdir.rdm.tgz \ file://zroadgps.png" + S = "${WORKDIR}/roadmap-${PV}/src" EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \ @@ -21,13 +22,17 @@ do_install() { install -d ${D}${palmtopdir}/bin install -d ${D}${palmtopdir}/apps/Applications install -d ${D}${palmtopdir}/pics + install -d ${D}${palmtopdir}/share/roadmap + install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png + install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/ - install -d ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ } diff --git a/packages/roadmap/zroadmap_1.1.0.bb b/packages/roadmap/zroadmap_1.1.0.bb index 42184ce62b..bafcc7c27d 100644 --- a/packages/roadmap/zroadmap_1.1.0.bb +++ b/packages/roadmap/zroadmap_1.1.0.bb @@ -1,7 +1,7 @@ require zroadmap.inc -DEPENDS += "expat" -PR = "r0" +DEPENDS = "expat" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \ file://cross.patch;patch=1;pnum=2 \ @@ -9,9 +9,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \ file://qt/qt_canvas.patch;patch=1 \ file://qt/qt_main.patch;patch=1 \ file://qt/roadmap_main.patch;patch=1 \ - file://qt/roadmap.desktop.patch;patch=1 \ + file://roadmap.desktop.patch;patch=1 \ http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \ file://zroadgps.png" + S = "${WORKDIR}/roadmap-${PV}/src" EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} POPT=NO \ @@ -29,12 +30,16 @@ do_install() { install -d ${D}${palmtopdir}/bin install -d ${D}${palmtopdir}/apps/Applications install -d ${D}${palmtopdir}/pics + install -d ${D}${palmtopdir}/share/roadmap + install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png + install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/ - install -d ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ } diff --git a/packages/roadmap/zroadmap_cvs.bb b/packages/roadmap/zroadmap_cvs.bb index 5b39faf071..cb81756041 100644 --- a/packages/roadmap/zroadmap_cvs.bb +++ b/packages/roadmap/zroadmap_cvs.bb @@ -1,19 +1,15 @@ require zroadmap.inc -DEPENDS += "expat" -SRCDATE = "20071212" -PV = "1.1.0+cvs-${SRCDATE}" -PR = "r0" +DEPENDS = "expat" +PV = "1.1.0+cvs${SRCDATE}" +PR = "r1" SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ file://cross.patch;patch=1;pnum=2 \ file://qt/qt2-fixes.patch;patch=1 \ - file://qt/qt_canvas.patch;patch=1 \ -#upstream file://qt/qt_main.patch;patch=1 \ - file://qt/roadmap_main.patch;patch=1 \ -#upstream file://qt/roadmap.desktop.patch;patch=1 \ http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \ file://zroadgps.png" + S = "${WORKDIR}/roadmap/src" EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \ @@ -31,12 +27,16 @@ do_install() { install -d ${D}${palmtopdir}/bin install -d ${D}${palmtopdir}/apps/Applications install -d ${D}${palmtopdir}/pics + install -d ${D}${palmtopdir}/share/roadmap + install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png + install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/ - install -d ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ } -- cgit v1.2.3