xorg-lib: move ruutf8 patch to libx11

diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb
index 5c4d8b7..023f15c 100644 (file)
--- 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 45dc334..b7fb686 100644 (file)
--- 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 85e5ce7..b1c1153 100644 (file)
--- 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