Hello community, here is the log from the commit of package libX11 for openSUSE:Factory checked in at 2013-03-26 19:48:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libX11 (Old) and /work/SRC/openSUSE:Factory/.libX11.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libX11", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libX11/libX11.changes 2013-03-01 07:26:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libX11.new/libX11.changes 2013-03-26 19:48:19.000000000 +0100 @@ -1,0 +2,20 @@ +Mon Mar 25 10:23:19 UTC 2013 - [email protected] + +- 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 - [email protected] + +- Use more robust make install call + +------------------------------------------------------------------- Old: ---- Xcms.diff bug153744.diff compose-zh_CN.UTF-8.diff libX11-1.5.0.tar.bz2 p_khmer-locale.diff p_new-locales.diff New: ---- libX11-1.5.99.901.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libX11.spec ++++++ --- /var/tmp/diff_new_pack.UmWMfJ/_old 2013-03-26 19:48:21.000000000 +0100 +++ /var/tmp/diff_new_pack.UmWMfJ/_new 2013-03-26 19:48:21.000000000 +0100 @@ -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 @@ #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 @@ -107,7 +97,9 @@ %package data Summary: Shared data for the Core X11 protocol library Group: System/Libraries +%if 0%{?suse_version} >= 1130 BuildArch: noarch +%endif %description data The X Window System is a network-transparent window system that was @@ -147,9 +139,11 @@ 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 @@ -160,7 +154,7 @@ make %{?_smp_mflags} %install -%makeinstall +make install DESTDIR="%buildroot" rm -f "%buildroot/%_libdir"/*.la # Some files are empty/missing for some UTF-8 locales @@ -177,7 +171,7 @@ done popd -# fdupes +# fdupes %buildroot/%_prefix %post -n libX11-6 -p /sbin/ldconfig ++++++ bug-221326-xim-sync.patch ++++++ --- /var/tmp/diff_new_pack.UmWMfJ/_old 2013-03-26 19:48:21.000000000 +0100 +++ /var/tmp/diff_new_pack.UmWMfJ/_new 2013-03-26 19:48:21.000000000 +0100 @@ -2,7 +2,7 @@ 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 @@ + * 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 ++++++ bug-239698_libx11.diff ++++++ --- /var/tmp/diff_new_pack.UmWMfJ/_old 2013-03-26 19:48:21.000000000 +0100 +++ /var/tmp/diff_new_pack.UmWMfJ/_new 2013-03-26 19:48:21.000000000 +0100 @@ -2,14 +2,6 @@ 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); ++++++ en-locales.diff ++++++ --- /var/tmp/diff_new_pack.UmWMfJ/_old 2013-03-26 19:48:21.000000000 +0100 +++ /var/tmp/diff_new_pack.UmWMfJ/_new 2013-03-26 19:48:21.000000000 +0100 @@ -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 ++++++ libX11-1.5.0.tar.bz2 -> libX11-1.5.99.901.tar.bz2 ++++++ ++++ 107803 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
