[oe-commits] org.oe.dev roadmap: fix zroadmap, unify with roadmap-gtk2.
xjqian commit
openembedded-commits at lists.openembedded.org
Sun Jan 13 05:01:50 UTC 2008
roadmap: fix zroadmap, unify with roadmap-gtk2.
* roadmap_path.patch: fix hard coded default config/map path
* not packing zroadgps icon/desktop as it can be launched in the roadmap (>1.1.0) program
Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: 69101672fb51bbd0ee154a122221e376599481cc
ViewMTN: http://monotone.openembedded.org/revision/info/69101672fb51bbd0ee154a122221e376599481cc
Files:
1
packages/roadmap/files/roadmap_path.patch
packages/roadmap/roadmap-gtk2.inc
packages/roadmap/roadmap-gtk2_1.1.0.bb
packages/roadmap/roadmap-gtk2_cvs.bb
packages/roadmap/roadmap.inc
packages/roadmap/zroadmap.inc
packages/roadmap/zroadmap_1.1.0.bb
packages/roadmap/zroadmap_cvs.bb
Diffs:
#
# mt diff -re487928e64a695ad063abe44cac31763dbb95e9c -r69101672fb51bbd0ee154a122221e376599481cc
#
#
#
# add_file "packages/roadmap/files/roadmap_path.patch"
# content [a9de0d93760921a56341d70da42a7b27da04fc34]
#
# patch "packages/roadmap/roadmap-gtk2.inc"
# from [fc58e3e70037346d52758067318eda8023e6b2be]
# to [2aa378d801945ff02bc3c939ba674715a280b763]
#
# patch "packages/roadmap/roadmap-gtk2_1.1.0.bb"
# from [bf65c63e6c550a015ebf7d3afe59f77c139cc5f3]
# to [28151fbdab1200d9c37c380e25f9bca4cbc1bbaf]
#
# patch "packages/roadmap/roadmap-gtk2_cvs.bb"
# from [2790f799a13355e4ee5e15d33a9b0c737fde2269]
# to [597e6c998d97edcfd8de17534c455b1476978cfa]
#
# patch "packages/roadmap/roadmap.inc"
# from [e3d443eff17119798c0c6deda17bf6ff8785c257]
# to [46055702ecd5e97c7f30231e54b7f3d929ea0fad]
#
# patch "packages/roadmap/zroadmap.inc"
# from [6f4897b3cbc5a817995412a0c649a7fffc71554b]
# to [5c038214b7769f0dee175ca4e846ccd293788c0e]
#
# patch "packages/roadmap/zroadmap_1.1.0.bb"
# from [deaa33e33e25e1c9b13a64473c53715a50f05d59]
# to [b82c031b85848b13832c100afaa5d30d59685dd4]
#
# patch "packages/roadmap/zroadmap_cvs.bb"
# from [910020856a214de2ce5b21692e857806378508b4]
# to [092c0da8140aa7558085ce631475d46da52b946f]
#
============================================================
--- packages/roadmap/files/roadmap_path.patch a9de0d93760921a56341d70da42a7b27da04fc34
+++ packages/roadmap/files/roadmap_path.patch a9de0d93760921a56341d70da42a7b27da04fc34
@@ -0,0 +1,57 @@
+--- src/unix/roadmap_path.c.old 2008-01-12 21:08:03.000000000 -0600
++++ src/unix/roadmap_path.c 2008-01-12 21:29:40.000000000 -0600
+@@ -93,23 +93,18 @@ static const char *RoadMapPathConfig[] =
+ "/opt/QtPalmtop/share/roadmap",
+ "/mnt/cf/QtPalmtop/share/roadmap",
+ "/mnt/card/QtPalmtop/share/roadmap",
+-#else
++#endif
+ /* This is for standard Unix configurations. */
+ "/etc/roadmap",
+ "/usr/local/share/roadmap",
+ "/usr/share/roadmap",
+-#endif
+ NULL
+ };
+ static const char *RoadMapPathConfigPreferred =
+ #ifdef ROADMAP_CONFIG_DIR
+ ROADMAP_CONFIG_DIR;
+ #else
+-#ifdef QWS
+- "/mnt/cf/QtPalmtop/share/roadmap";
+-#else
+- "/usr/local/share/roadmap";
+-#endif
++ "/usr/share/roadmap";
+ #endif
+
+
+@@ -123,7 +118,7 @@ static const char *RoadMapPathMaps[] = {
+ "/opt/QtPalmtop/share/roadmap/...",
+ "/mnt/cf/QtPalmtop/share/roadmap/...",
+ "/mnt/card/QtPalmtop/share/roadmap/...",
+-#else
++#endif
+ /* This is for standard Unix configurations. */
+ "&/maps/...",
+ "/var/lib/roadmap/...",
+@@ -134,19 +129,14 @@ static const char *RoadMapPathMaps[] = {
+ */
+ "/usr/local/share/roadmap/...",
+ "/usr/share/roadmap/...",
+-#endif
+ NULL
+ };
+ static const char *RoadMapPathMapsPreferred =
+ #ifdef ROADMAP_MAP_DIR
+ ROADMAP_MAP_DIR;
+ #else
+-#ifdef QWS
+- "/mnt/cf/QtPalmtop/share/roadmap";
+-#else
+ "/var/lib/roadmap";
+ #endif
+-#endif
+
+ /* The default path for the icon files (the "icons" path): */
+ static const char *RoadMapPathIcons[] = {
============================================================
--- packages/roadmap/roadmap-gtk2.inc fc58e3e70037346d52758067318eda8023e6b2be
+++ packages/roadmap/roadmap-gtk2.inc 2aa378d801945ff02bc3c939ba674715a280b763
@@ -1,24 +1,11 @@ SECTION = "x11/applications"
require roadmap.inc
SECTION = "x11/applications"
-DEPENDS = "agg expat gtk+"
+DEPENDS += "agg gtk+"
-EXTRA_OEMAKE= "DESKTOP=GTK2 AGG=rgb565 \
- POPT=NO SCRIPTS= BUILD= \
- INSTALLDIR=/usr DESTDIR=${D}"
+EXTRA_OEMAKE = "DESKTOP=GTK2 AGG=rgb565 \
+ POPT=NO SCRIPTS= BUILD= INSTALLDIR=/usr DESTDIR=${D} \
+ desktopdir=${D}${datadir}/applications"
CFLAGS += " -I${STAGING_INCDIR}/agg2 "
-
-do_compile() {
- oe_runmake runtime $(TOOLS) icons
-}
-
-do_install() {
- oe_runmake install
- mv ${D}/usr/applications ${D}/usr/share/
-
- install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
-}
-
-FILES_${PN} += "${datadir}/roadmap"
============================================================
--- packages/roadmap/roadmap-gtk2_1.1.0.bb bf65c63e6c550a015ebf7d3afe59f77c139cc5f3
+++ packages/roadmap/roadmap-gtk2_1.1.0.bb 28151fbdab1200d9c37c380e25f9bca4cbc1bbaf
@@ -1,10 +1,11 @@ require roadmap-gtk2.inc
require roadmap-gtk2.inc
-PR = "r1"
+PR = "r2"
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_path.patch;patch=1 \
file://roadmap.desktop.patch;patch=1 \
http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz "
============================================================
--- packages/roadmap/roadmap-gtk2_cvs.bb 2790f799a13355e4ee5e15d33a9b0c737fde2269
+++ packages/roadmap/roadmap-gtk2_cvs.bb 597e6c998d97edcfd8de17534c455b1476978cfa
@@ -1,11 +1,12 @@ PV = "0.0+cvs${SRCDATE}"
require roadmap-gtk2.inc
PV = "0.0+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
file://cross.patch;patch=1;pnum=2 \
file://options.mk.patch;patch=1;pnum=2 \
+ file://roadmap_path.patch;patch=1 \
http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz "
S = "${WORKDIR}/roadmap/src"
============================================================
--- packages/roadmap/roadmap.inc e3d443eff17119798c0c6deda17bf6ff8785c257
+++ packages/roadmap/roadmap.inc 46055702ecd5e97c7f30231e54b7f3d929ea0fad
@@ -1,8 +1,18 @@ RRECOMMENDS = "gpsd flite"
DESCRIPTION = "RoadMap is a program that provides car navigation for Linux and UNIX."
PRIORITY = "optional"
AUTHOR = "Pascal Martin <pascal.martin at iname.com>"
HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
LICENSE = "GPL"
RRECOMMENDS = "gpsd flite"
+DEPENDS = "expat"
+FILES_${PN} += "${datadir}/roadmap"
+
+do_compile() {
+ oe_runmake runtime ${TOOLS} icons
+}
+
+do_install() {
+ oe_runmake install
+ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
+}
-PARALLEL_MAKE = ""
============================================================
--- packages/roadmap/zroadmap.inc 6f4897b3cbc5a817995412a0c649a7fffc71554b
+++ packages/roadmap/zroadmap.inc 5c038214b7769f0dee175ca4e846ccd293788c0e
@@ -1,5 +1,7 @@ require roadmap.inc
require roadmap.inc
+PARALLEL_MAKE = ""
+
SECTION = "opie/applications"
inherit palmtop
@@ -7,7 +9,15 @@ QT_LIBRARY_append_c7x0 = " -laticore"
QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
QT_LIBRARY_append_c7x0 = " -laticore"
+EXTRA_OEMAKE = "DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \
+ POPT=NO SCRIPTS= BUILD= INSTALLDIR=/usr DESTDIR=${D} \
+ icondir=${D}${palmtopdir}/pics \
+ desktopdir=${D}${palmtopdir}/apps/Applications \
+ CFLAGS="-DQWS -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \
+ LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}""
+
do_configure() {
echo removing pregenerated stuff
find . -name "moc*"|xargs rm -f
}
+
============================================================
--- packages/roadmap/zroadmap_1.1.0.bb deaa33e33e25e1c9b13a64473c53715a50f05d59
+++ packages/roadmap/zroadmap_1.1.0.bb b82c031b85848b13832c100afaa5d30d59685dd4
@@ -1,45 +1,16 @@ require zroadmap.inc
require zroadmap.inc
-DEPENDS = "expat"
-PR = "r1"
+PR = "r2"
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://qt/qt2-fixes.patch;patch=1 \
file://qt/qt_canvas.patch;patch=1 \
file://qt/qt_main.patch;patch=1 \
file://qt/roadmap_main.patch;patch=1 \
+ file://roadmap_path.patch;patch=1 \
file://roadmap.desktop.patch;patch=1 \
- http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \
- file://zroadgps.png"
+ http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz"
S = "${WORKDIR}/roadmap-${PV}/src"
-
-EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} POPT=NO \
- CFLAGS="-DQWS -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \
- LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" '
-
-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 qt qtroadmap qtroadgps
-}
-
-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 -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/
- install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
-}
============================================================
--- packages/roadmap/zroadmap_cvs.bb 910020856a214de2ce5b21692e857806378508b4
+++ packages/roadmap/zroadmap_cvs.bb 092c0da8140aa7558085ce631475d46da52b946f
@@ -1,42 +1,13 @@ require zroadmap.inc
require zroadmap.inc
-DEPENDS = "expat"
-PV = "1.1.0+cvs${SRCDATE}"
-PR = "r1"
+PV = "0.0+cvs${SRCDATE}"
+PR = "r0"
SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
file://cross.patch;patch=1;pnum=2 \
+ file://options.mk.patch;patch=1;pnum=2 \
file://qt/qt2-fixes.patch;patch=1 \
- http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \
- file://zroadgps.png"
+ file://roadmap_path.patch;patch=1 \
+ http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz"
S = "${WORKDIR}/roadmap/src"
-
-EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \
- CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \
- LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" '
-
-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 qt qtroadmap qtroadgps
-}
-
-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 -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/
- install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
-}
More information about the Openembedded-commits
mailing list