From d2b05a19416f8aa7addabd9bef7e66d82a71b8c19ee41a4b2710d8483b2fb8c2 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 1 Mar 2017 14:01:46 +0000 Subject: [PATCH] Accepting request 461347 from home:tobijk:X11:XOrg - Update to version 1.6.5: + Revert "Compose sequences for rouble sign" + specs/libX11: More synopsis fixes + specs/libX11: Fix paramdef entries listing multiple parameters + specs/libX11: Make paramdef spacing more consistent + specs/libX11: Add missing parameter types for XGetWindowProperty() + specs/libX11: Fix broken synopsis for Data/Data16/Data32 + specs/libX11: Update Portability Considerations for the 21st century + autogen.sh: use quoted string variables + Plug a memory leak + Fix wrong Xfree in XListFonts failure path + Typos in "Xlib - C Language X Interface" document - Chapter 02 + autogen: add default patch prefix + Compose sequences for rouble sign + autogen.sh: use exec instead of waiting for configure to finish + Revert cs_CZ.UTF-8 XLC_LOCALE to en_US.UTF-8 - Remove patches: + u_nls-fix-handling-of-cs_CZ.UTF8_locale.patch OBS-URL: https://build.opensuse.org/request/show/461347 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libX11?expand=0&rev=38 --- libX11-1.6.4.tar.bz2 | 3 - libX11-1.6.5.tar.bz2 | 3 + libX11.changes | 22 +++++++ libX11.spec | 6 +- u_nls-fix-handling-of-cs_CZ.UTF8_locale.patch | 66 ------------------- 5 files changed, 27 insertions(+), 73 deletions(-) delete mode 100644 libX11-1.6.4.tar.bz2 create mode 100644 libX11-1.6.5.tar.bz2 delete mode 100644 u_nls-fix-handling-of-cs_CZ.UTF8_locale.patch diff --git a/libX11-1.6.4.tar.bz2 b/libX11-1.6.4.tar.bz2 deleted file mode 100644 index 11d8ce2..0000000 --- a/libX11-1.6.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b7c748be3aa16ec2cbd81edc847e9b6ee03f88143ab270fb59f58a044d34e441 -size 2340176 diff --git a/libX11-1.6.5.tar.bz2 b/libX11-1.6.5.tar.bz2 new file mode 100644 index 0000000..57a662c --- /dev/null +++ b/libX11-1.6.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d +size 2361556 diff --git a/libX11.changes b/libX11.changes index b5edf75..c43d125 100644 --- a/libX11.changes +++ b/libX11.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Mar 1 13:48:43 UTC 2017 - tobias.johannes.klausmann@mni.thm.de + +- Update to version 1.6.5: + + Revert "Compose sequences for rouble sign" + + specs/libX11: More synopsis fixes + + specs/libX11: Fix paramdef entries listing multiple parameters + + specs/libX11: Make paramdef spacing more consistent + + specs/libX11: Add missing parameter types for XGetWindowProperty() + + specs/libX11: Fix broken synopsis for Data/Data16/Data32 + + specs/libX11: Update Portability Considerations for the 21st century + + autogen.sh: use quoted string variables + + Plug a memory leak + + Fix wrong Xfree in XListFonts failure path + + Typos in "Xlib - C Language X Interface" document - Chapter 02 + + autogen: add default patch prefix + + Compose sequences for rouble sign + + autogen.sh: use exec instead of waiting for configure to finish + + Revert cs_CZ.UTF-8 XLC_LOCALE to en_US.UTF-8 +- Remove patches: + + u_nls-fix-handling-of-cs_CZ.UTF8_locale.patch + ------------------------------------------------------------------- Tue Nov 8 11:04:56 UTC 2016 - sndirsch@suse.com diff --git a/libX11.spec b/libX11.spec index 1c5a9b7..f379307 100644 --- a/libX11.spec +++ b/libX11.spec @@ -1,7 +1,7 @@ # # spec file for package libX11 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libX11 -Version: 1.6.4 +Version: 1.6.5 Release: 0 Summary: Core X11 protocol client library License: MIT @@ -28,7 +28,6 @@ Url: http://xorg.freedesktop.org/ #Git-Web: http://cgit.freedesktop.org/xorg/lib/libX11/ Source: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 Source1: baselibs.conf -Patch0: u_nls-fix-handling-of-cs_CZ.UTF8_locale.patch # PATCH-FIX-UPSTREAM p_khmer-compose.diff fdo#48595 bnc#143348 -- required compose entries for Khmer Patch7: p_khmer-compose.diff # PATCH-FEATURE-UPSTREAM p_xlib_skip_ext_env.diff fdo#48588 bnc#167317 -- Add support for disabling extensions through environment variables @@ -140,7 +139,6 @@ 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 # -%patch0 -p1 %patch7 -p0 %patch9 -p0 %patch15 -p0 diff --git a/u_nls-fix-handling-of-cs_CZ.UTF8_locale.patch b/u_nls-fix-handling-of-cs_CZ.UTF8_locale.patch deleted file mode 100644 index d7d68c3..0000000 --- a/u_nls-fix-handling-of-cs_CZ.UTF8_locale.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 42c2e50c2da9c628337af412939eff3fb96a1f44 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= -Date: Mon, 10 Oct 2016 15:08:46 +0200 -Subject: [PATCH 1/2] nls: Revert "Fix missing update in cf4d5989383a" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This was incorrect because cs_CZ.UTF-8 doesn't define XLC_LOCALE. - -Related to bug https://bugs.freedesktop.org/show_bug.cgi?id=81875#c7 - -This reverts commit 33840a5465a2e5fecab520bfbdd2d1bd0a456f51. - -Signed-off-by: Jiří Klimeš ---- - nls/locale.dir.pre | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre -index c4740a7..ccba036 100644 ---- a/nls/locale.dir.pre -+++ b/nls/locale.dir.pre -@@ -302,7 +302,7 @@ en_US.UTF-8/XLC_LOCALE: ca_AD.UTF-8 - 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 --cs_CZ.UTF-8/XLC_LOCALE: cs_CZ.UTF-8 -+en_US.UTF-8/XLC_LOCALE: cs_CZ.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 --- -2.10.0 - - -From caff1f48dbf967d54c94b9bbb2fb039b7d079673 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= -Date: Mon, 10 Oct 2016 15:12:07 +0200 -Subject: [PATCH 2/2] nls: remove duplicated line for cs_CZ.UTF-8 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Related to bug https://bugs.freedesktop.org/show_bug.cgi?id=81875#c11 - -Signed-off-by: Jiří Klimeš ---- - nls/locale.dir.pre | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre -index ccba036..92da876 100644 ---- a/nls/locale.dir.pre -+++ b/nls/locale.dir.pre -@@ -304,7 +304,6 @@ 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 - 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 --- -2.10.0 -