[oe-commits] org.oe.dev merge of '63c7ad87655c2781ad8b9c81af430596f48a24a6'

[mickeyl commit]

merge of '63c7ad87655c2781ad8b9c81af430596f48a24a6'
     and 'bc63a4fa471a2388437163476a7cb1cf8179bb23'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 64ea12146e0ac4ccac48bae3e6b8ccf1b0b939f8
ViewMTN: http://monotone.openembedded.org/revision/info/64ea12146e0ac4ccac48bae3e6b8ccf1b0b939f8
Files:
1
packages/navit/files/compile-fix.patch
packages/navit/navit_0.0.1.bb
packages/navit/navit_0.0.2.bb
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/navit/navit.inc
packages/navit/navit_0.0.3.bb
packages/navit/navit_cvs.bb
classes/sanity.bbclass
Diffs:

#
# mt diff -r63c7ad87655c2781ad8b9c81af430596f48a24a6 -r64ea12146e0ac4ccac48bae3e6b8ccf1b0b939f8
#
# 
# 
# delete "packages/navit/files/compile-fix.patch"
# 
# delete "packages/navit/navit_0.0.1.bb"
# 
# delete "packages/navit/navit_0.0.2.bb"
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [7fe856aa016a01f104bc85db8b3c5078e69cd0eb]
#    to [cb176be489c8cc84cc322cac2f96f85758f594fe]
# 
# patch "packages/navit/navit.inc"
#  from [dc36e11d9155034cfe2c407959f0b757b5a483de]
#    to [4e36ed086e689535bed08a5953f1f330300dc53f]
# 
# patch "packages/navit/navit_0.0.3.bb"
#  from [1127602c440a00440088e7587bf88d3c760f05c4]
#    to [15b167521e9d10044612c9a9841fd32e13f97363]
# 
# patch "packages/navit/navit_cvs.bb"
#  from [d22f4f689826ebf7d008a0bc66a88d56cc149e05]
#    to [08dc55cf2a02719d9345a11b1fac91807d8b2e86]
# 
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	7fe856aa016a01f104bc85db8b3c5078e69cd0eb
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	cb176be489c8cc84cc322cac2f96f85758f594fe
@@ -1305,7 +1305,7 @@ PREFERRED_VERSION_nautilus-cd-burner ?= 
 PREFERRED_VERSION_nasm-native ?= "0.98.38"
 PREFERRED_VERSION_nautilus ?= "2.12.2"
 PREFERRED_VERSION_nautilus-cd-burner ?= "2.8.5"
-PREFERRED_VERSION_navit ?= "0.0.1"
+PREFERRED_VERSION_navit ?= "0.0.3"
 PREFERRED_VERSION_nbd ?= "2.8.7"
 PREFERRED_VERSION_ncftp ?= "3.2.0"
 PREFERRED_VERSION_ncmpc ?= "0.11.1"
============================================================
--- packages/navit/navit.inc	dc36e11d9155034cfe2c407959f0b757b5a483de
+++ packages/navit/navit.inc	4e36ed086e689535bed08a5953f1f330300dc53f
@@ -5,21 +5,23 @@ inherit autotools
 
 inherit autotools
 
+EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"
+
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
 
 FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
 FILES_${PN}-dev += "${libdir}/${PN}/*/*.so"
 
 SRC_URI_append = " \
-	    	  file://navit.launcher \
+                  file://navit.xml-so.patch;patch=1 \
+                  file://navit.desktop \
+                  file://navit.launcher \
 	  	 "
 
 do_install_append() {
-	install -d ${D}/usr/share/applications/
-	
-	install -m 0644 ${WORKDIR}/navit.desktop ${D}/usr/share/applications/
-	
-	mv ${D}/usr/bin/navit ${D}/usr/bin/navit.real
-	
-	install -m 0755 ${WORKDIR}/navit.launcher ${D}/usr/bin/navit
+        install -d ${D}/usr/share/applications/
+        install -m 0644 ${WORKDIR}/navit.desktop ${D}/usr/share/applications/
+
+        mv ${D}/usr/bin/navit ${D}/usr/bin/navit.real
+        install -m 0755 ${WORKDIR}/navit.launcher ${D}/usr/bin/navit
 }
============================================================
--- packages/navit/navit_0.0.3.bb	1127602c440a00440088e7587bf88d3c760f05c4
+++ packages/navit/navit_0.0.3.bb	15b167521e9d10044612c9a9841fd32e13f97363
@@ -1,16 +1,5 @@ require navit.inc
 require navit.inc
 
-PR = "r3"
+PR = "r4"
 
+SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz"
-SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz \
-	   file://navit.xml-so.patch;patch=1 \
-	   file://navit.desktop"
-
-EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"
-
-do_install_append() {
-	install -d ${D}/usr/share/applications/
-	
-	install -m 0644 ${WORKDIR}/navit.desktop ${D}/usr/share/applications/
-}
-
============================================================
--- packages/navit/navit_cvs.bb	d22f4f689826ebf7d008a0bc66a88d56cc149e05
+++ packages/navit/navit_cvs.bb	08dc55cf2a02719d9345a11b1fac91807d8b2e86
@@ -1,15 +1,11 @@ PV = "0.0.3+cvs${SRCDATE}"
 require navit.inc
 
 PV = "0.0.3+cvs${SRCDATE}"
-PR = "r3"
+PR = "r4"
 
 S = "${WORKDIR}/navit"
 
-SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit \
-           file://navit.xml-so.patch;patch=1 \
-	   file://navit.desktop"
+SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit"
 
-EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"
-
 EXTRA_AUTORECONF = " -I m4"
 


#
# mt diff -rbc63a4fa471a2388437163476a7cb1cf8179bb23 -r64ea12146e0ac4ccac48bae3e6b8ccf1b0b939f8
#
# 
# 
# patch "classes/sanity.bbclass"
#  from [c93bcb7294008f5c9b589ee59a39efbdb9a82616]
#    to [ebf6cc13d544c4d677c13e3ea8dd18655c21e172]
# 
============================================================
--- classes/sanity.bbclass	c93bcb7294008f5c9b589ee59a39efbdb9a82616
+++ classes/sanity.bbclass	ebf6cc13d544c4d677c13e3ea8dd18655c21e172
@@ -83,9 +83,6 @@ def check_sanity(e):
 	if not check_app_exists('${BUILD_PREFIX}g++', e.data):
 		missing = missing + "C++ Compiler (${BUILD_PREFIX}g++),"
 
-        if not check_app_exists('${BUILD_PREFIX}gfortran', e.data):
-                missing = missing + "GNU Fortran Compiler"
-
 	required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum"
 
 	for util in required_utilities.split():