diff options
| author |   Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
| commit | f45580a1527dccdda100eee7f25f9f2c41af4db8 (patch) | |
| tree | 2218d4955f368e1804d86f212cc78317b4327f77 /recipes/navit/files/navit.xml-so.patch | |
| parent | 887b437869709625f5323438808ded9990cf590a (diff) | |
| parent | e3df24d64a48aff19aa9960dd9308a071b243b09 (diff) | |
| download | openembedded-f45580a1527dccdda100eee7f25f9f2c41af4db8.tar.gz | |
Merge commit 'origin/shr/merge' into shr/testing2009
Conflicts:
conf/distro/include/sane-srcrevs.inc
recipes/enotes/enotes_svn.bb
recipes/intone-video/intone-video_svn.bb
recipes/intone/intone_svn.bb
recipes/shr/shr-wizard_git.bb
recipes/tasks/task-shr-minimal.bb
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to 'recipes/navit/files/navit.xml-so.patch')
| -rw-r--r-- | recipes/navit/files/navit.xml-so.patch | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/recipes/navit/files/navit.xml-so.patch b/recipes/navit/files/navit.xml-so.patch index 9151bc4a5e..c374756447 100644 --- a/recipes/navit/files/navit.xml-so.patch +++ b/recipes/navit/files/navit.xml-so.patch @@ -1,17 +1,13 @@ ---- navit/navit/navit.xml.orig 2009-07-19 13:08:16.000000000 +0200 -+++ navit/navit/navit.xml 2009-07-19 13:09:12.000000000 +0200 -@@ -6,10 +6,10 @@ - on upgrade. Rather copy it to ~/.navit/. Please read wiki --> - <config xmlns:xi="http://www.w3.org/2001/XInclude"> - <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="no"/> -- <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so" active="no"/> -+ <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so.0" ondemand="yes"/> -+ <plugin path="$NAVIT_LIBDIR/autoload/${NAVIT_LIBPREFIX}lib*.so.0"/> -+ <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libbinding_dbus.so.0" active="no"/> -+ <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so.0" active="no"/> - </plugins> - - <debug name="navit:do_draw" level="0"/> +--- navit-0.0.3/src/navit.xml.orig 2008-01-01 15:24:43.000000000 +0000 ++++ navit-0.0.3/src/navit.xml 2008-01-01 15:25:01.000000000 +0000 +@@ -1,8 +1,8 @@ + <?xml version="1.0" encoding="utf-8"?> + <!DOCTYPE navit SYSTEM "navit.dtd"> + <plugins> +- <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so"/> +- <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so" active="no" /> ++ <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so.0"/> ++ <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so.0" active="no" /> + </plugins> + <debug name="navit:do_draw" level="0" /> + <!-- |