From b15f30ad6b6a8467782f3db3d7f773eb816a163f Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Thu, 28 Jan 2010 17:27:27 +0100 Subject: [PATCH] navit: initial import (verified compilation) --- navit/.footprint | 482 ++++++++++++++++++++++++++++++++ navit/.md5sum | 2 + navit/Pkgfile | 57 ++++ navit/navit-0.1.1.gps_fix.patch | 190 +++++++++++++ 4 files changed, 731 insertions(+) create mode 100644 navit/.footprint create mode 100644 navit/.md5sum create mode 100644 navit/Pkgfile create mode 100644 navit/navit-0.1.1.gps_fix.patch diff --git a/navit/.footprint b/navit/.footprint new file mode 100644 index 0000000..18ff679 --- /dev/null +++ b/navit/.footprint @@ -0,0 +1,482 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/navit +-rwxr-xr-x root/root usr/bin/osm2navit +drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/navit/ +drwxr-xr-x root/root usr/lib/navit/font/ +-rwxr-xr-x root/root usr/lib/navit/font/libfont_freetype.la +-rwxr-xr-x root/root usr/lib/navit/font/libfont_freetype.so +drwxr-xr-x root/root usr/lib/navit/graphics/ +-rwxr-xr-x root/root usr/lib/navit/graphics/libgraphics_null.la +-rwxr-xr-x root/root usr/lib/navit/graphics/libgraphics_null.so +-rwxr-xr-x root/root usr/lib/navit/graphics/libgraphics_sdl.la +-rwxr-xr-x root/root usr/lib/navit/graphics/libgraphics_sdl.so +drwxr-xr-x root/root usr/lib/navit/gui/ +-rwxr-xr-x root/root usr/lib/navit/gui/libgui_internal.la +-rwxr-xr-x root/root usr/lib/navit/gui/libgui_internal.so +drwxr-xr-x root/root usr/lib/navit/map/ +-rwxr-xr-x root/root usr/lib/navit/map/libmap_binfile.la +-rwxr-xr-x root/root usr/lib/navit/map/libmap_binfile.so +-rwxr-xr-x root/root usr/lib/navit/map/libmap_mg.la +-rwxr-xr-x root/root usr/lib/navit/map/libmap_mg.so +-rwxr-xr-x root/root usr/lib/navit/map/libmap_poi_geodownload.la +-rwxr-xr-x root/root usr/lib/navit/map/libmap_poi_geodownload.so +-rwxr-xr-x root/root usr/lib/navit/map/libmap_shapefile.la +-rwxr-xr-x root/root usr/lib/navit/map/libmap_shapefile.so +-rwxr-xr-x root/root usr/lib/navit/map/libmap_textfile.la +-rwxr-xr-x root/root usr/lib/navit/map/libmap_textfile.so +drwxr-xr-x root/root usr/lib/navit/osd/ +-rwxr-xr-x root/root usr/lib/navit/osd/libosd_core.la +-rwxr-xr-x root/root usr/lib/navit/osd/libosd_core.so +drwxr-xr-x root/root usr/lib/navit/speech/ +-rwxr-xr-x root/root usr/lib/navit/speech/libspeech_cmdline.la +-rwxr-xr-x root/root usr/lib/navit/speech/libspeech_cmdline.so +drwxr-xr-x root/root usr/lib/navit/vehicle/ +-rwxr-xr-x root/root usr/lib/navit/vehicle/libvehicle_demo.la +-rwxr-xr-x root/root usr/lib/navit/vehicle/libvehicle_demo.so +-rwxr-xr-x root/root usr/lib/navit/vehicle/libvehicle_gpsd.la +-rwxr-xr-x root/root usr/lib/navit/vehicle/libvehicle_gpsd.so +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/applications/ +-rw-r--r-- root/root usr/share/applications/navit.desktop +drwxr-xr-x root/root usr/share/icons/ +drwxr-xr-x root/root usr/share/icons/hicolor/ +drwxr-xr-x root/root usr/share/icons/hicolor/128x128/ +drwxr-xr-x root/root usr/share/icons/hicolor/128x128/apps/ +-rw-r--r-- root/root usr/share/icons/hicolor/128x128/apps/navit.png +drwxr-xr-x root/root usr/share/icons/hicolor/22x22/ +drwxr-xr-x root/root usr/share/icons/hicolor/22x22/apps/ +-rw-r--r-- root/root usr/share/icons/hicolor/22x22/apps/navit.png +drwxr-xr-x root/root usr/share/navit/ +-rw-r--r-- root/root usr/share/navit/navit.xml +drwxr-xr-x root/root usr/share/navit/xpm/ +-rw-r--r-- root/root usr/share/navit/xpm/airport.svg +-rw-r--r-- root/root usr/share/navit/xpm/attraction.svg +-rw-r--r-- root/root usr/share/navit/xpm/bank.svg +-rw-r--r-- root/root usr/share/navit/xpm/bar.svg +-rw-r--r-- root/root usr/share/navit/xpm/bench.xpm +-rw-r--r-- root/root usr/share/navit/xpm/biergarten.xpm +-rw-r--r-- root/root usr/share/navit/xpm/boat_ramp.svg +-rw-r--r-- root/root usr/share/navit/xpm/boundary_stone.xpm +-rw-r--r-- root/root usr/share/navit/xpm/bus.svg +-rw-r--r-- root/root usr/share/navit/xpm/bus_halt.xpm +-rw-r--r-- root/root usr/share/navit/xpm/cafe.xpm +-rw-r--r-- root/root usr/share/navit/xpm/camping.xpm +-rw-r--r-- root/root usr/share/navit/xpm/car_dealer.xpm +-rw-r--r-- root/root usr/share/navit/xpm/castle.xpm +-rw-r--r-- root/root usr/share/navit/xpm/cemetery.xpm +-rw-r--r-- root/root usr/share/navit/xpm/church.svg +-rw-r--r-- root/root usr/share/navit/xpm/cinema.svg +-rw-r--r-- root/root usr/share/navit/xpm/country_AD.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_AE.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_AF.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_AG.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_AI.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_AL.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_AM.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_AN.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_AO.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_AQ.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_AR.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_AS.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_AT.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_AU.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_AW.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_AX.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_AZ.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_BA.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_BB.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_BD.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_BE.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_BF.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_BG.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_BH.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_BI.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_BJ.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_BL.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_BM.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_BN.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_BO.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_BR.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_BS.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_BT.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_BV.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_BW.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_BY.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_BZ.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_CA.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_CC.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_CD.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_CF.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_CG.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_CH.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_CI.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_CK.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_CL.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_CM.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_CN.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_CO.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_CR.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_CU.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_CV.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_CX.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_CY.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_CZ.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_DE.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_DJ.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_DK.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_DM.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_DO.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_DZ.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_EC.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_EE.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_EG.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_EH.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_ER.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_ES.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_ET.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_FI.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_FJ.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_FK.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_FM.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_FO.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_FR.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_GA.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_GB.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_GD.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_GE.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_GF.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_GG.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_GH.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_GI.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_GL.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_GM.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_GN.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_GP.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_GQ.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_GR.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_GS.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_GT.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_GU.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_GW.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_GY.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_HK.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_HM.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_HN.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_HR.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_HT.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_HU.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_ID.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_IE.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_IL.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_IM.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_IN.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_IO.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_IQ.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_IR.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_IS.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_IT.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_JE.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_JM.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_JO.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_JP.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_KE.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_KG.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_KH.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_KI.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_KM.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_KN.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_KP.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_KR.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_KW.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_KY.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_KZ.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_LA.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_LB.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_LC.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_LI.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_LK.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_LR.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_LS.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_LT.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_LU.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_LV.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_LY.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MA.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MC.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MD.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_ME.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MF.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MG.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MH.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MK.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_ML.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MM.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MN.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MO.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MP.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MQ.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MR.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MS.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MT.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MU.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MV.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MW.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MX.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MY.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_MZ.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_NA.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_NC.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_NE.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_NF.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_NG.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_NI.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_NL.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_NO.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_NP.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_NR.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_NU.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_NZ.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_OM.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_PA.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_PE.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_PF.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_PG.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_PH.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_PK.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_PL.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_PM.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_PN.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_PR.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_PS.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_PT.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_PW.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_PY.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_QA.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_RE.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_RO.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_RS.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_RU.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_RW.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_SA.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_SB.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_SC.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_SD.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_SE.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_SG.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_SH.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_SI.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_SJ.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_SK.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_SL.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_SM.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_SN.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_SO.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_SR.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_ST.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_SV.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_SY.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_SZ.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_TC.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_TD.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_TF.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_TG.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_TH.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_TJ.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_TK.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_TL.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_TM.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_TN.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_TO.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_TR.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_TT.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_TV.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_TW.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_TZ.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_UA.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_UG.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_UM.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_US.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_UY.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_UZ.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_VA.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_VC.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_VE.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_VG.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_VI.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_VN.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_VU.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_WF.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_WS.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_YE.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_YT.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_ZA.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_ZM.svgz +-rw-r--r-- root/root usr/share/navit/xpm/country_ZW.svgz +-rw-r--r-- root/root usr/share/navit/xpm/cursor.xpm +-rw-r--r-- root/root usr/share/navit/xpm/dumping-station.xpm +-rw-r--r-- root/root usr/share/navit/xpm/exit.svg +-rw-r--r-- root/root usr/share/navit/xpm/fastfood.svg +-rw-r--r-- root/root usr/share/navit/xpm/firebrigade.svg +-rw-r--r-- root/root usr/share/navit/xpm/flag_bk_tr.xpm +-rw-r--r-- root/root usr/share/navit/xpm/flag_bk_wh.xpm +-rw-r--r-- root/root usr/share/navit/xpm/flag_bl_wh.xpm +-rw-r--r-- root/root usr/share/navit/xpm/flag_wh_bk.xpm +-rw-r--r-- root/root usr/share/navit/xpm/fountain.xpm +-rw-r--r-- root/root usr/share/navit/xpm/fuel.svg +-rw-r--r-- root/root usr/share/navit/xpm/gc_event.xpm +-rw-r--r-- root/root usr/share/navit/xpm/gc_multi.xpm +-rw-r--r-- root/root usr/share/navit/xpm/gc_mystery.xpm +-rw-r--r-- root/root usr/share/navit/xpm/gc_question.xpm +-rw-r--r-- root/root usr/share/navit/xpm/gc_reference.xpm +-rw-r--r-- root/root usr/share/navit/xpm/gc_stages.xpm +-rw-r--r-- root/root usr/share/navit/xpm/gc_tradi.xpm +-rw-r--r-- root/root usr/share/navit/xpm/gc_webcam.xpm +-rw-r--r-- root/root usr/share/navit/xpm/golf.xpm +-rw-r--r-- root/root usr/share/navit/xpm/gui_actions.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_active.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_arrow_down.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_arrow_left.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_arrow_right.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_arrow_up.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_bookmark.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_display.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_fullscreen.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_help.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_home.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_inactive.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_leave_fullscreen.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_map.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_maps.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_menu.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_minus.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_plus.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_quit.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_rules.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_select_country.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_select_street.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_select_town.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_settings.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_sound.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_sound_off.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_stop.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_strength_0.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_strength_1.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_strength_2.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_strength_3.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_strength_4.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_strength_5.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_tools.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_town.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_vehicle.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_zoom_in.svg +-rw-r--r-- root/root usr/share/navit/xpm/gui_zoom_out.svg +-rw-r--r-- root/root usr/share/navit/xpm/heliport.xpm +-rw-r--r-- root/root usr/share/navit/xpm/highway_exit.xpm +-rw-r--r-- root/root usr/share/navit/xpm/hospital.svg +-rw-r--r-- root/root usr/share/navit/xpm/hotel.xpm +-rw-r--r-- root/root usr/share/navit/xpm/hunting_stand.xpm +-rw-r--r-- root/root usr/share/navit/xpm/information.xpm +-rw-r--r-- root/root usr/share/navit/xpm/justice.xpm +-rw-r--r-- root/root usr/share/navit/xpm/level_crossing.xpm +-rw-r--r-- root/root usr/share/navit/xpm/library.xpm +-rw-r--r-- root/root usr/share/navit/xpm/memorial.xpm +-rw-r--r-- root/root usr/share/navit/xpm/menu.xpm +-rw-r--r-- root/root usr/share/navit/xpm/military.xpm +-rw-r--r-- root/root usr/share/navit/xpm/mini_roundabout.xpm +-rw-r--r-- root/root usr/share/navit/xpm/museum.xpm +-rw-r--r-- root/root usr/share/navit/xpm/nav_left_1.xpm +-rw-r--r-- root/root usr/share/navit/xpm/nav_left_1_32.xpm +-rw-r--r-- root/root usr/share/navit/xpm/nav_left_1_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_left_1_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_left_2.xpm +-rw-r--r-- root/root usr/share/navit/xpm/nav_left_2_32.xpm +-rw-r--r-- root/root usr/share/navit/xpm/nav_left_2_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_left_2_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_left_3_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_left_3_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_right_1.xpm +-rw-r--r-- root/root usr/share/navit/xpm/nav_right_1_32.xpm +-rw-r--r-- root/root usr/share/navit/xpm/nav_right_1_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_right_1_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_right_2.xpm +-rw-r--r-- root/root usr/share/navit/xpm/nav_right_2_32.xpm +-rw-r--r-- root/root usr/share/navit/xpm/nav_right_2_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_right_2_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_right_3_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_right_3_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_l1_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_l1_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_l2_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_l2_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_l3_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_l3_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_l4_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_l4_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_l5_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_l5_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_l6_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_l6_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_l7_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_l7_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_l8_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_l8_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_r1_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_r1_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_r2_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_r2_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_r3_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_r3_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_r4_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_r4_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_r5_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_r5_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_r6_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_r6_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_r7_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_r7_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_r8_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_roundabout_r8_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_straight.xpm +-rw-r--r-- root/root usr/share/navit/xpm/nav_straight_32.xpm +-rw-r--r-- root/root usr/share/navit/xpm/nav_straight_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_straight_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_turnaround_left_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_turnaround_left_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_turnaround_right_bk.svg +-rw-r--r-- root/root usr/share/navit/xpm/nav_turnaround_right_wh.svg +-rw-r--r-- root/root usr/share/navit/xpm/parking.xpm +-rw-r--r-- root/root usr/share/navit/xpm/peak.svg +-rw-r--r-- root/root usr/share/navit/xpm/pharmacy.xpm +-rw-r--r-- root/root usr/share/navit/xpm/picnic.xpm +-rw-r--r-- root/root usr/share/navit/xpm/police.svg +-rw-r--r-- root/root usr/share/navit/xpm/post.svg +-rw-r--r-- root/root usr/share/navit/xpm/potable_water.xpm +-rw-r--r-- root/root usr/share/navit/xpm/public_office.xpm +-rw-r--r-- root/root usr/share/navit/xpm/restaurant.xpm +-rw-r--r-- root/root usr/share/navit/xpm/restroom.xpm +-rw-r--r-- root/root usr/share/navit/xpm/ruins.xpm +-rw-r--r-- root/root usr/share/navit/xpm/school.xpm +-rw-r--r-- root/root usr/share/navit/xpm/shelter.xpm +-rw-r--r-- root/root usr/share/navit/xpm/shopping.svg +-rw-r--r-- root/root usr/share/navit/xpm/skiing.xpm +-rw-r--r-- root/root usr/share/navit/xpm/sport.xpm +-rw-r--r-- root/root usr/share/navit/xpm/swimming.xpm +-rw-r--r-- root/root usr/share/navit/xpm/tec_common.svg +-rw-r--r-- root/root usr/share/navit/xpm/telephone.xpm +-rw-r--r-- root/root usr/share/navit/xpm/theater.xpm +-rw-r--r-- root/root usr/share/navit/xpm/toggle_fullscreen.xpm +-rw-r--r-- root/root usr/share/navit/xpm/toilets.xpm +-rw-r--r-- root/root usr/share/navit/xpm/tower.xpm +-rw-r--r-- root/root usr/share/navit/xpm/townhall.xpm +-rw-r--r-- root/root usr/share/navit/xpm/traffic_signals.svg +-rw-r--r-- root/root usr/share/navit/xpm/trailerpark.xpm +-rw-r--r-- root/root usr/share/navit/xpm/unknown.xpm +-rw-r--r-- root/root usr/share/navit/xpm/viewpoint.xpm +-rw-r--r-- root/root usr/share/navit/xpm/wifi.xpm +-rw-r--r-- root/root usr/share/navit/xpm/zoo.xpm +-rw-r--r-- root/root usr/share/navit/xpm/zoom_in.svg +-rw-r--r-- root/root usr/share/navit/xpm/zoom_in.xpm +-rw-r--r-- root/root usr/share/navit/xpm/zoom_out.svg +-rw-r--r-- root/root usr/share/navit/xpm/zoom_out.xpm diff --git a/navit/.md5sum b/navit/.md5sum new file mode 100644 index 0000000..27081b8 --- /dev/null +++ b/navit/.md5sum @@ -0,0 +1,2 @@ +65a55ac28bcadc238f42b8802eef6978 navit-0.1.1.gps_fix.patch +379b49d97c92e7e1658f49281e4e40f5 navit-0.1.1.tar.gz diff --git a/navit/Pkgfile b/navit/Pkgfile new file mode 100644 index 0000000..6c67c61 --- /dev/null +++ b/navit/Pkgfile @@ -0,0 +1,57 @@ +# Description: Navit is a car navigation system with routing engine +# URL: http://www.navit-project.org/ +# Arch Maintainer: CRUX-ARM System Team, crux-arm at mikeux dot dyndns dot org +# Depends on: glib fontconfig imlib2 sdl_image gpsd + +name=navit +version=0.1.1 +release=1 +source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz \ + $name-$version.gps_fix.patch) + +build () { + cd $name-$version + + patch -p1 -i $SRC/$name-$version.gps_fix.patch + + export DEFAULT_LIBS="-I$CLFS/usr/lib" + export DEFAULT_CFLAGS="-I$CLFS/usr/include" + export GLIB_LIBS="$DEFAULT_LIBS -pthread -lgthread-2.0 -lrt -lglib-2.0" + export GLIB_CFLAGS="$DEFAULT_CFLAGS -pthread -I$CLFS/usr/include/glib-2.0 -I$CLFS/usr/lib/glib-2.0/include" + export GMODULE_LIBS="$DEFAULT_LIBS -Wl,--export-dynamic -lgmodule-2.0 -lglib-2.0" + export GMODULE_CFLAGS="$DEFAULT_CFLAGS -I$CLFS/usr/include/glib-2.0 -I$CLFS/usr/lib/glib-2.0/include" + export FREETYPE2_LIBS="$DEFAULT_LIBS -lfreetype -lz" + export FREETYPE2_CFLAGS="$DEFAULT_CFLAGS -I$CLFS/usr/include/freetype2" + export FONTCONFIG_LIBS="$DEFAULT_LIBS -lfontconfig" + export FONTCONFIG_CFLAGS="$DEFAULT_CFLAGS" + export IMLIB2_LIBS="$DEFAULT_LIBS -lImlib2" + export IMLIB2_CFLAGS="$DEFAULT_CFLAGS" + export SDL_LIBS="$DEFAULT_LIBS -Wl,-rpath,/usr/lib -lSDL -lpthread -lSDL_image" + export SDL_CFLAGS="$DEFAULT_CFLAGS -I$CLFS/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT" + export GPSD_LIBS="$DEFAULT_LIBS -lgps -lgpsd" + export GPSD_CFLAGS="$DEFAULT_CFLAGS" + + echo "ac_cv_header_SDL_image_h=yes" > config.cache + + ./configure --build=$CHOST \ + --host=$CTARGET \ + --prefix=/usr \ + --enable-transformation-roll \ + --disable-postgresql \ + --enable-font-freetype \ + --enable-fontconfig \ + --disable-gui-sdl \ + --enable-graphics-sdl \ + --disable-graphics-opengl \ + --disable-gui-gtk \ + --disable-gui-win32 \ + --disable-nls \ + --cache-file=config.cache + + echo "#define HAVE_LIBGPS19" >> config.h + + make + make DESTDIR=$PKG install + + rm -f $PKG/usr/share/$name/README +} diff --git a/navit/navit-0.1.1.gps_fix.patch b/navit/navit-0.1.1.gps_fix.patch new file mode 100644 index 0000000..c3f40fd --- /dev/null +++ b/navit/navit-0.1.1.gps_fix.patch @@ -0,0 +1,190 @@ +To cope both with libgps18 and libgps19 +Index: navit/configure.in +=================================================================== +--- navit.orig/configure.in 2010-01-06 00:08:44.000000000 +0100 ++++ navit/configure.in 2010-01-06 00:08:44.000000000 +0100 +@@ -773,7 +773,17 @@ + AC_ARG_ENABLE(vehicle-gpsd, [ --disable-vehicle-gpsd disable vehicle type gpsd], vehicle_gpsd=$enableval;vehicle_gpsd_reason="configure parameter") + if test "x${vehicle_gpsd}" = xyes + then +- AC_CHECK_HEADER(gps.h, AC_DEFINE([HAVE_LIBGPS],[],Define to 1 if you have the header file.) GPSD_LIBS="-lgps", vehicle_gpsd=no; vehicle_gpsd_reason="no gps.h" ) ++ PKG_CHECK_MODULES([GPSD], [libgps], have_libgps="yes", have_libgps="no") ++ if test "x$have_libgps" = "xyes"; then ++ AC_DEFINE([HAVE_LIBGPS],[],Define to 1 if you have libgps.) ++ PKG_CHECK_MODULES([LIBGPS19], [libgps >= 2.90], have_libgps19="yes", have_libgps19="no") ++ if test "x$have_libgps19" = "xyes"; then ++ AC_DEFINE([HAVE_LIBGPS19],[],Define to 1 if you have libgps19.) ++ fi ++ else ++ vehicle_gpsd=no; vehicle_gpsd_reason="no libgps" ++ fi ++dnl AC_CHECK_HEADER(gps.h, AC_DEFINE([HAVE_LIBGPS],[],Define to 1 if you have the header file.) GPSD_LIBS="-lgps", vehicle_gpsd=no; vehicle_gpsd_reason="no gps.h" ) + fi + AC_SUBST(GPSD_CFLAGS) + AC_SUBST(GPSD_LIBS) +Index: navit/navit/attr_def.h +=================================================================== +--- navit.orig/navit/attr_def.h 2010-01-06 00:06:16.000000000 +0100 ++++ navit/navit/attr_def.h 2010-01-06 00:08:44.000000000 +0100 +@@ -226,7 +226,9 @@ + ATTR(gc_type) + ATTR(layout) + ATTR(position_nmea) ++#ifndef HAVE_LIBGPS19 + ATTR(gpsd_query) ++#endif + ATTR(on_eof) + ATTR(command) + ATTR(src) +Index: navit/navit/vehicle/gpsd/vehicle_gpsd.c +=================================================================== +--- navit.orig/navit/vehicle/gpsd/vehicle_gpsd.c 2010-01-06 00:06:16.000000000 +0100 ++++ navit/navit/vehicle/gpsd/vehicle_gpsd.c 2010-01-06 00:08:44.000000000 +0100 +@@ -36,7 +36,9 @@ + + static struct vehicle_priv { + char *source; ++#ifndef HAVE_LIBGPS19 + char *gpsd_query; ++#endif + struct callback_list *cbl; + struct callback *cb; + struct event_watch *evwatch; +@@ -69,8 +71,12 @@ + static void vehicle_gpsd_io(struct vehicle_priv *priv); + + static void ++#ifdef HAVE_LIBGPS19 ++vehicle_gpsd_callback(struct gps_data_t *data, char *buf, size_t len) ++#else + vehicle_gpsd_callback(struct gps_data_t *data, char *buf, size_t len, + int level) ++#endif + { + char *pos,*nmea_data_buf; + int i=0,sats_signal=0; +@@ -108,16 +114,32 @@ + data->set &= ~ALTITUDE_SET; + } + if (data->set & SATELLITE_SET) { ++#ifdef HAVE_LIBGPS19 ++ if(data->satellites_visible > 0) { ++#else + if(data->satellites > 0) { ++#endif + sats_signal=0; ++#ifdef HAVE_LIBGPS19 ++ for( i=0;isatellites_visible;i++) { ++#else + for( i=0;isatellites;i++) { ++#endif + if (data->ss[i] > 0) + sats_signal++; + } + } ++#ifdef HAVE_LIBGPS19 ++ if (priv->sats_used != data->satellites_used || priv->sats != data->satellites_visible || priv->sats_signal != sats_signal ) { ++#else + if (priv->sats_used != data->satellites_used || priv->sats != data->satellites || priv->sats_signal != sats_signal ) { ++#endif + priv->sats_used = data->satellites_used; ++#ifdef HAVE_LIBGPS19 ++ priv->sats = data->satellites_visible; ++#else + priv->sats = data->satellites; ++#endif + priv->sats_signal = sats_signal; + callback_list_call_attr_0(priv->cbl, attr_position_sats); + } +@@ -135,10 +157,17 @@ + priv->fix_time = data->fix.time; + data->set &= ~TIME_SET; + } ++#ifdef HAVE_LIBGPS19 ++ if (data->set & DOP_SET) { ++ dbg(1, "pdop : %g\n", data->dop.pdop); ++ priv->hdop = data->dop.pdop; ++ data->set &= ~DOP_SET; ++#else + if (data->set & PDOP_SET) { + dbg(1, "pdop : %g\n", data->pdop); + priv->hdop = data->hdop; + data->set &= ~PDOP_SET; ++#endif + } + if (data->set & LATLON_SET) { + priv->geo.lat = data->fix.latitude; +@@ -180,7 +209,11 @@ + dbg(0,"gps_open failed for '%s'. Retrying in %d seconds. Have you started gpsd?\n", priv->source, priv->retry_interval); + return TRUE; + } ++#ifdef HAVE_LIBGPS19 ++ gps_stream(priv->gps, WATCH_ENABLE, NULL); ++#else + gps_query(priv->gps, priv->gpsd_query); ++#endif + gps_set_raw_hook(priv->gps, vehicle_gpsd_callback); + priv->cb = callback_new_1(callback_cast(vehicle_gpsd_io), priv); + priv->evwatch = event_add_watch((void *)priv->gps->gps_fd, event_watch_cond_read, priv->cb); +@@ -268,8 +301,10 @@ + vehicle_gpsd_close(priv); + if (priv->source) + g_free(priv->source); ++#ifndef HAVE_LIBGPS19 + if (priv->gpsd_query) + g_free(priv->gpsd_query); ++#endif + g_free(priv); + } + +@@ -350,12 +385,17 @@ + *cbl, struct attr **attrs) + { + struct vehicle_priv *ret; ++#ifdef HAVE_LIBGPS19 ++ struct attr *source, *retry_int; ++#else + struct attr *source, *query, *retry_int; ++#endif + + dbg(1, "enter\n"); + source = attr_search(attrs, NULL, attr_source); + ret = g_new0(struct vehicle_priv, 1); + ret->source = g_strdup(source->u.str); ++#ifndef HAVE_LIBGPS19 + query = attr_search(attrs, NULL, attr_gpsd_query); + if (query) { + ret->gpsd_query = g_strconcat(query->u.str, "\n", NULL); +@@ -363,6 +403,7 @@ + ret->gpsd_query = g_strdup("w+x\n"); + } + dbg(1,"Format string for gpsd_query: %s\n",ret->gpsd_query); ++#endif + retry_int = attr_search(attrs, NULL, attr_retry_interval); + if (retry_int) { + ret->retry_interval = retry_int->u.num; +Index: navit/navit/attr.h +=================================================================== +--- navit.orig/navit/attr.h 2010-01-06 00:06:16.000000000 +0100 ++++ navit/navit/attr.h 2010-01-06 00:08:44.000000000 +0100 +@@ -25,6 +25,7 @@ + #endif + + #include "projection.h" ++#include "config.h" + + enum item_type; + +Index: navit/navit/map/garmin/Makefile.am +=================================================================== +--- navit.orig/navit/map/garmin/Makefile.am 2010-01-06 00:09:00.000000000 +0100 ++++ navit/navit/map/garmin/Makefile.am 2010-01-06 00:09:09.000000000 +0100 +@@ -20,7 +20,7 @@ + gentypes_SOURCES=gentypes.c + + gentypes.$(OBJEXT): gentypes.c +- $(CC_FOR_BUILD) -I$(top_srcdir)/navit -c -o $@ $< ++ $(CC_FOR_BUILD) -I$(top_srcdir)/navit -I$(top_srcdir) -c -o $@ $< + + gentypes$(EXEEXT): $(gentypes_OBJECTS) $(gentypes_DEPENDENCIES) + @rm -f gentypes$(EXEEXT) -- 2.26.2