libx11: added patch to alias locale ru_RU.utf8, closing #2526

diff --git a/packages/xorg-lib/libx11/ruutf8.patch b/packages/xorg-lib/libx11/ruutf8.patch
new file mode 100644 (file)
index 0000000..0822b30
--- /dev/null
+++ b/packages/xorg-lib/libx11/ruutf8.patch
@@ -0,0 +1,12 @@
+diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
+index a74ca75..ff5bc3f 100644
+--- a/nls/locale.alias.pre
++++ b/nls/locale.alias.pre
+@@ -898,6 +898,7 @@ ru_RU.cp1251:                                      ru_RU.CP1251
+ ru_RU.microsoftcp1251:                                ru_RU.CP1251
+ ru_RU.microsoft-cp1251:                               ru_RU.CP1251
+ ru_RU.MICROSOFT-CP1251:                               ru_RU.CP1251
++ru_RU.utf8:                                   ru_RU.UTF-8
+ #if defined(INCLUDE_ru_SU)
+ XCOMM ru_SU is redundant now
+ ru_SU:                                                ru_RU.KOI8-R

diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb
index d661ca9..5c4d8b7 100644 (file)
--- a/packages/xorg-lib/libx11_1.1.1.bb
+++ b/packages/xorg-lib/libx11_1.1.1.bb
@@ -1,6 +1,6 @@
 require xorg-lib-common.inc
 PE = "1"
-PR = "r1"
+PR = "r2"
 
 DESCRIPTION = "Base X libs."
 

diff --git a/packages/xorg-lib/xorg-lib-common.inc b/packages/xorg-lib/xorg-lib-common.inc
index e1f783e..85e5ce7 100644 (file)
--- a/packages/xorg-lib/xorg-lib-common.inc
+++ b/packages/xorg-lib/xorg-lib-common.inc
@@ -5,7 +5,8 @@ LICENSE = "MIT-X"
 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"
+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