diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2011-02-04 19:11:56 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2011-02-04 20:10:03 +0100 |
| commit | 7ca9ec24edfdc1d0d2233a5732483f2cf9a488dd (patch) | |
| tree | f90f9d48cf8f60aa8aba03553c8b89655b44582a /recipes/navit/navit.inc | |
| parent | 30bac99e872297ac4ef5b69917b319dfa9b5077c (diff) | |
| download | openembedded-7ca9ec24edfdc1d0d2233a5732483f2cf9a488dd.tar.gz | |
navit: use .desktop and .png files from sources and remove those from OE repo
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/navit/navit.inc')
| -rw-r--r-- | recipes/navit/navit.inc | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc index bcc3ab2c6e..6164737fa9 100644 --- a/recipes/navit/navit.inc +++ b/recipes/navit/navit.inc @@ -46,14 +46,12 @@ SRC_URI += "file://navit.xml \ file://osd.xml \ file://speech.xml \ file://plugins.xml \ - file://navit.desktop \ - file://navit.png \ " #Second launcher for shr -SRC_URI_append_shr = "file://navitD.desktop \ - file://navitD.png \ - " +SRC_URI_append_shr = "file://navitD.png \ + file://navit.launcher.sh \ +" FILES_${PN} += "${libdir}/${PN}/*/*.so" FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug" @@ -78,9 +76,11 @@ do_configure_prepend() { do_install_append() { install -d ${D}${datadir}/applications/ - install -m 0644 ${WORKDIR}/navit.desktop ${D}${datadir}/applications/ + install -m 0644 ${S}/navit/xpm/desktop_icons/navit.desktop ${D}${datadir}/applications/ install -d ${D}${datadir}/pixmaps/ - install -m 0644 ${WORKDIR}/navit.png ${D}${datadir}/pixmaps/ + install -m 0644 ${S}/navit/xpm/desktop_icons/128x128/navit.png ${D}${datadir}/pixmaps/ + # fix QA issue + sed -i 's#Categories=GTK;Utility;Geography;#Categories=Graphics;#g' ${D}${datadir}/applications/navit.desktop rm ${D}${libdir}/${PN}/*/*.la @@ -94,7 +94,15 @@ do_install_append() { } do_install_append_shr() { - #Install second launcher for shr - install -m 0644 ${WORKDIR}/navitD.desktop ${D}${datadir}/applications/ - install -m 0644 ${WORKDIR}/navitD.png ${D}${datadir}/pixmaps/ + # Install second launcher for shr + install -m 0644 ${S}/navit/xpm/desktop_icons/navit.desktop ${D}${datadir}/applications/navitD.desktop + install -m 0644 ${WORKDIR}/navitD.png ${D}${datadir}/pixmaps/navitD.png + install -m 0755 ${WORKDIR}/navit.launcher.sh ${D}${bindir}/ + # Change .desktop files a bit + sed -i 's#Exec=navit#Exec=fsoraw -fr CPU,GPS -- navit.launcher.sh#g' ${D}${datadir}/applications/navit.desktop + sed -i 's#Exec=navit#Exec=fsoraw -fr CPU,GPS,Display -- navit.launcher.sh#g' ${D}${datadir}/applications/navitD.desktop + sed -i 's#Categories=GTK;Utility;Geography;#Categories=Graphics;#g' ${D}${datadir}/applications/navitD.desktop + sed -i 's#Comment=GPS Navigation#Comment=GPS Navigation Display blanking disabled#g' ${D}${datadir}/applications/navitD.desktop + sed -i 's#Icon=navit#Icon=navitD#g' ${D}${datadir}/applications/navitD.desktop + sed -i 's#Navit#NavitD#g' ${D}${datadir}/applications/navitD.desktop } |