[oe-commits] org.oe.dev xorg-lib: move ruutf8 patch to libx11

[koen commit]

xorg-lib: move ruutf8 patch to libx11

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 68f002bfdbf7c0cfe2a043b7055f5ae81fb10a62
ViewMTN: http://monotone.openembedded.org/revision.psp?id=68f002bfdbf7c0cfe2a043b7055f5ae81fb10a62
Files:
1
packages/xorg-lib/libx11_1.1.1.bb
packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
packages/xorg-lib/xorg-lib-common.inc
Diffs:

#
# mt diff -rfb1d8d05881bde082243b8b1fbc739f8a9fab90b -r68f002bfdbf7c0cfe2a043b7055f5ae81fb10a62
#
# 
# 
# patch "packages/xorg-lib/libx11_1.1.1.bb"
#  from [41432194303dfd3bc0fc3d4341d7126bf0dcd485]
#    to [d6ef52550aee66eb87bf539fabce336d695675b4]
# 
# patch "packages/xorg-lib/libx11_X11R7.1-1.0.1.bb"
#  from [4e1dd0bec2c1d87ca39582c00cfafdd50dc8850c]
#    to [e5cd0d9a352277e84015cafc6daedc9c9c273841]
# 
# patch "packages/xorg-lib/xorg-lib-common.inc"
#  from [9bfc333d7d95fe75b118f9da9daf3f38fcc28317]
#    to [f048d64e80ac2d2b270354e7b1a474ade27c56e4]
# 
============================================================
--- packages/xorg-lib/libx11_1.1.1.bb	41432194303dfd3bc0fc3d4341d7126bf0dcd485
+++ packages/xorg-lib/libx11_1.1.1.bb	d6ef52550aee66eb87bf539fabce336d695675b4
@@ -13,6 +13,8 @@ PACKAGES =+ "libx11-xcb"
 
 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.*"
============================================================
--- packages/xorg-lib/libx11_X11R7.1-1.0.1.bb	4e1dd0bec2c1d87ca39582c00cfafdd50dc8850c
+++ packages/xorg-lib/libx11_X11R7.1-1.0.1.bb	e5cd0d9a352277e84015cafc6daedc9c9c273841
@@ -1,9 +1,11 @@ require xorg-lib-common.inc
 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"
============================================================
--- packages/xorg-lib/xorg-lib-common.inc	9bfc333d7d95fe75b118f9da9daf3f38fcc28317
+++ packages/xorg-lib/xorg-lib-common.inc	f048d64e80ac2d2b270354e7b1a474ade27c56e4
@@ -6,7 +6,7 @@ SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE
 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