diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2005-09-03 15:09:23 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-03 15:09:23 +0000 |
| commit | 3679963662accca942add8faec1cce9adcf85ff6 (patch) | |
| tree | a2f4ed24fc2e82adebc1a763a55022f07b69a4fe /packages | |
| parent | 4b7b69b9a0900b6c430c2bff6f32c97956d877bd (diff) | |
x11-cvs: make libx11 look for XErrorDB and XKeysymDB in the right place
- This closes bug #292.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/x11/files/errordb-keysymdb-path-fix.patch | 22 | ||||
| -rw-r--r-- | packages/x11/x11_cvs.bb | 5 |
2 files changed, 25 insertions, 2 deletions
diff --git a/packages/x11/files/errordb-keysymdb-path-fix.patch b/packages/x11/files/errordb-keysymdb-path-fix.patch new file mode 100644 index 0000000000..f43d38065e --- /dev/null +++ b/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/packages/x11/x11_cvs.bb b/packages/x11/x11_cvs.bb index 691b2c71e2..3f394df062 100644 --- a/packages/x11/x11_cvs.bb +++ b/packages/x11/x11_cvs.bb @@ -1,6 +1,6 @@ PV = "6.2.1cvs${CVSDATE}" LICENSE = "XFree86" -PR = "r4" +PR = "r5" SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Greg Gilbert <greg@treke.net>" @@ -10,7 +10,8 @@ FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" PROVIDES = "x11" -SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=X11" +SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=X11 \ + file://errordb-keysymdb-path-fix.patch;patch=1" S = "${WORKDIR}/X11" inherit autotools pkgconfig |