- Update to 1.8.10; this release includes:
* Re-fix XIM input sometimes jumbled (#205, #206, #207, #208, !246) * Fix various static analysis errors (!250) * Add compose sequences for Arabic hamza (!218), Ezh (!221), and hryvnia currency (!259) * Make colormap private interfaces thread safe (#215, !254) * Fix deadlock in XRebindKeysym() (!256) * Assorted memory handling cleanups (!251, !258) * Restore VAX support still in use by NetBSD (!257) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libX11?expand=0&rev=118
This commit is contained in:
commit
9b84805254
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
.osc
|
10
baselibs.conf
Normal file
10
baselibs.conf
Normal file
@ -0,0 +1,10 @@
|
||||
libX11-6
|
||||
provides "xorg-x11-libX11-<targettype> = 7.6_<version>"
|
||||
obsoletes "xorg-x11-libX11-<targettype> < 7.6_<version>"
|
||||
libX11-xcb1
|
||||
libX11-devel
|
||||
requires -libX11-<targettype>
|
||||
requires "libX11-6-<targettype> = <version>"
|
||||
requires "libX11-xcb1-<targettype> = <version>"
|
||||
provides "xorg-x11-libX11-devel-<targettype> = 7.6_<version>"
|
||||
obsoletes "xorg-x11-libX11-devel-<targettype> < 7.6_<version>"
|
12
en-locales.diff
Normal file
12
en-locales.diff
Normal file
@ -0,0 +1,12 @@
|
||||
Index: nls/locale.alias.pre
|
||||
===================================================================
|
||||
--- nls/locale.alias.pre.orig
|
||||
+++ nls/locale.alias.pre
|
||||
@@ -316,6 +316,7 @@ en_CA.iso88591: en_CA.ISO8859-1
|
||||
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
|
BIN
libX11-1.8.10.tar.xz
(Stored with Git LFS)
Normal file
BIN
libX11-1.8.10.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
3
libX11-1.8.9.tar.xz
Normal file
3
libX11-1.8.9.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:779d8f111d144ef93e2daa5f23a762ce9555affc99592844e71c4243d3bd3262
|
||||
size 1811900
|
1188
libX11.changes
Normal file
1188
libX11.changes
Normal file
File diff suppressed because it is too large
Load Diff
173
libX11.spec
Normal file
173
libX11.spec
Normal file
@ -0,0 +1,173 @@
|
||||
#
|
||||
# spec file for package libX11
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: libX11
|
||||
Version: 1.8.10
|
||||
Release: 0
|
||||
Summary: Core X11 protocol client library
|
||||
License: MIT
|
||||
Group: Development/Libraries/C and C++
|
||||
URL: http://xorg.freedesktop.org/
|
||||
#Git-Clone: git://anongit.freedesktop.org/xorg/lib/libX11
|
||||
#Git-Web: http://cgit.freedesktop.org/xorg/lib/libX11/
|
||||
Source: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.xz
|
||||
Source1: baselibs.conf
|
||||
# PATCH-FEATURE-UPSTREAM p_xlib_skip_ext_env.diff fdo#48588 bnc#167317 -- Add support for disabling extensions through environment variables
|
||||
Patch1: p_xlib_skip_ext_env.diff
|
||||
# PATCH-FIX-UPSTREAM en-locales.diff fdo#48596 bnc#388711 -- Add missing data for more en locales
|
||||
Patch2: en-locales.diff
|
||||
Patch3: u_no-longer-crash-in-XVisualIDFromVisual.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(inputproto)
|
||||
BuildRequires: pkgconfig(kbproto)
|
||||
BuildRequires: pkgconfig(xcb) >= 1.1.92
|
||||
BuildRequires: pkgconfig(xextproto)
|
||||
BuildRequires: pkgconfig(xf86bigfontproto)
|
||||
BuildRequires: pkgconfig(xorg-macros) >= 1.11
|
||||
BuildRequires: pkgconfig(xproto) >= 7.0.13
|
||||
BuildRequires: pkgconfig(xtrans)
|
||||
|
||||
%description
|
||||
Xlib is a C subroutine library that application programs
|
||||
(clients) use to interface with the X window system by means of a
|
||||
stream connection.
|
||||
|
||||
%package -n libX11-6
|
||||
Summary: Core X11 protocol client library
|
||||
Group: System/Libraries
|
||||
Requires: %{name}-data >= %{version}
|
||||
# O/P added for 12.2. Ideally remove before 12.2 release.
|
||||
Provides: xorg-x11-libX11 = 7.6_%{version}-%{release}
|
||||
Obsoletes: xorg-x11-libX11 < 7.6_%{version}-%{release}
|
||||
|
||||
%description -n libX11-6
|
||||
The X Window System is a network-transparent window system that was
|
||||
designed at MIT. X display servers run on computers with either
|
||||
monochrome or color bitmap display hardware. The server distributes
|
||||
user input to and accepts output requests from various client
|
||||
programs located either on the same machine or elsewhere in the
|
||||
network. Xlib is a C subroutine library that application programs
|
||||
(clients) use to interface with the window system by means of a
|
||||
stream connection.
|
||||
|
||||
%package -n libX11-xcb1
|
||||
Summary: XCB X11 protocol client library
|
||||
Group: System/Libraries
|
||||
Requires: %{name}-data >= %{version}
|
||||
|
||||
%description -n libX11-xcb1
|
||||
libX11-xcb provides functions needed by clients which take advantage
|
||||
of Xlib/XCB to mix calls to both Xlib and XCB over the same X
|
||||
connection.
|
||||
|
||||
%package data
|
||||
Summary: Shared data for the Core X11 protocol library
|
||||
Group: System/Libraries
|
||||
BuildArch: noarch
|
||||
|
||||
%description data
|
||||
Data files for X11:
|
||||
|
||||
* Error strings for X error codes
|
||||
* Device-independent color name database
|
||||
* Locale data and tables for the Compose Key
|
||||
|
||||
%package devel
|
||||
Summary: Development files for the Core X11 protocol library
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libX11-6 = %{version}
|
||||
Requires: libX11-xcb1 = %{version}
|
||||
# O/P added for 12.2
|
||||
Provides: xorg-x11-libX11-devel = 7.6_%{version}-%{release}
|
||||
Obsoletes: xorg-x11-libX11-devel < 7.6_%{version}-%{release}
|
||||
Conflicts: xorgproto-devel < 2019.2
|
||||
Provides: xorgproto-devel:%{_includedir}/X11/extensions/XKBgeom.h
|
||||
|
||||
%description devel
|
||||
This package contains the development headers for the library found
|
||||
in libX11-6 and libX11-xcb1.
|
||||
|
||||
%package devel-doc
|
||||
Summary: Manual pages for libX11
|
||||
Group: Documentation/Man
|
||||
BuildArch: noarch
|
||||
|
||||
%description devel-doc
|
||||
Manual pages for the C API of libX11.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
# make legal department happy (Bug #153744)
|
||||
test -f nls/ja.U90/XLC_LOCALE.pre && exit 1
|
||||
test -f nls/ja.S90/XLC_LOCALE.pre && exit 1
|
||||
|
||||
%patch -P 1
|
||||
%patch -P 2
|
||||
%patch -P 3 -p1
|
||||
|
||||
%build
|
||||
%configure \
|
||||
--disable-silent-rules \
|
||||
--docdir=%{_docdir}/%{name} \
|
||||
--disable-static
|
||||
%make_build
|
||||
|
||||
%install
|
||||
%make_install
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
|
||||
# Some files are empty/missing for some UTF-8 locales
|
||||
pushd "%{buildroot}%{_datadir}/X11/locale"
|
||||
for i in *.UTF-8; do
|
||||
echo "$i"
|
||||
if [ "$i" == "en_US.UTF-8" ]; then
|
||||
continue
|
||||
fi
|
||||
touch "$i/Compose" "$i/XI18N_OBJS"
|
||||
test -s "$i/Compose" || ln -fns ../en_US.UTF-8/Compose "$i"
|
||||
test -s "$i/XI18N_OBJS" || ln -fns ../en_US.UTF-8/XI18N_OBJS "$i"
|
||||
test -s "$i/XLC_LOCALE" || ln -fns ../en_US.UTF-8/XLC_LOCALE "$i"
|
||||
done
|
||||
popd
|
||||
|
||||
%fdupes %{buildroot}/%{_mandir}
|
||||
|
||||
%ldconfig_scriptlets -n libX11-6
|
||||
%ldconfig_scriptlets -n libX11-xcb1
|
||||
|
||||
%files -n libX11-6
|
||||
%{_libdir}/libX11.so.6*
|
||||
|
||||
%files -n libX11-xcb1
|
||||
%{_libdir}/libX11-xcb.so.1*
|
||||
|
||||
%files data
|
||||
%{_datadir}/X11
|
||||
|
||||
%files devel
|
||||
%{_includedir}/X11/*
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
|
||||
%files devel-doc
|
||||
%{_mandir}/man?/*
|
||||
%{_docdir}/%{name}
|
||||
|
||||
%changelog
|
25
p_xlib_skip_ext_env.diff
Normal file
25
p_xlib_skip_ext_env.diff
Normal file
@ -0,0 +1,25 @@
|
||||
Index: src/QuExt.c
|
||||
===================================================================
|
||||
--- src/QuExt.c.orig
|
||||
+++ src/QuExt.c
|
||||
@@ -45,6 +45,20 @@ XQueryExtension(
|
||||
if (name != NULL && strlen(name) >= USHRT_MAX)
|
||||
return false;
|
||||
|
||||
+ if (name && strlen (name) < 256)
|
||||
+ {
|
||||
+ char var[256 + 15];
|
||||
+ int i;
|
||||
+
|
||||
+ strcpy (var, "XLIB_SKIP_EXT_");
|
||||
+ for (i = 0; name[i]; i++)
|
||||
+ var[i + 14] = name[i] == '-' ? '_' : name[i];
|
||||
+
|
||||
+ var[i + 14] = 0;
|
||||
+ if (getenv (var))
|
||||
+ return False;
|
||||
+ }
|
||||
+
|
||||
LockDisplay(dpy);
|
||||
GetReq(QueryExtension, req);
|
||||
req->nbytes = name ? (CARD16) strlen(name) : 0;
|
12
u_no-longer-crash-in-XVisualIDFromVisual.patch
Normal file
12
u_no-longer-crash-in-XVisualIDFromVisual.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -u -p -r libX11-1.7.2.orig/src/Misc.c libX11-1.7.2/src/Misc.c
|
||||
--- libX11-1.7.2.orig/src/Misc.c 2021-11-15 14:58:41.579310000 +0100
|
||||
+++ libX11-1.7.2/src/Misc.c 2021-11-15 15:01:27.897244000 +0100
|
||||
@@ -57,6 +57,8 @@ XDisplayKeycodes(
|
||||
|
||||
VisualID XVisualIDFromVisual(Visual *visual)
|
||||
{
|
||||
+ if (!visual)
|
||||
+ return (VisualID)0;
|
||||
return visual->visualid;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user