- updated to 1.6.8

- updated glibc-locale_sync patch

diff --git a/xorg-lib-libX11-glibc-locale_sync.patch b/xorg-lib-libX11-glibc-locale_sync.patch
index 6bf623c8e2db5c6187c557387b0a705c5839cf42..17dce7098c3f6e8e45b4ad87a33280372e716358 100644 (file)
--- a/xorg-lib-libX11-glibc-locale_sync.patch
+++ b/xorg-lib-libX11-glibc-locale_sync.patch
@@ -641,8 +641,8 @@
   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
+--- libX11-1.6.8/nls/compose.dir.pre.orig      2019-06-17 16:47:35.000000000 +0200
++++ libX11-1.6.8/nls/compose.dir.pre   2019-06-19 09:03:41.643835151 +0200
 @@ -5,7 +5,9 @@
  XCOMM
  XCOMM
@@ -823,16 +823,10 @@
  koi8-u/Compose:                       uk_UA.KOI8-U
  iso8859-5/Compose:            uk_UA.ISO8859-5
  microsoft-cp1256/Compose:     ur_PK.CP1256
-@@ -262,13 +278,18 @@
- zh_CN.gb18030/Compose:                zh_CN.gb18030
- zh_HK.big5/Compose:           zh_HK.big5
- zh_HK.big5hkscs/Compose:      zh_HK.big5hkscs
-+zh_CN/Compose:                        zh_SG.gb2312
- zh_TW.big5/Compose:           zh_TW.big5
- zh_TW/Compose:                        zh_TW.eucTW
- iso8859-1/Compose:            zu_ZA.ISO8859-1
+@@ -268,8 +284,12 @@
  XCOMM
  XCOMM
+ en_US.UTF-8/Compose:          C.UTF-8
 +en_US.UTF-8/Compose:          aa_DJ.UTF-8
 +en_US.UTF-8/Compose:          aa_ER.UTF-8
 +en_US.UTF-8/Compose:          aa_ET.UTF-8
@@ -842,7 +836,7 @@
  en_US.UTF-8/Compose:          ar_AA.UTF-8
  en_US.UTF-8/Compose:          ar_AE.UTF-8
  en_US.UTF-8/Compose:          ar_BH.UTF-8
-@@ -297,11 +318,13 @@
+@@ -299,11 +319,13 @@
  en_US.UTF-8/Compose:          bo_IN.UTF-8
  en_US.UTF-8/Compose:          br_FR.UTF-8
  en_US.UTF-8/Compose:          bs_BA.UTF-8
@@ -856,7 +850,7 @@
  en_US.UTF-8/Compose:          cy_GB.UTF-8
  en_US.UTF-8/Compose:          da_DK.UTF-8
  en_US.UTF-8/Compose:          de_AT.UTF-8
-@@ -318,7 +341,6 @@
+@@ -321,7 +343,6 @@
  en_US.UTF-8/Compose:          en_BZ.UTF-8
  en_US.UTF-8/Compose:          en_CA.UTF-8
  en_US.UTF-8/Compose:          en_DK.UTF-8
@@ -864,7 +858,7 @@
  en_US.UTF-8/Compose:          en_GB.UTF-8
  en_US.UTF-8/Compose:          en_HK.UTF-8
  en_US.UTF-8/Compose:          en_IE.UTF-8
-@@ -329,7 +351,6 @@
+@@ -332,7 +353,6 @@
  en_US.UTF-8/Compose:          en_PH.UTF-8
  en_US.UTF-8/Compose:          en_SG.UTF-8
  en_US.UTF-8/Compose:          en_TT.UTF-8
@@ -872,7 +866,7 @@
  en_US.UTF-8/Compose:          en_US.UTF-8
  en_US.UTF-8/Compose:          en_ZA.UTF-8
  en_US.UTF-8/Compose:          en_ZW.UTF-8
-@@ -367,6 +388,7 @@
+@@ -370,6 +390,7 @@
  en_US.UTF-8/Compose:          fr_LU.UTF-8
  en_US.UTF-8/Compose:          ga_IE.UTF-8
  en_US.UTF-8/Compose:          gd_GB.UTF-8
