navit: bump SRCREV

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

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 31d6c30..5ebcab3 100644 (file)
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -156,8 +156,6 @@ SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257"
 SRCREV_pn-multitap-pad ?= "373"
 SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
-SRCREV_pn-navit ?= "2934"
-SRCREV_pn-navit-icons ?= "2927"
 SRCREV_pn-neod ?= "4617"
 SRCREV_pn-neomis ?= "6"
 SRCREV_pn-net-snmp ?= "17367"

diff --git a/recipes/navit/navit-icons/configure.in b/recipes/navit/navit-icons/configure.in
index 2525900..4ffc7b0 100644 (file)
--- a/recipes/navit/navit-icons/configure.in
+++ b/recipes/navit/navit-icons/configure.in
@@ -60,6 +60,7 @@ AM_CONDITIONAL(USE_SVG2PNG_SCALES_FLAG, test "x${SVG2PNG_SCALES_FLAG}" != "xyes"
 AM_CONDITIONAL(USE_SVG2PNG_SCALES_NAV, test "x${SVG2PNG_SCALES_NAV}" != "xyes" -a "x${SVG2PNG_SCALES_NAV}" != "x")
 AM_CONDITIONAL(USE_SVG2PNG, test "x${enable_svg2png}" = "xyes")
 AM_CONDITIONAL(USE_SVG, test "x${enable_svg}" = "xyes")
+AM_CONDITIONAL(SUPPORT_WIN32, [test "x$win32" = "xyes"])
 
 AC_CONFIG_FILES([
 Makefile

diff --git a/recipes/navit/navit-icons_svn.bb b/recipes/navit/navit-icons_svn.bb
index f171e4d..ad36b0e 100644 (file)
--- a/recipes/navit/navit-icons_svn.bb
+++ b/recipes/navit/navit-icons_svn.bb
@@ -18,7 +18,9 @@ inherit autotools
 
 FILES_${PN} = " /usr/share/navit/xpm/"
 
-#use different URL than navit_svn doest, to prevent upgrade/downgrade cycle in downloads dir
+SRCREV = "2948"
+
+#use different URL than navit_svn does, to prevent upgrade/downgrade cycle in downloads dir
 SRC_URI = "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk/navit/navit;module=xpm;proto=https \
            file://configure.in"
 

diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb
index a8ff27b..a6e3fa3 100644 (file)
--- a/recipes/navit/navit_svn.bb
+++ b/recipes/navit/navit_svn.bb
@@ -13,6 +13,7 @@ DEPENDS_shr += " librsvg-native"
 RDEPENDS = " navit-icons"
 EXTRA_OECONF += " --enable-svg2png-scaling-flag=32 --disable-speech-speech-dispatcher --enable-cache-size=20971520"
 
+SRCREV = "3012"
 SRC_URI = "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;proto=https"
 
 EXTRA_AUTORECONF = " -I m4"
@@ -32,7 +33,7 @@ SRC_URI += "file://navit.xml \
             file://osd.xml \
             file://speech.xml \
             file://plugins.xml \
-          "
+           "
 
 #Second launcher for shr
 SRC_URI_append_shr = "file://navitD.desktop \