From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 29 Aug 2025 11:48:59 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1urvjA-005m5s-0W for lore@lore.pengutronix.de; Fri, 29 Aug 2025 11:48:59 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1urvj8-00088b-Vh; Fri, 29 Aug 2025 11:48:58 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1urvgj-000456-2J; Fri, 29 Aug 2025 11:46:29 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1urvgi-002hsb-2q; Fri, 29 Aug 2025 11:46:28 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1urvgi-0000000AzeA-3VmF; Fri, 29 Aug 2025 11:46:28 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 29 Aug 2025 11:46:28 +0200 Message-ID: <20250829094628.2620243-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250728113855.732324-1-p.zabel@pengutronix.de> References: <20250728113855.732324-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] xorg-lib-x11, libx11-locale: version bump 1.6.9 -> 1.8.12 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Philipp Zabel Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as a4c70c4497ab65ab85e37ff43afe0bcaf51f2318. Michael [sent from post-receive hook] On Fri, 29 Aug 2025 11:46:28 +0200, Philipp Zabel wrote: > Mesa 25.2 will require libX11 >= 1.8 for the automatic XInitThreads() > call from the library constructor. > > Signed-off-by: Philipp Zabel > Message-Id: <20250728113855.732324-1-p.zabel@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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 > 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) \