merge of '0b604857bbf871639fdb43ee8380222e8ef64bb7'

     and 'f2611b9289af3945942b74edcc7ef91fb0a597bd'

2 files changed, 19 insertions, 9 deletions

diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
index 70af29dcad..96e8155861 100644
--- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
+++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
@@ -1,9 +1,10 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=GPSDrive
 Comment=GPS map software
 Exec=gpsdrive -M pda -1
+Icon=gpsicon
 Terminal=false
 Type=Application
-Icon=gpsicon
-Categories=Graphics;Network;Geography;
-StartupNotify=false
+Categories=Graphics;Network;Geography;Application;Other
+StartupNotify=true
diff --git a/packages/gpsdrive/gpsdrive_2.10pre4.bb b/packages/gpsdrive/gpsdrive_2.10pre4.bb
index 102a917c1f..071a5691e3 100644
--- a/packages/gpsdrive/gpsdrive_2.10pre4.bb
+++ b/packages/gpsdrive/gpsdrive_2.10pre4.bb
@@ -1,9 +1,10 @@
-require gpsdrive.inc
-
-DEPENDS += "libwww-perl-native libart-lgpl libxml2 cairo mysql"
-RDEPENDS_${PN} += "libwww-perl"
-
-PR = "r2"
+DESCRIPTION = "GPS navigation/map display software"
+SECTION = "x11"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "virtual/libc gtk+ libpcre gpsd libwww-perl-native mysql"
+RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd libwww-perl"
+PR = "r1"
 
 SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
            file://gpsdrive_2.10pre4.desktop \
@@ -11,6 +12,10 @@ SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
            file://gpsdrive-ifdef-mapnik.patch;patch=1 \
            file://gpsdrive-2.10pre4-openstreetmap-download.patch;patch=1"
 
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-garmin"
+
 do_install_append () {
         mkdir -p  ${D}${datadir}/applications
         install -m 0644 ${WORKDIR}/gpsdrive_2.10pre4.desktop ${D}${datadir}/applications/gpsdrive.desktop
@@ -31,3 +36,7 @@ FILES_${PN}-map-icons-classic = "${datadir}/map-icons/classic.small"
 FILES_${PN}-map-icons-other = "${datadir}/map-icons/classic.big ${datadir}/map-icons/japan ${datadir}/map-icons/nickw ${datadir}/map-icons/square.big ${datadir}/map-icons/square.small ${datadir}/map-icons/svg"
 FILES_${PN}-maps = "${datadir}/${PN}/maps ${datadir}/${PN}/map_koord.txt"
 FILES_${PN}-doc = "${datadir}/man ${datadir}/${PN}/Documentation"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+DEFAULT_PREFERENCE = "1"