diff options
| author | Richard Purdie <richard@openedhand.com> | 2005-09-22 22:02:48 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2005-09-22 22:02:48 +0000 |
| commit | 26a96fc12fb2df9e965087589da2ed6a3e39b5e4 (patch) | |
| tree | aa162fa89439bae50782e2528b02ed2a407c3131 /openembedded/packages/x11 | |
| parent | d18457f094de8532eb8921991303032cdb345fe9 (diff) | |
| download | openembedded-core-26a96fc12fb2df9e965087589da2ed6a3e39b5e4.tar.gz openembedded-core-26a96fc12fb2df9e965087589da2ed6a3e39b5e4.tar.bz2 openembedded-core-26a96fc12fb2df9e965087589da2ed6a3e39b5e4.tar.xz openembedded-core-26a96fc12fb2df9e965087589da2ed6a3e39b5e4.zip | |
Updates against mainline OE to fix various issues and make builds work again as a couple of poky changes got lost
git-svn-id: https://svn.o-hand.com/repos/poky@29 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/x11')
| -rw-r--r-- | openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch | 22 | ||||
| -rw-r--r-- | openembedded/packages/x11/x11_6.2.1.bb | 3 |
2 files changed, 24 insertions, 1 deletions
diff --git a/openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch b/openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch new file mode 100644 index 000000000..f43d38065 --- /dev/null +++ b/openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch @@ -0,0 +1,22 @@ +--- X11/src/ErrDes.c.orig 2005-09-03 16:15:48 +0200 ++++ X11/src/ErrDes.c 2005-09-03 16:16:03 +0200 +@@ -56,7 +56,7 @@ + #include <stdio.h> + + #ifndef ERRORDB +-#define ERRORDB "/usr/lib/X11/XErrorDB" ++#define ERRORDB "/usr/share/X11/XErrorDB" + #endif + + /* +--- X11/src/StrKeysym.c.orig 2005-09-03 16:41:18 +0200 ++++ X11/src/StrKeysym.c 2005-09-03 16:41:33 +0200 +@@ -36,7 +36,7 @@ + #include "Key.h" + + #ifndef KEYSYMDB +-#define KEYSYMDB "/usr/lib/X11/XKeysymDB" ++#define KEYSYMDB "/usr/share/X11/XKeysymDB" + #endif + + static Bool initialized; diff --git a/openembedded/packages/x11/x11_6.2.1.bb b/openembedded/packages/x11/x11_6.2.1.bb index d3a6941b9..121c1ddd9 100644 --- a/openembedded/packages/x11/x11_6.2.1.bb +++ b/openembedded/packages/x11/x11_6.2.1.bb @@ -7,9 +7,10 @@ DESCRIPTION = "Base X libs." FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" PROVIDES = "x11" -PR = "r2" +PR = "r3" SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \ + file://errordb-keysymdb-path-fix.patch;patch=1 \ file://autofoo.patch;patch=1" S = "${WORKDIR}/libX11-${PV}" |