Thanks, applied as a4c70c4497ab65ab85e37ff43afe0bcaf51f2318. Michael
[sent from post-receive hook] On Fri, 29 Aug 2025 11:46:28 +0200, Philipp Zabel <[email protected]> wrote: > Mesa 25.2 will require libX11 >= 1.8 for the automatic XInitThreads() > call from the library constructor. > > Signed-off-by: Philipp Zabel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/libx11-locale-1.6.9/0001-HACK-disable-stuff-not-needed-for-locale-data.patch > > b/patches/libx11-locale-1.8.12/0001-HACK-disable-stuff-not-needed-for-locale-data.patch > similarity index 88% > rename from > patches/libx11-locale-1.6.9/0001-HACK-disable-stuff-not-needed-for-locale-data.patch > rename to > patches/libx11-locale-1.8.12/0001-HACK-disable-stuff-not-needed-for-locale-data.patch > index dac45134eed8..9f07258193f1 100644 > --- > a/patches/libx11-locale-1.6.9/0001-HACK-disable-stuff-not-needed-for-locale-data.patch > +++ > b/patches/libx11-locale-1.8.12/0001-HACK-disable-stuff-not-needed-for-locale-data.patch > @@ -8,10 +8,10 @@ Signed-off-by: Michael Olbrich <[email protected]> > 1 file changed, 27 deletions(-) > > diff --git a/configure.ac b/configure.ac > -index a5fd706f4a3c..65433c677f6d 100644 > +index c3f23e25d811..5021b99e718b 100644 > --- a/configure.ac > +++ b/configure.ac > -@@ -237,30 +237,6 @@ AC_SUBST(XTHREAD_CFLAGS) > +@@ -248,30 +248,6 @@ AC_SUBST(USE_THREAD_LIBS) > > AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is > available])], ) > > @@ -20,7 +20,7 @@ index a5fd706f4a3c..65433c677f6d 100644 > -# > -AC_MSG_CHECKING([keysym definitions]) > -AC_ARG_WITH([keysymdefdir], > -- [AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of > keysymdef.h (defaults to xproto include dir)])], > +- [AS_HELP_STRING([--with-keysymdefdir=DIR], [The location of > keysymdef.h (defaults to xproto include dir)])], > - [KEYSYMDEFDIR=$withval], > - [KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11]) > - > @@ -42,7 +42,7 @@ index a5fd706f4a3c..65433c677f6d 100644 > AC_ARG_ENABLE(xcms, > AS_HELP_STRING([--disable-xcms], > [Disable Xlib support for CMS *EXPERIMENTAL*]), > -@@ -340,9 +316,6 @@ X11_LIBDIR="${libdir}/X11" > +@@ -351,9 +327,6 @@ X11_LIBDIR="${libdir}/X11" > AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data]) > AC_SUBST(X11_LIBDIR) > > diff --git a/patches/libx11-locale-1.6.9/autogen.sh > b/patches/libx11-locale-1.8.12/autogen.sh > similarity index 100% > rename from patches/libx11-locale-1.6.9/autogen.sh > rename to patches/libx11-locale-1.8.12/autogen.sh > diff --git a/patches/libx11-locale-1.6.9/series > b/patches/libx11-locale-1.8.12/series > similarity index 100% > rename from patches/libx11-locale-1.6.9/series > rename to patches/libx11-locale-1.8.12/series > diff --git a/rules/xorg-lib-X11.make b/rules/xorg-lib-X11.make > index dd7fe5e31472..52584404c48b 100644 > --- a/rules/xorg-lib-X11.make > +++ b/rules/xorg-lib-X11.make > @@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_X11) += xorg-lib-x11 > # > # Paths and names > # > -XORG_LIB_X11_VERSION := 1.6.9 > -XORG_LIB_X11_MD5 := 55adbfb6d4370ecac5e70598c4e7eed2 > +XORG_LIB_X11_VERSION := 1.8.12 > +XORG_LIB_X11_MD5 := 146d770e564812e00f97e0cbdce632b7 > XORG_LIB_X11 := libX11-$(XORG_LIB_X11_VERSION) > -XORG_LIB_X11_SUFFIX := tar.bz2 > +XORG_LIB_X11_SUFFIX := tar.xz > XORG_LIB_X11_URL := $(call ptx/mirror, XORG, > individual/lib/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX)) > XORG_LIB_X11_SOURCE := $(SRCDIR)/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX) > XORG_LIB_X11_DIR := $(BUILDDIR)/$(XORG_LIB_X11) > @@ -55,6 +55,7 @@ XORG_LIB_X11_CONF_OPT := \ > --$(call ptx/endis, PTXCONF_XORG_LIB_X11_XF86BIGFONT)-xf86bigfont \ > --$(call ptx/endis, PTXCONF_XORG_LIB_X11_XKB)-xkb \ > --enable-composecache \ > + --enable-thread-safety-constructor \ > --disable-lint-library \ > --disable-malloc0returnsnull \ > $(XORG_OPTIONS_DOCS) \