@@ -880,7 +874,7 @@
  en_US.UTF-8/Compose:          gl_ES.UTF-8
  en_US.UTF-8/Compose:          gu_IN.UTF-8
  en_US.UTF-8/Compose:          gv_GB.UTF-8
-@@ -374,6 +396,7 @@
+@@ -377,6 +398,7 @@
  en_US.UTF-8/Compose:          hi_IN.UTF-8
  en_US.UTF-8/Compose:          hne_IN.UTF-8
  en_US.UTF-8/Compose:          hr_HR.UTF-8
@@ -888,7 +882,7 @@
  en_US.UTF-8/Compose:          hu_HU.UTF-8
  en_US.UTF-8/Compose:          hy_AM.UTF-8
  en_US.UTF-8/Compose:          id_ID.UTF-8
-@@ -393,6 +416,9 @@
+@@ -396,6 +418,9 @@
  en_US.UTF-8/Compose:          ku_TR.UTF-8
  en_US.UTF-8/Compose:          kw_GB.UTF-8
  en_US.UTF-8/Compose:          ky_KG.UTF-8
@@ -898,7 +892,7 @@
  en_US.UTF-8/Compose:          lo_LA.UTF-8
  en_US.UTF-8/Compose:          lt_LT.UTF-8
  en_US.UTF-8/Compose:          lv_LV.UTF-8
-@@ -400,27 +426,29 @@
+@@ -403,27 +428,29 @@
  en_US.UTF-8/Compose:          mi_NZ.UTF-8
  en_US.UTF-8/Compose:          mk_MK.UTF-8
  en_US.UTF-8/Compose:          ml_IN.UTF-8
@@ -932,7 +926,7 @@
  pt_BR.UTF-8/Compose:          pt_BR.UTF-8
  pt_PT.UTF-8/Compose:          pt_PT.UTF-8
  en_US.UTF-8/Compose:          ro_RO.UTF-8
-@@ -434,13 +462,16 @@
+@@ -437,13 +464,16 @@
  en_US.UTF-8/Compose:          sh_BA.UTF-8
  en_US.UTF-8/Compose:          sh_YU.UTF-8
  en_US.UTF-8/Compose:          si_LK.UTF-8
@@ -951,7 +945,7 @@
  en_US.UTF-8/Compose:          ss_ZA.UTF-8
  en_US.UTF-8/Compose:          st_ZA.UTF-8
  en_US.UTF-8/Compose:          sv_FI.UTF-8
-@@ -451,8 +482,11 @@
+@@ -454,8 +484,11 @@
  th_TH.UTF-8/Compose:          th_TH.UTF-8
  en_US.UTF-8/Compose:          ti_ER.UTF-8
  en_US.UTF-8/Compose:          ti_ET.UTF-8

diff --git a/xorg-lib-libX11.spec b/xorg-lib-libX11.spec
index 9d135a1734222ba0937ff58d30ec1dd1417e73c0..2e9aabf035e9b268dce34a7e976c43af992837a2 100644 (file)
--- a/xorg-lib-libX11.spec
+++ b/xorg-lib-libX11.spec
@@ -5,12 +5,12 @@
 Summary:       Core X11 protocol client library
 Summary(pl.UTF-8):     Podstawowa biblioteka kliencka protokołu X11
 Name:          xorg-lib-libX11
-Version:       1.6.7
+Version:       1.6.8
 Release:       1
 License:       MIT
 Group:         X11/Libraries
 Source0:       https://xorg.freedesktop.org/releases/individual/lib/libX11-%{version}.tar.bz2
-# Source0-md5: 034fdd6cc5393974d88aec6f5bc96162
+# Source0-md5: c5fa5a86a20e3591bed6c046498d4b8f
 # sync locales and their encodings with glibc
 Patch0:                %{name}-glibc-locale_sync.patch
 URL:           https://xorg.freedesktop.org/
@@ -161,7 +161,7 @@ fi
 
 %files data
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS COPYING ChangeLog README.md
 %dir %{_datadir}/X11
 %{_datadir}/X11/XErrorDB
 %{_datadir}/X11/Xcms.txt