[oe-commits] org.oe.dev gpsdrive_2.10pre4.bb : merge fixes from OE.dev

[xora commit]

gpsdrive_2.10pre4.bb : merge fixes from OE.dev

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: c7ad8aae4ac1e8684a06a273932bb8ef796d4a07
ViewMTN: http://monotone.openembedded.org/revision/info/c7ad8aae4ac1e8684a06a273932bb8ef796d4a07
Files:
1
packages/gpsdrive/gpsdrive_2.10pre4.bb
Diffs:

#
# mt diff -r530a9366f74fdd0c9c236ee99047f3ed625cf378 -rc7ad8aae4ac1e8684a06a273932bb8ef796d4a07
#
#
#
# patch "packages/gpsdrive/gpsdrive_2.10pre4.bb"
#  from [8019316f995c6928f922a1b2412b7393fe8599f3]
#    to [9e4cea32b63aa093d54c9b1039cfa8dd87790322]
#
============================================================
--- packages/gpsdrive/gpsdrive_2.10pre4.bb	8019316f995c6928f922a1b2412b7393fe8599f3
+++ packages/gpsdrive/gpsdrive_2.10pre4.bb	9e4cea32b63aa093d54c9b1039cfa8dd87790322
@@ -1,21 +1,16 @@
-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"
+require gpsdrive.inc
 
+DEPENDS += "libwww-perl-native libart-lgpl libxml2 cairo mysql"
+RDEPENDS_${PN} += "libwww-perl"
+
+PR = "r2"
+
 SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
            file://gpsdrive_2.10pre4.desktop \
            file://gpsdrive-remove-hardcoded-paths.patch;patch=1 \
            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
@@ -36,7 +31,3 @@ FILES_${PN}-doc = "${datadir}/man ${data
 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"