(really) fix ubahnnav

BKrev: 415f6201AqN2ig41KBuBX9fznrWYtA

diff --git a/ubahnnav/ubahnnav/qmake.patch b/ubahnnav/ubahnnav/qmake.patch
index e69de29..86c57b2 100644 (file)
--- a/ubahnnav/ubahnnav/qmake.patch
+++ b/ubahnnav/ubahnnav/qmake.patch
@@ -0,0 +1,48 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- /dev/null
++++ ubahnnav-0.3.1/src.pro
+@@ -0,0 +1,3 @@
++TEMPLATE = subdirs
++SUBDIRS = src/libsubwaymap src/ubahnnav
++
+--- /dev/null
++++ ubahnnav-0.3.1/src/libsubwaymap/libsubwaymap.pro
+@@ -0,0 +1,34 @@
++######################################################################
++# Automatically generated by qmake (1.06c) Sat Aug 28 18:47:05 2004
++######################################################################
++
++TEMPLATE = lib
++TARGET = subwaymap
++CONFIG = qt
++INCLUDEPATH += .
++
++# Input
++HEADERS += baseclasses.h \
++           debug.h \
++           Dijkstra.h \
++           Exceptions.h \
++           RouteFinder.h \
++           RouteFinderBase.h \
++           SMError.h \
++           SMXMLSubwayMapParser.h \
++           SMXMLSubwayMapParser_Qt.h \
++           SMXMLWriter.h \
++           SubwayGraph.h \
++           SubwayMap.h \
++           XMLBase.h
++SOURCES += baseclasses.cpp \
++           debug.cpp \
++           Dijkstra.cpp \
++           RouteFinder.cpp \
++           RouteFinderBase.cpp \
++           SMXMLSubwayMapParser.cpp \
++           SMXMLSubwayMapParser_Qt.cpp \
++           SMXMLWriter.cpp \
++           SubwayGraph.cpp \
++           SubwayMap.cpp \
++           XMLBase.cpp

diff --git a/ubahnnav/ubahnnav_0.3.1.oe b/ubahnnav/ubahnnav_0.3.1.oe
index 0b1211f..aab7dcf 100644 (file)
--- a/ubahnnav/ubahnnav_0.3.1.oe
+++ b/ubahnnav/ubahnnav_0.3.1.oe
@@ -8,7 +8,7 @@ MAINTAINER = "Dimitri Brukakis"
 APPNAME = "ubahnnav"
 APPTYPE = "binary"
 APPDESKTOP = "${S}/src/ubahnnav"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://ubahnstation.net/source/ubahnnav-${PV}.tar.gz \
           file://qmake.patch;patch=1"
@@ -17,7 +17,7 @@ S = "${WORKDIR}/ubahnnav-${PV}"
 inherit opie
 
 export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST = "LIBS+=-L${S} INCLUDEPATH+=${QTDIR}/include"
+EXTRA_QMAKEVARS_POST = "LIBS+=-L${S}"
 
 do_configure_prepend() {
        find . -name "Makefile"|xargs rm -f