From 54ff4e3c9cf1941a359498e8d9413d8e68761c0c Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Thu, 13 Mar 2008 03:23:54 +0000 Subject: gpsdrive: fix pre4 dependency issues, clean up all versions, unify * bump pre4 to be the default version * TODO: pre4: remove mysql dependency and better packaging --- packages/gpsdrive/files/gpsdrive.desktop | 8 +++--- .../gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop | 7 ++--- packages/gpsdrive/gpsdrive-pda_2.10pre2.bb | 23 ++++++---------- packages/gpsdrive/gpsdrive.inc | 25 +++++++++++++++++ packages/gpsdrive/gpsdrive_2.10pre2.bb | 25 ++--------------- packages/gpsdrive/gpsdrive_2.10pre3.bb | 29 -------------------- packages/gpsdrive/gpsdrive_2.10pre4.bb | 21 ++++---------- packages/gpsdrive/gpsdrive_cvs.bb | 32 ---------------------- 8 files changed, 49 insertions(+), 121 deletions(-) create mode 100644 packages/gpsdrive/gpsdrive.inc delete mode 100644 packages/gpsdrive/gpsdrive_2.10pre3.bb delete mode 100644 packages/gpsdrive/gpsdrive_cvs.bb (limited to 'packages') diff --git a/packages/gpsdrive/files/gpsdrive.desktop b/packages/gpsdrive/files/gpsdrive.desktop index 32050e27ba..13d0b4fcce 100644 --- a/packages/gpsdrive/files/gpsdrive.desktop +++ b/packages/gpsdrive/files/gpsdrive.desktop @@ -2,8 +2,8 @@ Name=GPSDrive Comment=GPS map software Exec=gpsdrive -p -1 -Terminal=0 +Terminal=false Type=Application -Icon=gpsicon.png -Categories=Application;Other -StartupNotify=False +Icon=gpsicon +Categories=Graphics;Network;Geography; +StartupNotify=false diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop index 96e8155861..70af29dcad 100644 --- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop +++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop @@ -1,10 +1,9 @@ [Desktop Entry] -Encoding=UTF-8 Name=GPSDrive Comment=GPS map software Exec=gpsdrive -M pda -1 -Icon=gpsicon Terminal=false Type=Application -Categories=Graphics;Network;Geography;Application;Other -StartupNotify=true +Icon=gpsicon +Categories=Graphics;Network;Geography; +StartupNotify=false diff --git a/packages/gpsdrive/gpsdrive-pda_2.10pre2.bb b/packages/gpsdrive/gpsdrive-pda_2.10pre2.bb index 6350053768..e79240e392 100644 --- a/packages/gpsdrive/gpsdrive-pda_2.10pre2.bb +++ b/packages/gpsdrive/gpsdrive-pda_2.10pre2.bb @@ -1,34 +1,29 @@ -inherit autotools pkgconfig +require gpsdrive.inc + +PR = "r2" -PR = "r1" DESCRIPTION = "GPS navigation/map display software, PDA-optimized version" HOMEPAGE = "http://www.gedanken.demon.co.uk/gpsdrive-ipaq/" -DEPENDS = "virtual/libc gtk+ libpcre gpsd" -RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd" -SECTION = "x11" -PRIORITY = "optional" -LICENSE = "GPL" - -inherit pkgconfig SRC_URI = "http://www.gedanken.demon.co.uk/gpsdrive-ipaq/gpsdrive-2.10pre2-ipaq-r4.tar.gz \ + file://gpsdrive.desktop \ file://makefile.patch;patch=1 " S = "${WORKDIR}/gpsdrive-2.10pre2-ipaq" -FILES_${PN} = "${bindir}/gpsdrive ${datadir}/gpsdrive ${datadir}/pixmaps ${datadir}/applications" -FILES_${PN} += "${datadir}/${PN}" - -do_compile () { +do_compile() { oe_runmake "CC=${CC}" "LD=${CC}" "STRIP=${STRIP}" all } -do_install () { +do_install() { mkdir -p ${D}${datadir} cp -a ipkg-data/usr/share/* ${D}${datadir}/ cp -a README.iPAQ.txt ${D}${datadir}/gpsdrive cp -a COPYING ${D}${datadir}/gpsdrive cp -a original-docs ${D}${datadir}/gpsdrive + mkdir -p ${D}${bindir} install -m 0755 gpsdrive ${D}${bindir}/ } + +FILES_${PN} += "${datadir}/gpsdrive" diff --git a/packages/gpsdrive/gpsdrive.inc b/packages/gpsdrive/gpsdrive.inc new file mode 100644 index 0000000000..562990d278 --- /dev/null +++ b/packages/gpsdrive/gpsdrive.inc @@ -0,0 +1,25 @@ +DESCRIPTION = "GPS navigation/map display software" +HOMEPAGE = "http://www.gpsdrive.de/" +AUTHOR = ""Fritz Ganter gpsdrive@warbase.selwerd.nl" +SECTION = "x11/applications" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "virtual/libc gtk+ libpcre gpsd" +RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-garmin" + +CFLAGS += "-D_GNU_SOURCE" + +do_install_append() { + mkdir -p ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/*.desktop ${D}${datadir}/applications/gpsdrive.desktop + + # gpsd is provided by RDEPENDS + if test -e ${D}${bindir}/gpsd + then + rm ${D}${bindir}/gpsd + fi +} diff --git a/packages/gpsdrive/gpsdrive_2.10pre2.bb b/packages/gpsdrive/gpsdrive_2.10pre2.bb index f44c5925d2..4d6abf9a85 100644 --- a/packages/gpsdrive/gpsdrive_2.10pre2.bb +++ b/packages/gpsdrive/gpsdrive_2.10pre2.bb @@ -1,27 +1,6 @@ -inherit autotools pkgconfig +require gpsdrive.inc -PR = "r1" -PACKAGES += "gpsdrive-add" -DESCRIPTION = "GPS navigation/map display software" -DEPENDS = "virtual/libc gtk+ libpcre gpsd" -RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd" -SECTION = "x11" -PRIORITY = "optional" -LICENSE = "GPL" +PR = "r2" SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \ file://gpsdrive.desktop" - -CFLAGS += "-D_GNU_SOURCE" - -FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pixmaps ${datadir}/applications" -FILES_${PN} += "${datadir}/${PN}" - -FILES_gpsdrive-add = "${libdir}" - -EXTRA_OECONF = "--disable-garmin" - -do_install_append () { - mkdir -p ${D}${datadir}/applications - install -m 0644 ${WORKDIR}/gpsdrive.desktop ${D}${datadir}/applications/gpsdrive.desktop -} diff --git a/packages/gpsdrive/gpsdrive_2.10pre3.bb b/packages/gpsdrive/gpsdrive_2.10pre3.bb deleted file mode 100644 index 6a97344260..0000000000 --- a/packages/gpsdrive/gpsdrive_2.10pre3.bb +++ /dev/null @@ -1,29 +0,0 @@ -inherit autotools pkgconfig - -PR = "r1" -DEFAULT_PREFERENCE="-1" - -PACKAGES += "gpsdrive-add" -DESCRIPTION = "GPS navigation/map display software" -DEPENDS = "virtual/libc gtk+ libpcre gpsd" -RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd" -SECTION = "x11" -PRIORITY = "optional" -LICENSE = "GPL" - -SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \ - file://gpsdrive.desktop" - -CFLAGS += "-D_GNU_SOURCE" - -FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pixmaps ${datadir}/applications" -FILES_${PN} += "${datadir}/${PN}" - -FILES_gpsdrive-add = "${libdir}" - -EXTRA_OECONF = "--disable-garmin" - -do_install_append () { - mkdir -p ${D}${datadir}/applications - install -m 0644 ${WORKDIR}/gpsdrive.desktop ${D}${datadir}/applications/gpsdrive.desktop -} diff --git a/packages/gpsdrive/gpsdrive_2.10pre4.bb b/packages/gpsdrive/gpsdrive_2.10pre4.bb index 071a5691e3..102a917c1f 100644 --- a/packages/gpsdrive/gpsdrive_2.10pre4.bb +++ b/packages/gpsdrive/gpsdrive_2.10pre4.bb @@ -1,10 +1,9 @@ -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 \ @@ -12,10 +11,6 @@ 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 @@ -36,7 +31,3 @@ 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" diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb deleted file mode 100644 index 6cb78065ea..0000000000 --- a/packages/gpsdrive/gpsdrive_cvs.bb +++ /dev/null @@ -1,32 +0,0 @@ -inherit autotools pkgconfig - -PR = "r1" -#Remove the dash below when 2.10pre3 changes in PV -PV = "2.10pre3+cvs-${SRCDATE}" -DEFAULT_PREFERENCE="-1" - -PACKAGES += "gpsdrive-add" -DESCRIPTION = "GPS navigation/map display software" -DEPENDS = "virtual/libc libart-lgpl gtk+ libpcre gpsd" -RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd" -SECTION = "x11" -PRIORITY = "optional" -LICENSE = "GPL" - -SRC_URI = "cvs://anonymous@cvs.gpsdrive.cc/cvsroot;module=gpsdrive \ - file://gpsdrive.desktop" - -S = "${WORKDIR}/gpsdrive" -CFLAGS += "-D_GNU_SOURCE" - -FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pixmaps ${datadir}/applications" -FILES_${PN} += "${datadir}/${PN}" - -FILES_gpsdrive-add = "${libdir}" - -EXTRA_OECONF = "--disable-garmin" - -do_install_append () { - mkdir -p ${D}${datadir}/applications - install -m 0644 ${WORKDIR}/gpsdrive.desktop ${D}${datadir}/applications/gpsdrive.desktop -} -- cgit v1.2.3