[oe-commits] org.oe.dev roadmap: 2nd round of cleanup of (z)roadmap recipies
xjqian commit
openembedded-commits at lists.openembedded.org
Tue Dec 25 07:07:41 UTC 2007
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
Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: c49e5a72f39fede8bbb4e7a74071bb3f580f4430
ViewMTN: http://monotone.openembedded.org/revision/info/c49e5a72f39fede8bbb4e7a74071bb3f580f4430
Files:
1
packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch
packages/roadmap/files/qt/roadmap.desktop.patch
packages/roadmap/files/roadmap.desktop.patch
packages/roadmap/roadmap-gtk2_cvs.bb
packages/roadmap/roadmap-gtk2_1.1.0.bb
packages/roadmap/roadmap-gtk2-1.0.12
packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch
packages/roadmap/roadmap-gtk2_1.0.12.bb
packages/roadmap/zroadmap_1.0.12.bb
packages/roadmap/zroadmap_1.1.0.bb
packages/roadmap/zroadmap_cvs.bb
Diffs:
#
# mt diff -rf32605522aa72811201a38398025e862c488626d -rc49e5a72f39fede8bbb4e7a74071bb3f580f4430
#
#
#
# delete "packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch"
#
# rename "packages/roadmap/files/qt/roadmap.desktop.patch"
# to "packages/roadmap/files/roadmap.desktop.patch"
#
# rename "packages/roadmap/roadmap-gtk2_cvs.bb"
# to "packages/roadmap/roadmap-gtk2_1.1.0.bb"
#
# add_dir "packages/roadmap/roadmap-gtk2-1.0.12"
#
# add_file "packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch"
# content [72a4e83be42ae269c1a94a7d4b9bfcec143dc775]
#
# add_file "packages/roadmap/roadmap-gtk2_1.0.12.bb"
# content [5c5317b0388798186c0b355406eac18c0fc2ed8b]
#
# add_file "packages/roadmap/roadmap-gtk2_cvs.bb"
# content [511a10a8453ed27a0df812a48cdcba14f90788e9]
#
# patch "packages/roadmap/roadmap-gtk2_1.1.0.bb"
# from [3d494fe1e57842d791e68ad3ac1b63b1692305d6]
# to [2c80d0c130f7c15041a33dfcbc36486ffb5c6a6d]
#
# patch "packages/roadmap/zroadmap_1.0.12.bb"
# from [defdf4312079c65d41c8d23a255e656af962c476]
# to [c6606e496ddb94bd587b0dc254064d721c276aac]
#
# patch "packages/roadmap/zroadmap_1.1.0.bb"
# from [47050a07f10a909f16525fb375ad0bff60a3822e]
# to [deaa33e33e25e1c9b13a64473c53715a50f05d59]
#
# patch "packages/roadmap/zroadmap_cvs.bb"
# from [a3e925537e5fc4d227e62224726e06d610c448b3]
# to [910020856a214de2ce5b21692e857806378508b4]
#
============================================================
--- packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch 72a4e83be42ae269c1a94a7d4b9bfcec143dc775
+++ packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch 72a4e83be42ae269c1a94a7d4b9bfcec143dc775
@@ -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;
============================================================
--- packages/roadmap/roadmap-gtk2_1.0.12.bb 5c5317b0388798186c0b355406eac18c0fc2ed8b
+++ packages/roadmap/roadmap-gtk2_1.0.12.bb 5c5317b0388798186c0b355406eac18c0fc2ed8b
@@ -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"
+
============================================================
--- packages/roadmap/roadmap-gtk2_cvs.bb 511a10a8453ed27a0df812a48cdcba14f90788e9
+++ packages/roadmap/roadmap-gtk2_cvs.bb 511a10a8453ed27a0df812a48cdcba14f90788e9
@@ -0,0 +1,45 @@
+require roadmap.inc
+
+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"
+
+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 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"
+
============================================================
--- packages/roadmap/roadmap-gtk2_cvs.bb 3d494fe1e57842d791e68ad3ac1b63b1692305d6
+++ packages/roadmap/roadmap-gtk2_1.1.0.bb 2c80d0c130f7c15041a33dfcbc36486ffb5c6a6d
@@ -1,22 +1,27 @@ require roadmap.inc
require roadmap.inc
-DEPENDS = "expat gtk+"
-PV = "1.0.12+cvs${SRCDATE}"
-PR = "r1"
+DEPENDS = "agg expat gtk+"
+PR = "r0"
-SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
+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/src"
+S = "${WORKDIR}/roadmap-${PV}/src"
-CFLAGS += " -I${S} "
+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
- 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 +30,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 sprites preferences ${D}${datadir}/roadmap
+ 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/
}
============================================================
--- packages/roadmap/zroadmap_1.0.12.bb defdf4312079c65d41c8d23a255e656af962c476
+++ packages/roadmap/zroadmap_1.0.12.bb c6606e496ddb94bd587b0dc254064d721c276aac
@@ -1,11 +1,12 @@ SRC_URI = "http://www.roadmap.digitaloma
require zroadmap.inc
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/
}
============================================================
--- packages/roadmap/zroadmap_1.1.0.bb 47050a07f10a909f16525fb375ad0bff60a3822e
+++ packages/roadmap/zroadmap_1.1.0.bb deaa33e33e25e1c9b13a64473c53715a50f05d59
@@ -1,7 +1,7 @@ require zroadmap.inc
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
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/
}
============================================================
--- packages/roadmap/zroadmap_cvs.bb a3e925537e5fc4d227e62224726e06d610c448b3
+++ packages/roadmap/zroadmap_cvs.bb 910020856a214de2ce5b21692e857806378508b4
@@ -1,19 +1,15 @@ require zroadmap.inc
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/
}
More information about the Openembedded-commits
mailing list