navit: use .desktop and .png files from sources and remove those from OE repo

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

15 files changed, 29 insertions, 46 deletions

diff --git a/recipes/navit/files/navit.desktop b/recipes/navit/files/navit.desktop
deleted file mode 100644
index 05ecc1d4ee..0000000000
--- a/recipes/navit/files/navit.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Navit
-Comment=GPS Navigation
-Exec=navit
-Icon=navit
-Terminal=false
-Type=Application
-Categories=GTK;
-MimeType=text/x-vcard;
-StartupNotify=true
diff --git a/recipes/navit/files/navit.png b/recipes/navit/files/navit.png
deleted file mode 100644
index a23ba5ce03..0000000000
--- a/recipes/navit/files/navit.png
+++ /dev/null
diff --git a/recipes/navit/files/shr/navit.desktop b/recipes/navit/files/shr/navit.desktop
deleted file mode 100644
index 349a733dcc..0000000000
--- a/recipes/navit/files/shr/navit.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Navit
-Comment=GPS Navigation
-Exec=unset LC_ALL \\\&\\\& fsoraw -fr CPU,GPS -- navit
-Icon=navit
-Terminal=false
-Type=Application
-Categories=Utility;
-MimeType=text/x-vcard;
-StartupNotify=true
diff --git a/recipes/navit/files/shr/navit.png b/recipes/navit/files/shr/navit.png
deleted file mode 100644
index 76156d0334..0000000000
--- a/recipes/navit/files/shr/navit.png
+++ /dev/null
diff --git a/recipes/navit/files/shr/navitD.desktop b/recipes/navit/files/shr/navitD.desktop
deleted file mode 100644
index 109ecc7310..0000000000
--- a/recipes/navit/files/shr/navitD.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=NavitD
-Comment=GPS Navigation Display blanking disabled
-Exec=unset LC_ALL \\\&\\\& fsoraw -fr CPU,GPS,Display -- navit
-Icon=navitD
-Terminal=false
-Type=Application
-Categories=Utility;
-MimeType=text/x-vcard;
-StartupNotify=true
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
 }
diff --git a/recipes/navit/files/maps.xml b/recipes/navit/navit/maps.xml
index 6f59f20c39..6f59f20c39 100644
--- a/recipes/navit/files/maps.xml
+++ b/recipes/navit/navit/maps.xml
diff --git a/recipes/navit/files/navit.xml b/recipes/navit/navit/navit.xml
index 58c8c226f2..58c8c226f2 100644
--- a/recipes/navit/files/navit.xml
+++ b/recipes/navit/navit/navit.xml
diff --git a/recipes/navit/files/osd.xml b/recipes/navit/navit/osd.xml
index 2d0f9ffdf4..2d0f9ffdf4 100644
--- a/recipes/navit/files/osd.xml
+++ b/recipes/navit/navit/osd.xml
diff --git a/recipes/navit/files/plugins.xml b/recipes/navit/navit/plugins.xml
index 015b05517f..015b05517f 100644
--- a/recipes/navit/files/plugins.xml
+++ b/recipes/navit/navit/plugins.xml
diff --git a/recipes/navit/files/shr/navit.launcher b/recipes/navit/navit/shr/navit.launcher.sh
index f3e1b0a0fc..1f332b26e9 100644
--- a/recipes/navit/files/shr/navit.launcher
+++ b/recipes/navit/navit/shr/navit.launcher.sh
@@ -20,9 +20,14 @@
 # This can be worked around by doing
 # "echo 1 > /proc/sys/vm/overcommit_memory"
 
-# check if navit already running:
-pgrep '^navit$'
-not_running=$?
+# if we have procps installed check if navit already running:
+if test -e /usr/bin/pgrep; then
+  pgrep '^navit$'
+  not_running=$?
+else
+  # we assume it's not running
+  not_running=1
+fi
 
 if [ $not_running = 0 ]; then
         echo "navit already running !!"
@@ -46,12 +51,12 @@ else
 	                echo "Enabling low-mem workaround..."
 	                OLD=`cat /proc/sys/vm/overcommit_memory`
 	                echo 1 > /proc/sys/vm/overcommit_memory
-	                navit.real $*
+	                navit $*
 	                echo ${OLD} > /proc/sys/vm/overcommit_memory
 	                exit
 	        else
 	                echo "I need root-privs to enable the low-mem workaround!"
 	        fi
 	fi
-        navit.real $*
+        navit $*
 fi
diff --git a/recipes/navit/files/shr/navitD.png b/recipes/navit/navit/shr/navitD.png
index a23ba5ce03..a23ba5ce03 100644
--- a/recipes/navit/files/shr/navitD.png
+++ b/recipes/navit/navit/shr/navitD.png
diff --git a/recipes/navit/files/shr/osd.xml b/recipes/navit/navit/shr/osd.xml
index 789e1c9221..789e1c9221 100644
--- a/recipes/navit/files/shr/osd.xml
+++ b/recipes/navit/navit/shr/osd.xml
diff --git a/recipes/navit/files/speech.xml b/recipes/navit/navit/speech.xml
index 28c49906d9..28c49906d9 100644
--- a/recipes/navit/files/speech.xml
+++ b/recipes/navit/navit/speech.xml
diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb
index ba6d08eccc..3cc73f552d 100644
--- a/recipes/navit/navit_svn.bb
+++ b/recipes/navit/navit_svn.bb
@@ -2,7 +2,7 @@ require navit.inc
 
 SRCREV = "3931"
 PV = "0.1.99+svnr${SRCPV}"
-PR = "${INC_PR}.11"
+PR = "${INC_PR}.12"
 
 S = "${WORKDIR}/navit"
 SRC_URI += "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;proto=https "