From 067b3f5b40800e123623649b7bdf8d2b610b07197014b00d29a6af52e77c9b55 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 26 Mar 2013 15:03:49 +0000 Subject: [PATCH] Accepting request 160905 from home:tobijk:X11:XOrg Review Request for 1.5.99.901 (1.6RC1) OBS-URL: https://build.opensuse.org/request/show/160905 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libX11?expand=0&rev=14 --- Xcms.diff | 24 --------- bug-221326-xim-sync.patch | 6 +-- bug-239698_libx11.diff | 8 --- bug153744.diff | 13 ----- compose-zh_CN.UTF-8.diff | 10 ---- en-locales.diff | 100 +------------------------------------- libX11-1.5.0.tar.bz2 | 3 -- libX11-1.5.99.901.tar.bz2 | 3 ++ libX11.changes | 15 ++++++ libX11.spec | 20 +++----- p_khmer-locale.diff | 21 -------- p_new-locales.diff | 36 -------------- 12 files changed, 29 insertions(+), 230 deletions(-) delete mode 100644 Xcms.diff delete mode 100644 bug153744.diff delete mode 100644 compose-zh_CN.UTF-8.diff delete mode 100644 libX11-1.5.0.tar.bz2 create mode 100644 libX11-1.5.99.901.tar.bz2 delete mode 100644 p_khmer-locale.diff delete mode 100644 p_new-locales.diff diff --git a/Xcms.diff b/Xcms.diff deleted file mode 100644 index f0daf53..0000000 --- a/Xcms.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -u -p src/xcms.orig//Makefile.am src/xcms/Makefile.am ---- src/xcms.orig//Makefile.am 2008-08-30 03:53:23.926805061 +0200 -+++ src/xcms/Makefile.am 2008-08-30 03:54:57.018919743 +0200 -@@ -82,7 +82,7 @@ libxcms_la_SOURCES = \ - xyY.c \ - Xcmsint.h - --X11dir = $(libdir)/X11 -+X11dir = $(datadir)/X11 - dist_X11_DATA = Xcms.txt - - -diff -u -p src/xcms.orig//cmsColNm.c src/xcms/cmsColNm.c ---- src/xcms.orig//cmsColNm.c 2008-08-30 03:53:23.390781370 +0200 -+++ src/xcms/cmsColNm.c 2008-08-30 03:56:01.505770138 +0200 -@@ -56,7 +56,7 @@ static Status LoadColornameDB(void); - * #define declarations local to this package. - */ - #ifndef XCMSDB --#define XCMSDB "/usr/lib/X11/Xcms.txt" -+#define XCMSDB "/usr/share/X11/Xcms.txt" - #endif - - #ifndef isgraph diff --git a/bug-221326-xim-sync.patch b/bug-221326-xim-sync.patch index 7ede15c..335f843 100644 --- a/bug-221326-xim-sync.patch +++ b/bug-221326-xim-sync.patch @@ -2,7 +2,7 @@ diff --git a/modules/im/ximcp/imDefIc.c b/modules/im/ximcp/imDefIc.c index cb30ac2..31e9150 100644 --- a/modules/im/ximcp/imDefIc.c +++ b/modules/im/ximcp/imDefIc.c -@@ -908,6 +908,30 @@ _XimProtoDestroyIC( +@@ -920,6 +930,30 @@ _XimProtoDestroyIC( return; } @@ -23,14 +23,14 @@ index cb30ac2..31e9150 100644 + * This is what the hack below is doing. + */ + -+Private void ++static void +BrokenSyncWithServer(XIC xic) +{ + CARD32 dummy; + XGetICValues(xic, XNFilterEvents, &dummy, NULL); +} + - Private void + static void _XimProtoSetFocus( XIC xic) @@ -938,7 +962,8 @@ #else diff --git a/bug-239698_libx11.diff b/bug-239698_libx11.diff index 38074c7..836bdc2 100644 --- a/bug-239698_libx11.diff +++ b/bug-239698_libx11.diff @@ -2,14 +2,6 @@ diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c index aa1aaaf..b3b7a9f 100644 --- a/modules/im/ximcp/imDefLkup.c +++ b/modules/im/ximcp/imDefLkup.c -@@ -661,6 +662,7 @@ _XimProcCommit( - return True; - } - -+ - Private Bool - _XimCommitRecv( - Xim im, @@ -704,7 +706,9 @@ _XimCommitRecv( (void)_XimRespSyncReply(ic, flag); diff --git a/bug153744.diff b/bug153744.diff deleted file mode 100644 index 745cedd..0000000 --- a/bug153744.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -427,7 +427,7 @@ locales="\ - iso8859-1 iso8859-10 iso8859-11 iso8859-13 iso8859-14 iso8859-15 \ - iso8859-2 iso8859-3 iso8859-4 iso8859-5 iso8859-6 iso8859-7 \ - iso8859-8 iso8859-9 iso8859-9e ja ja.JIS ja_JP.UTF-8\ -- ja.S90 ja.SJIS ja.U90 ko koi8-c koi8-r \ -+ ja.SJIS ko koi8-c koi8-r \ - koi8-u ko_KR.UTF-8 microsoft-cp1251 microsoft-cp1255 \ - microsoft-cp1256 mulelao-1 nokhchi-1 pt_BR.UTF-8 ru_RU.UTF-8 \ - tatar-cyr th_TH th_TH.UTF-8 tscii-0 vi_VN.tcvn vi_VN.viscii \ diff --git a/compose-zh_CN.UTF-8.diff b/compose-zh_CN.UTF-8.diff deleted file mode 100644 index d1b4e29..0000000 --- a/compose-zh_CN.UTF-8.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- nls/compose.dir.pre.old 2009-01-28 15:21:23.000000000 +0000 -+++ nls/compose.dir.pre 2009-01-28 15:21:51.000000000 +0000 -@@ -403,6 +403,7 @@ - en_US.UTF-8/Compose: wa_BE.UTF-8 - en_US.UTF-8/Compose: yi_US.UTF-8 - en_US.UTF-8/Compose: xh_ZA.UTF-8 -+en_US.UTF-8/Compose: zh_CN.UTF-8 - en_US.UTF-8/Compose: zh_TW.UTF-8 - en_US.UTF-8/Compose: zu_ZA.UTF-8 - en_US.UTF-8/Compose: bs_BA.UTF-8 diff --git a/en-locales.diff b/en-locales.diff index 56942fb..31be9a6 100644 --- a/en-locales.diff +++ b/en-locales.diff @@ -1,107 +1,11 @@ ---- nls/compose.dir.pre.orig 2009-04-08 02:05:06.000000000 +0200 -+++ nls/compose.dir.pre 2009-04-08 02:12:44.000000000 +0200 -@@ -280,17 +280,25 @@ - el_GR.UTF-8/Compose: el_CY.UTF-8 - el_GR.UTF-8/Compose: el_GR.UTF-8 - en_US.UTF-8/Compose: en_AU.UTF-8 -+en_US.UTF-8/Compose: en_BE.UTF-8 -+en_US.UTF-8/Compose: en_BW.UTF-8 - 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 - 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 -+en_US.UTF-8/Compose: en_IN.UTF-8 - en_US.UTF-8/Compose: en_JM.UTF-8 - en_US.UTF-8/Compose: en_MT.UTF-8 - en_US.UTF-8/Compose: en_NZ.UTF-8 -+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 - en_US.UTF-8/Compose: en_UK.UTF-8 - 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 - en_US.UTF-8/Compose: eo_XX.UTF-8 - en_US.UTF-8/Compose: es_AR.UTF-8 - en_US.UTF-8/Compose: es_BO.UTF-8 --- ../libX11-1.1.4.orig//nls/locale.alias.pre 2008-05-09 15:11:32.000000000 +0000 +++ nls/locale.alias.pre 2008-05-09 15:38:41.000000000 +0000 -@@ -296,11 +296,13 @@ - en_BW: en_BW.ISO8859-1 - en_BW.iso88591: en_BW.ISO8859-1 - en_BW.ISO-8859-1: en_BW.ISO8859-1 -+en_BW.utf8: en_BW.UTF-8 - en_CA: en_CA.ISO8859-1 - en_CA.iso88591: en_CA.ISO8859-1 +@@ -309,7 +320,8 @@ en_CA.ISO-8859-1: en_CA.ISO8859-1 en_CA.ISO_8859-1: en_CA.ISO8859-1 en_CA.utf8: en_CA.UTF-8 +en_DK.utf8: en_DK.UTF-8 + en_DL.utf8: en_DL.UTF-8 en_GB: en_GB.ISO8859-1 en_GB.88591: en_GB.ISO8859-1 en_GB.88591.en: en_GB.ISO8859-1 -@@ -316,6 +318,7 @@ - en_HK: en_HK.ISO8859-1 - en_HK.iso88591: en_HK.ISO8859-1 - en_HK.ISO-8859-1: en_HK.ISO8859-1 -+en_HK.utf8: en_HK.UTF-8 - en_IE: en_IE.ISO8859-1 - en_IE.iso88591: en_IE.ISO8859-1 - en_IE.ISO-8859-1: en_IE.ISO8859-1 -@@ -326,6 +329,7 @@ - en_IE.UTF-8@euro: en_IE.UTF-8 - en_IE.utf8: en_IE.UTF-8 - en_IN: en_IN.ISO8859-1 -+en_IN.utf8: en_IN.UTF-8 - en_NZ: en_NZ.ISO8859-1 - en_NZ.iso88591: en_NZ.ISO8859-1 - en_NZ.ISO-8859-1: en_NZ.ISO8859-1 -@@ -333,9 +337,11 @@ - en_PH: en_PH.ISO8859-1 - en_PH.iso88591: en_PH.ISO8859-1 - en_PH.ISO-8859-1: en_PH.ISO8859-1 -+en_PH.utf8: en_PH.UTF-8 - en_SG: en_SG.ISO8859-1 - en_SG.iso88591: en_SG.ISO8859-1 - en_SG.ISO-8859-1: en_SG.ISO8859-1 -+en_SG.utf8: en_SG.UTF-8 - en_US: en_US.ISO8859-1 - EN_US: en_US.ISO8859-1 - en_US.88591: en_US.ISO8859-1 -@@ -370,6 +376,7 @@ - en_ZW: en_ZW.ISO8859-1 - en_ZW.iso88591: en_ZW.ISO8859-1 - en_ZW.ISO-8859-1: en_ZW.ISO8859-1 -+en_ZW.utf8: en_ZW.UTF-8 - eo: eo_XX.ISO8859-3 - eo_EO: eo_EO.ISO8859-3 - eo_EO.ISO8859-3: eo_EO.ISO8859-3 ---- nls/locale.dir.pre.orig 2009-04-08 02:05:06.000000000 +0200 -+++ nls/locale.dir.pre 2009-04-08 02:16:54.000000000 +0200 -@@ -301,17 +301,24 @@ - en_US.UTF-8/XLC_LOCALE: el_GR.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_AU.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_BE.UTF-8 -+en_US.UTF-8/XLC_LOCALE: en_BW.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_BZ.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_CA.UTF-8 -+en_US.UTF-8/XLC_LOCALE: en_DK.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_GB.UTF-8 -+en_US.UTF-8/XLC_LOCALE: en_HK.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_IE.UTF-8 -+en_US.UTF-8/XLC_LOCALE: en_IN.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_JM.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_MT.UTF-8 - en_US.UTF-8/XLC_LOCALE: en_NZ.UTF-8 -+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 - en_US.UTF-8/XLC_LOCALE: en_UK.UTF-8 - 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 - en_US.UTF-8/XLC_LOCALE: eo_EO.UTF-8 - en_US.UTF-8/XLC_LOCALE: eo_XX.UTF-8 - en_US.UTF-8/XLC_LOCALE: es_AR.UTF-8 diff --git a/libX11-1.5.0.tar.bz2 b/libX11-1.5.0.tar.bz2 deleted file mode 100644 index ab89ef9..0000000 --- a/libX11-1.5.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44c877f2553d4298984b19a82a897ed5b9f47012c58f5eaebe1b92f8eb2e56cd -size 1783935 diff --git a/libX11-1.5.99.901.tar.bz2 b/libX11-1.5.99.901.tar.bz2 new file mode 100644 index 0000000..1e71c9c --- /dev/null +++ b/libX11-1.5.99.901.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb654108b7ed46fc000321ee1c6a39858698b141e124df5a781a13c3ac1bb1dc +size 2375812 diff --git a/libX11.changes b/libX11.changes index cecc2ce..77253aa 100644 --- a/libX11.changes +++ b/libX11.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Mar 25 10:23:19 UTC 2013 - tobias.johannes.klausmann@mni.thm.de + +- Update to version 1.5.99.901 (1.6 RC1): + + Remove upstreamed patches: + bug153744.diff (patch1) + p_new-locales.diff (patch4) + p_khmer-locale.diff (patch8) + Xcms.diff (patch17) + compose-zh_CN.UTF-8.diff (patch18) + + Changed patches: + bug-239698_libx11.diff (patch10) + bug-221326-xim-sync.patch (patch13) + en-locales.diff (patch15) + ------------------------------------------------------------------- Tue Mar 19 18:20:00 UTC 2013 - jengelh@inai.de diff --git a/libX11.spec b/libX11.spec index 9275406..aad1c2b 100644 --- a/libX11.spec +++ b/libX11.spec @@ -17,7 +17,7 @@ Name: libX11 -Version: 1.5.0 +Version: 1.5.99.901 Release: 0 Summary: Core X11 protocol client library License: MIT @@ -27,24 +27,14 @@ Url: http://xorg.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/xorg/lib/libX11 #Git-Web: http://cgit.freedesktop.org/xorg/lib/libX11/ Source: %{name}-%{version}.tar.bz2 -# make legal department happy -Patch1: bug153744.diff -# PATCH-FIX-UPSTREAM p_new-locales.diff fdo#48594 bnc#98262 -- Add missing locale aliases for bn_IN gu_IN kn_IN pa_IN -Patch4: p_new-locales.diff # PATCH-FIX-UPSTREAM p_khmer-compose.diff fdo#48595 bnc#143348 -- required compose entries for Khmer Patch7: p_khmer-compose.diff -# PATCH-FIX-UPSTREAM p_khmer-compose.diff fdo#48595 bnc#143348 -- km_KH locale support -Patch8: p_khmer-locale.diff # PATCH-FEATURE-UPSTREAM p_xlib_skip_ext_env.diff fdo#48588 bnc#167317 -- Add support for disabling extensions through environment variables Patch9: p_xlib_skip_ext_env.diff Patch10: bug-239698_libx11.diff Patch13: bug-221326-xim-sync.patch # PATCH-FIX-UPSTREAM en-locales.diff fdo#48596 bnc#388711 -- Add missing data for more en locales Patch15: en-locales.diff -# PATCH-FIX-UPSTREAM Xcms.diff fdo#48590 bnc#419548 -- Install Xcms.txt in $(datadir) not $(libdir) -Patch17: Xcms.diff -# PATCH-FIX-UPSTREAM compose-zh_CN.UTF-8.diff fdo#48591 bnc#461243 -- Missing entry in compose.dir for zh_CN.UTF-8 -Patch18: compose-zh_CN.UTF-8.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.60 @@ -149,9 +139,11 @@ in libX11-6 and libX11-xcb1. test -f nls/ja.U90/XLC_LOCALE.pre && exit 1 test -f nls/ja.S90/XLC_LOCALE.pre && exit 1 # -%patch -P 1 -P 4 -P 7 -P 8 -P 9 -p0 -%patch -P 10 -P 13 -p1 -%patch -P 15 -P 17 -P 18 -p0 +%patch7 -p0 +%patch9 -p0 +%patch10 -p1 +%patch13 -p1 +%patch15 -p0 %build # Got patches which change auto*files diff --git a/p_khmer-locale.diff b/p_khmer-locale.diff deleted file mode 100644 index 1db8f2d..0000000 --- a/p_khmer-locale.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- nls/locale.alias.pre.orig 2006-12-03 17:02:26.000000000 +0100 -+++ nls/locale.alias.pre 2006-12-03 17:04:54.000000000 +0100 -@@ -693,6 +693,8 @@ - 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: km_KH.UTF-8 -+km_KH.utf8: km_KH.UTF-8 - kn: kn_IN.UTF-8 - kn_IN: kn_IN.UTF-8 - kn_IN.utf8: kn_IN.UTF-8 ---- nls/locale.dir.pre.orig 2007-10-26 10:38:09.221232250 +0200 -+++ nls/locale.dir.pre 2007-10-26 10:38:14.929589000 +0200 -@@ -155,6 +155,7 @@ - georgian-academy/XLC_LOCALE: ka_GE.GEORGIAN-ACADEMY - georgian-ps/XLC_LOCALE: ka_GE.GEORGIAN-PS - iso8859-1/XLC_LOCALE: kl_GL.ISO8859-1 -+en_US.UTF-8/XLC_LOCALE: km_KH.UTF-8 - ko/XLC_LOCALE: ko_KR.eucKR - iso8859-1/XLC_LOCALE: kw_GB.ISO8859-1 - iso8859-14/XLC_LOCALE: kw_GB.ISO8859-14 diff --git a/p_new-locales.diff b/p_new-locales.diff deleted file mode 100644 index bbc60ac..0000000 --- a/p_new-locales.diff +++ /dev/null @@ -1,36 +0,0 @@ -Index: nls/locale.alias.pre -=================================================================== ---- nls/locale.alias.pre.orig -+++ nls/locale.alias.pre -@@ -128,6 +128,7 @@ bg_BG.iso88595: bg_BG.ISO8859-5 - bg_BG.ISO-8859-5: bg_BG.ISO8859-5 - bg_BG.koi8r: bg_BG.KOI8-R - be_BG.utf8: bg_BG.UTF-8 -+bn_IN: bn_IN.UTF-8 - bn_IN.utf8: bn_IN.UTF-8 - bo_IN.utf8: bo_IN.UTF-8 - br: br_FR.ISO8859-1 -@@ -602,6 +603,7 @@ gl_ES.ISO-8859-15@euro: gl_ES.ISO8859 - gl_ES@euro: gl_ES.ISO8859-15 - gl_ES.UTF-8@euro: gl_ES.UTF-8 - gl_ES.utf8: gl_ES.UTF-8 -+gu_IN: gu_IN.UTF-8 - gu_IN.utf8: gu_IN.UTF-8 - gv: gv_GB.ISO8859-1 - gv_GB: gv_GB.ISO8859-1 -@@ -722,6 +724,7 @@ kl_GL.ISO-8859-1: kl_GL.ISO8859-1 - kl_GL.iso885915: kl_GL.ISO8859-15 - kl_GL.utf8: kl_GL.UTF-8 - kn: kn_IN.UTF-8 -+kn_IN: kn_IN.UTF-8 - kn_IN.utf8: kn_IN.UTF-8 - ko: ko_KR.eucKR - ko.UTF-8: ko_KR.UTF-8 -@@ -882,6 +885,7 @@ oc_FR@euro: oc_FR.ISO8859-15 - or: or_IN.UTF-8 - or_IN.utf8: or_IN.UTF-8 - pa: pa_IN.UTF-8 -+pa_IN: pa_IN.UTF-8 - pa_IN.utf8: pa_IN.UTF-8 - pa_PK.utf8: pa_PK.UTF-8 - pd: pd_US.ISO8859-1