diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2010-01-10 21:07:57 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2010-01-10 21:07:57 +0000 |
| commit | 09be6bb208f5ecc2a00274038866f5fb3b25c5fd (patch) | |
| tree | 85c28fadcdfd4172a9959486369fdd55a2fef130 /recipes/navit/files | |
| parent | 8a3b0c0dd65c3c2def554af01446b9ee09725355 (diff) | |
| parent | f2934215635d101459eb15b3505843370c20c6ec (diff) | |
Merge branch 'org.openembedded.dev' of git+ssh://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/navit/files')
| -rw-r--r-- | recipes/navit/files/navit.desktop | 2 | ||||
| -rw-r--r-- | recipes/navit/files/navit.xml | 2 | ||||
| -rw-r--r-- | recipes/navit/files/plugins.xml | 6 | ||||
| -rw-r--r-- | recipes/navit/files/shr/navit.desktop | 2 | ||||
| -rw-r--r-- | recipes/navit/files/shr/navitD.desktop | 2 |
5 files changed, 10 insertions, 4 deletions
diff --git a/recipes/navit/files/navit.desktop b/recipes/navit/files/navit.desktop index 05ecc1d4ee..df16d492bb 100644 --- a/recipes/navit/files/navit.desktop +++ b/recipes/navit/files/navit.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Navit Comment=GPS Navigation -Exec=navit +Exec=unset LC_ALL && navit Icon=navit Terminal=false Type=Application diff --git a/recipes/navit/files/navit.xml b/recipes/navit/files/navit.xml index dafa6aa498..79ee4618d4 100644 --- a/recipes/navit/files/navit.xml +++ b/recipes/navit/files/navit.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE config SYSTEM "navit.dtd"> <config xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/plugins)"/> + <xi:include href="/usr/share/navit/plugins.xml"/> <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/debug)"/> <navit center="4808 N 1134 E" zoom="256" tracking="1" orientation="-1" recent_dest="10" drag_bitmap="1"> diff --git a/recipes/navit/files/plugins.xml b/recipes/navit/files/plugins.xml new file mode 100644 index 0000000000..015b05517f --- /dev/null +++ b/recipes/navit/files/plugins.xml @@ -0,0 +1,6 @@ +<plugins> + <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so" ondemand="yes"/> + <plugin path="$NAVIT_LIBDIR/autoload/${NAVIT_LIBPREFIX}lib*.so"/> + <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libbinding_dbus.so" active="yes"/> + <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so" active="no"/> +</plugins> diff --git a/recipes/navit/files/shr/navit.desktop b/recipes/navit/files/shr/navit.desktop index d313d6a63e..1380fdbbde 100644 --- a/recipes/navit/files/shr/navit.desktop +++ b/recipes/navit/files/shr/navit.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Navit Comment=GPS Navigation -Exec=fsoraw -r CPU,GPS -- navit +Exec=unset LC_ALL && fsoraw -rf CPU,GPS -- navit Icon=navit Terminal=false Type=Application diff --git a/recipes/navit/files/shr/navitD.desktop b/recipes/navit/files/shr/navitD.desktop index 9a2378a3ea..69360c7ed6 100644 --- a/recipes/navit/files/shr/navitD.desktop +++ b/recipes/navit/files/shr/navitD.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=NavitD Comment=GPS Navigation Display blanking disabled -Exec=fsoraw -r CPU,GPS,Display -- navit +Exec=unset LC_ALL && fsoraw -rf CPU,GPS,Display -- navit Icon=navitD Terminal=false Type=Application |