commit 95a6db5a08c9e9d2f5c285d06825a30d703236d2
Author: Jakub Bogusz <[email protected]>
Date: Wed Oct 5 17:31:32 2016 +0200
- updated to 1.6.4
- updated glibc-locale_sync patch
xorg-lib-libX11-glibc-locale_sync.patch | 65 +++++++++++++++++----------------
xorg-lib-libX11.spec | 64 ++++++++++++++++++++++++++------
2 files changed, 87 insertions(+), 42 deletions(-)
---
diff --git a/xorg-lib-libX11.spec b/xorg-lib-libX11.spec
index a6ed62b..1cd10da 100644
--- a/xorg-lib-libX11.spec
+++ b/xorg-lib-libX11.spec
@@ -5,21 +5,21 @@
Summary: Core X11 protocol client library
Summary(pl.UTF-8): Podstawowa biblioteka kliencka protokołu X11
Name: xorg-lib-libX11
-Version: 1.6.3
-Release: 2
+Version: 1.6.4
+Release: 1
License: MIT
Group: X11/Libraries
-Source0:
http://xorg.freedesktop.org/releases/individual/lib/libX11-%{version}.tar.bz2
-# Source0-md5: 2e36b73f8a42143142dda8129f02e4e0
+Source0:
https://xorg.freedesktop.org/releases/individual/lib/libX11-%{version}.tar.bz2
+# Source0-md5: 6d54227082f3aa2c596f0b3a3fbb9175
# sync locales and their encodings with glibc
Patch0: %{name}-glibc-locale_sync.patch
-URL: http://xorg.freedesktop.org/
+URL: https://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
BuildRequires: cpp
BuildRequires: docbook-dtd43-xml
BuildRequires: libtool
-BuildRequires: libxcb-devel >= 1.2
+BuildRequires: libxcb-devel >= 1.11.1
BuildRequires: perl-Encode
BuildRequires: pkgconfig >= 1:0.19
BuildRequires: sed >= 4.0
@@ -33,7 +33,7 @@ BuildRequires: xorg-proto-xproto-devel >= 7.0.21
BuildRequires: xorg-sgml-doctools >= 1.10
BuildRequires: xorg-util-util-macros >= 1.15
Requires: %{name}-data = %{version}-%{release}
-Requires: libxcb >= 1.2
+Requires: libxcb >= 1.11.1
Obsoletes: libX11
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -60,7 +60,7 @@ Summary: Header files for libX11 library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libX11
Group: X11/Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: libxcb-devel >= 1.2
+Requires: libxcb-devel >= 1.11.1
Requires: xorg-proto-kbproto-devel
Requires: xorg-proto-xproto-devel >= 7.0.21
Obsoletes: libX11-devel
@@ -219,6 +219,7 @@ fi
%lang(ko) %{_datadir}/X11/locale/ko
%lang(ko) %{_datadir}/X11/locale/ko_KR.UTF-8
%lang(pt_BR) %{_datadir}/X11/locale/pt_BR.UTF-8
+%lang(pt) %{_datadir}/X11/locale/pt_PT.UTF-8
%lang(ru) %{_datadir}/X11/locale/ru_RU.UTF-8
%lang(th) %{_datadir}/X11/locale/th_TH
%lang(th) %{_datadir}/X11/locale/th_TH.UTF-8
@@ -234,7 +235,8 @@ fi
%lang(zh_TW) %{_datadir}/X11/locale/zh_TW
%lang(zh_TW) %{_datadir}/X11/locale/zh_TW.UTF-8
%lang(zh_TW) %{_datadir}/X11/locale/zh_TW.big5
-%{_mandir}/man5/*Compose.5*
+%{_mandir}/man5/Compose.5*
+%{_mandir}/man5/XCompose.5*
%files devel
%defattr(644,root,root,755)
@@ -244,11 +246,51 @@ fi
%{_libdir}/libX11.la
%{_libdir}/libX11-xcb.la
%{_includedir}/X11/ImUtil.h
-%{_includedir}/X11/X*.h
+%{_includedir}/X11/XKBlib.h
+%{_includedir}/X11/Xcms.h
+%{_includedir}/X11/Xlib.h
+%{_includedir}/X11/Xlib-xcb.h
+%{_includedir}/X11/XlibConf.h
+%{_includedir}/X11/Xlibint.h
+%{_includedir}/X11/Xlocale.h
+%{_includedir}/X11/Xregion.h
+%{_includedir}/X11/Xresource.h
+%{_includedir}/X11/Xutil.h
%{_includedir}/X11/cursorfont.h
%{_pkgconfigdir}/x11.pc
%{_pkgconfigdir}/x11-xcb.pc
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/AllPlanes.3*
+%{_mandir}/man3/Bitmap*.3*
+%{_mandir}/man3/BlackPixel*.3*
+%{_mandir}/man3/CellsOfScreen.3*
+%{_mandir}/man3/ClientWhitePointOfCCC.3*
+%{_mandir}/man3/ConnectionNumber.3*
+%{_mandir}/man3/Default*.3*
+%{_mandir}/man3/Display*.3*
+%{_mandir}/man3/DoesBackingStore.3*
+%{_mandir}/man3/DoesSaveUnders.3*
+%{_mandir}/man3/EventMaskOfScreen.3*
+%{_mandir}/man3/HeightMMOfScreen.3*
+%{_mandir}/man3/HeightOfScreen.3*
+%{_mandir}/man3/ImageByteOrder.3*
+%{_mandir}/man3/Is*Key.3*
+%{_mandir}/man3/LastKnownRequestProcessed.3*
+%{_mandir}/man3/MaxCmapsOfScreen.3*
+%{_mandir}/man3/MinCmapsOfScreen.3*
+%{_mandir}/man3/NextRequest.3*
+%{_mandir}/man3/PlanesOfScreen.3*
+%{_mandir}/man3/ProtocolRevision.3*
+%{_mandir}/man3/ProtocolVersion.3*
+%{_mandir}/man3/QLength.3*
+%{_mandir}/man3/RootWindow*.3*
+%{_mandir}/man3/Screen*.3*
+%{_mandir}/man3/ServerVendor.3*
+%{_mandir}/man3/VendorRelease.3*
+%{_mandir}/man3/VisualOfCCC.3*
+%{_mandir}/man3/WhitePixel*.3*
+%{_mandir}/man3/WidthMMOfScreen.3*
+%{_mandir}/man3/WidthOfScreen.3*
+%{_mandir}/man3/X*.3*
%if %{with static_libs}
%files static
diff --git a/xorg-lib-libX11-glibc-locale_sync.patch
b/xorg-lib-libX11-glibc-locale_sync.patch
index 170454e..bda7dd9 100644
--- a/xorg-lib-libX11-glibc-locale_sync.patch
+++ b/xorg-lib-libX11-glibc-locale_sync.patch
@@ -626,9 +626,9 @@
+}
+
+END XLC_XLOCALE
---- libX11-1.6.3/configure.ac.orig 2015-03-15 08:16:43.911883513 +0100
-+++ libX11-1.6.3/configure.ac 2015-03-15 08:22:27.335202434 +0100
-@@ -434,10 +434,10 @@
+--- libX11-1.6.4/configure.ac.orig 2016-10-05 05:41:51.461791657 +0200
++++ libX11-1.6.4/configure.ac 2016-10-05 16:19:07.591355076 +0200
+@@ -359,10 +359,10 @@
am_ET.UTF-8 armscii-8 C cs_CZ.UTF-8 el_GR.UTF-8 en_US.UTF-8 \
fi_FI.UTF-8 georgian-academy georgian-ps ibm-cp1133 iscii-dev \
isiri-3342 iso8859-1 iso8859-10 iso8859-11 iso8859-13 iso8859-14 \
@@ -638,11 +638,11 @@
ja_JP.UTF-8 ja.SJIS km_KH.UTF-8 ko koi8-c koi8-r \
- koi8-u ko_KR.UTF-8 microsoft-cp1251 microsoft-cp1255 \
+ koi8-t koi8-u ko_KR.UTF-8 microsoft-cp1251
microsoft-cp1255 \
- microsoft-cp1256 mulelao-1 nokhchi-1 pt_BR.UTF-8 ru_RU.UTF-8 \
- sr_CS.UTF-8 tatar-cyr th_TH th_TH.UTF-8 tscii-0 vi_VN.tcvn \
- vi_VN.viscii zh_CN zh_CN.gb18030 zh_CN.gbk zh_CN.UTF-8 \
---- libX11-1.6.3/nls/compose.dir.pre.orig 2015-03-09 23:28:45.000000000
+0100
-+++ libX11-1.6.3/nls/compose.dir.pre 2015-03-15 08:26:43.565191680 +0100
+ microsoft-cp1256 mulelao-1 nokhchi-1 pt_BR.UTF-8 pt_PT.UTF-8 \
+ ru_RU.UTF-8 sr_CS.UTF-8 tatar-cyr th_TH th_TH.UTF-8 tscii-0 \
+ vi_VN.tcvn vi_VN.viscii zh_CN zh_CN.gb18030 \
+--- libX11-1.6.4/nls/compose.dir.pre.orig 2016-08-17 10:56:16.000000000
+0200
++++ libX11-1.6.4/nls/compose.dir.pre 2016-10-05 16:20:57.034687134 +0200
@@ -5,7 +5,9 @@
XCOMM
XCOMM
@@ -851,7 +851,7 @@
en_US.UTF-8/Compose: ca_ES.UTF-8
en_US.UTF-8/Compose: ca_FR.UTF-8
en_US.UTF-8/Compose: ca_IT.UTF-8
- en_US.UTF-8/Compose: cs_CZ.UTF-8
+ cs_CZ.UTF-8/Compose: cs_CZ.UTF-8
+en_US.UTF-8/Compose: csb_PL.UTF-8
en_US.UTF-8/Compose: cy_GB.UTF-8
en_US.UTF-8/Compose: da_DK.UTF-8
@@ -930,7 +930,7 @@
en_US.UTF-8/Compose: pl_PL.UTF-8
-en_US.UTF-8/Compose: pp_AN.UTF-8
pt_BR.UTF-8/Compose: pt_BR.UTF-8
- en_US.UTF-8/Compose: pt_PT.UTF-8
+ pt_PT.UTF-8/Compose: pt_PT.UTF-8
en_US.UTF-8/Compose: ro_RO.UTF-8
@@ -434,13 +462,16 @@
en_US.UTF-8/Compose: sh_BA.UTF-8
@@ -963,8 +963,8 @@
en_US.UTF-8/Compose: tr_TR.UTF-8
en_US.UTF-8/Compose: ts_ZA.UTF-8
en_US.UTF-8/Compose: tt_RU.UTF-8
---- libX11-1.6.0/nls/locale.alias.pre.orig 2013-06-04 04:21:16.000000000
+0200
-+++ libX11-1.6.0/nls/locale.alias.pre 2013-06-04 21:39:05.426350027 +0200
+--- libX11-1.6.4/nls/locale.alias.pre.orig 2016-08-17 10:56:16.000000000
+0200
++++ libX11-1.6.4/nls/locale.alias.pre 2016-10-05 16:21:27.391353541 +0200
@@ -17,11 +17,21 @@
English_United-States.437: C
C.UTF-8: en_US.UTF-8
@@ -1470,12 +1470,12 @@
kl_GL.ISO-8859-1: kl_GL.ISO8859-1
-kl_GL.iso885915: kl_GL.ISO8859-15
kl_GL.utf8: kl_GL.UTF-8
- km_KH: mk_KH.UTF-8
- km_KH.utf8: mk_KH.UTF-8
+ km_KH: km_KH.UTF-8
+ km_KH.utf8: km_KH.UTF-8
@@ -752,6 +841,9 @@
ks_IN.utf8: ks_IN.UTF-8
- ks_IN@devanagari: [email protected]
- [email protected]: [email protected]
+ ks_IN@devanagari: ks_IN.UTF-8@devanagari
+ ks_IN.utf8@devanagari: ks_IN.UTF-8@devanagari
+ku: ku_TR.UTF-8
+ku_TR: ku_TR.UTF-8
+ku_TR.utf8: ku_TR.UTF-8
@@ -2015,8 +2015,8 @@
zu_ZA.utf8: zu_ZA.UTF-8
XCOMM The following locale names are used in SCO 3.0
---- libX11-1.6.1/nls/locale.dir.pre.orig 2013-07-30 06:30:01.000000000
+0200
-+++ libX11-1.6.1/nls/locale.dir.pre 2013-08-06 16:36:37.286639210 +0200
+--- libX11-1.6.4/nls/locale.dir.pre.orig 2016-08-17 10:56:16.000000000
+0200
++++ libX11-1.6.4/nls/locale.dir.pre 2016-10-05 16:24:58.051351064 +0200
@@ -6,8 +6,11 @@
XCOMM
@@ -2224,7 +2224,7 @@
en_US.UTF-8/XLC_LOCALE: ar_QA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_SA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_SD.UTF-8
-@@ -297,13 +316,15 @@
+@@ -298,13 +317,15 @@
en_US.UTF-8/XLC_LOCALE: bn_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: bo_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: br_FR.UTF-8
@@ -2234,14 +2234,14 @@
en_US.UTF-8/XLC_LOCALE: ca_ES.UTF-8
en_US.UTF-8/XLC_LOCALE: ca_FR.UTF-8
en_US.UTF-8/XLC_LOCALE: ca_IT.UTF-8
- en_US.UTF-8/XLC_LOCALE: cs_CZ.UTF-8
+ cs_CZ.UTF-8/XLC_LOCALE: cs_CZ.UTF-8
+en_US.UTF-8/XLC_LOCALE: csb_PL.UTF-8
en_US.UTF-8/XLC_LOCALE: cy_GB.UTF-8
-en_US.UTF-8/XLC_LOCALE: cs_CZ.UTF-8
en_US.UTF-8/XLC_LOCALE: da_DK.UTF-8
en_US.UTF-8/XLC_LOCALE: de_AT.UTF-8
en_US.UTF-8/XLC_LOCALE: de_BE.UTF-8
-@@ -330,7 +351,6 @@
+@@ -331,7 +352,6 @@
en_US.UTF-8/XLC_LOCALE: en_PH.UTF-8
en_US.UTF-8/XLC_LOCALE: en_SG.UTF-8
en_US.UTF-8/XLC_LOCALE: en_TT.UTF-8
@@ -2249,7 +2249,7 @@
en_US.UTF-8/XLC_LOCALE: en_US.UTF-8
en_US.UTF-8/XLC_LOCALE: en_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: en_ZW.UTF-8
-@@ -360,6 +380,7 @@
+@@ -361,6 +381,7 @@
en_US.UTF-8/XLC_LOCALE: eu_ES.UTF-8
en_US.UTF-8/XLC_LOCALE: fa_IR.UTF-8
en_US.UTF-8/XLC_LOCALE: fi_FI.UTF-8
@@ -2257,7 +2257,7 @@
en_US.UTF-8/XLC_LOCALE: fo_FO.UTF-8
en_US.UTF-8/XLC_LOCALE: fr_BE.UTF-8
en_US.UTF-8/XLC_LOCALE: fr_CA.UTF-8
-@@ -368,6 +389,7 @@
+@@ -369,6 +390,7 @@
en_US.UTF-8/XLC_LOCALE: fr_LU.UTF-8
en_US.UTF-8/XLC_LOCALE: ga_IE.UTF-8
en_US.UTF-8/XLC_LOCALE: gd_GB.UTF-8
@@ -2265,7 +2265,7 @@
en_US.UTF-8/XLC_LOCALE: gl_ES.UTF-8
en_US.UTF-8/XLC_LOCALE: gu_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: gv_GB.UTF-8
-@@ -375,6 +397,7 @@
+@@ -376,6 +398,7 @@
en_US.UTF-8/XLC_LOCALE: hi_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: hne_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: hr_HR.UTF-8
@@ -2273,7 +2273,7 @@
en_US.UTF-8/XLC_LOCALE: hu_HU.UTF-8
en_US.UTF-8/XLC_LOCALE: hy_AM.UTF-8
en_US.UTF-8/XLC_LOCALE: id_ID.UTF-8
-@@ -394,6 +417,9 @@
+@@ -395,6 +418,9 @@
en_US.UTF-8/XLC_LOCALE: ku_TR.UTF-8
en_US.UTF-8/XLC_LOCALE: kw_GB.UTF-8
en_US.UTF-8/XLC_LOCALE: ky_KG.UTF-8
@@ -2283,7 +2283,7 @@
en_US.UTF-8/XLC_LOCALE: lo_LA.UTF-8
en_US.UTF-8/XLC_LOCALE: lt_LT.UTF-8
en_US.UTF-8/XLC_LOCALE: lv_LV.UTF-8
-@@ -401,26 +427,27 @@
+@@ -402,26 +428,27 @@
en_US.UTF-8/XLC_LOCALE: mi_NZ.UTF-8
en_US.UTF-8/XLC_LOCALE: mk_MK.UTF-8
en_US.UTF-8/XLC_LOCALE: ml_IN.UTF-8
@@ -2313,12 +2313,13 @@
en_US.UTF-8/XLC_LOCALE: pl_PL.UTF-8
-en_US.UTF-8/XLC_LOCALE: pp_AN.UTF-8
pt_BR.UTF-8/XLC_LOCALE: pt_BR.UTF-8
- en_US.UTF-8/XLC_LOCALE: pt_PT.UTF-8
+ pt_PT.UTF-8/XLC_LOCALE: pt_PT.UTF-8
en_US.UTF-8/XLC_LOCALE: ro_RO.UTF-8
-@@ -432,15 +459,17 @@
- en_US.UTF-8/XLC_LOCALE: [email protected]
+@@ -432,17 +459,19 @@
+ en_US.UTF-8/XLC_LOCALE: sd_IN.UTF-8
+ en_US.UTF-8/XLC_LOCALE: sd_IN.UTF-8@devanagari
en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8
- en_US.UTF-8/XLC_LOCALE: sh_BA.UTF-8
+-en_US.UTF-8/XLC_LOCALE: sh_BA.UTF-8
-en_US.UTF-8/XLC_LOCALE: sh_YU.UTF-8
en_US.UTF-8/XLC_LOCALE: si_LK.UTF-8
+en_US.UTF-8/XLC_LOCALE: sid_ET.UTF-8
@@ -2330,13 +2331,15 @@
+en_US.UTF-8/XLC_LOCALE: so_SO.UTF-8
en_US.UTF-8/XLC_LOCALE: sq_AL.UTF-8
-en_US.UTF-8/XLC_LOCALE: sr_CS.UTF-8
++en_US.UTF-8/XLC_LOCALE: sr_BA.UTF-8
en_US.UTF-8/XLC_LOCALE: sr_ME.UTF-8
en_US.UTF-8/XLC_LOCALE: sr_RS.UTF-8
+ en_US.UTF-8/XLC_LOCALE: sr_RS.UTF-8@latin
-en_US.UTF-8/XLC_LOCALE: sr_YU.UTF-8
en_US.UTF-8/XLC_LOCALE: ss_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: st_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: sv_FI.UTF-8
-@@ -451,8 +480,11 @@
+@@ -453,8 +482,11 @@
th_TH.UTF-8/XLC_LOCALE: th_TH.UTF-8
en_US.UTF-8/XLC_LOCALE: ti_ER.UTF-8
en_US.UTF-8/XLC_LOCALE: ti_ET.UTF-8
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-lib-libX11.git/commitdiff/95a6db5a08c9e9d2f5c285d06825a30d703236d2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
