aboutsummaryrefslogtreecommitdiffstats
path: root/packages/xorg-lib
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-06-19 17:00:13 +0000
committerKoen Kooi <koen@openembedded.org>2007-06-19 17:00:13 +0000
commit60398274eb238b5a2a3e0b596f0f0e5c00bc1c21 (patch)
treee3f08a9f108f76261e2e9f51be4f33e1d9a45153 /packages/xorg-lib
parent0471241f809abdd0941629f959c59bf22e0ceab9 (diff)
downloadopenembedded-60398274eb238b5a2a3e0b596f0f0e5c00bc1c21.tar.gz
xorg-lib: move ruutf8 patch to libx11
Diffstat (limited to 'packages/xorg-lib')
-rw-r--r--packages/xorg-lib/libx11_1.1.1.bb2
-rw-r--r--packages/xorg-lib/libx11_X11R7.1-1.0.1.bb2
-rw-r--r--packages/xorg-lib/xorg-lib-common.inc2
3 files changed, 5 insertions, 1 deletions
diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb
index 5c4d8b7088..023f15cef3 100644
--- a/packages/xorg-lib/libx11_1.1.1.bb
+++ b/packages/xorg-lib/libx11_1.1.1.bb
@@ -13,6 +13,8 @@ XORG_PN = "libX11"
PACKAGES =+ "libx11-xcb"
+SRC_URI += " file://ruutf8.patch;patch=1"
+
FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
FILES_${PN}-xcb = "${libdir}/libX11-xcb.so.*"
diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
index 45dc334c92..b7fb686a60 100644
--- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
@@ -1,9 +1,11 @@
require xorg-lib-common.inc
+
PR = "r4"
DESCRIPTION = "Base X libs."
SRC_URI += "file://makekeys.diff;patch=1"
+SRC_URI += " file://ruutf8.patch;patch=1"
DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
libxdmcp xf86bigfontproto kbproto inputproto"
diff --git a/packages/xorg-lib/xorg-lib-common.inc b/packages/xorg-lib/xorg-lib-common.inc
index 85e5ce782d..b1c1153bf4 100644
--- a/packages/xorg-lib/xorg-lib-common.inc
+++ b/packages/xorg-lib/xorg-lib-common.inc
@@ -6,7 +6,7 @@ DEPENDS = "util-macros xorg-headers-native"
XORG_PN = "${PN}"
XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}"
SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/lib/${XORG_PN}-${PV}.tar.bz2 \
- file://ruutf8.patch;patch=1"
+"
S = "${WORKDIR}/${XORG_PN}-${PV}"
inherit autotools pkgconfig