Thanks, applied as 157df04c393549b6b92167ae6c199c6bf56012ce. Michael
[sent from post-receive hook] On Mon, 09 Mar 2026 08:22:26 +0100, Christian Melki <[email protected]> wrote: > Various fixes. Including security related ones. > https://gitlab.freedesktop.org/freetype/freetype/-/blob/VER-2-14-2/docs/CHANGES > > * Add 2038 flag. > > * Forward patchset, applies cleanly. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/freetype-2.14.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch > > b/patches/freetype-2.14.2/0001-generate-freetype-config-and-freetype2.pc-correctly.patch > similarity index 97% > rename from > patches/freetype-2.14.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch > rename to > patches/freetype-2.14.2/0001-generate-freetype-config-and-freetype2.pc-correctly.patch > index 88d1a85ea89d..a903b2480e38 100644 > --- > a/patches/freetype-2.14.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch > +++ > b/patches/freetype-2.14.2/0001-generate-freetype-config-and-freetype2.pc-correctly.patch > @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <[email protected]> > 4 files changed, 18 insertions(+), 26 deletions(-) > > diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac > -index 9979dceaf7f3..25784fea4ba8 100644 > +index 5c4ccf1e8b34..e3cd66f0638b 100644 > --- a/builds/unix/configure.ac > +++ b/builds/unix/configure.ac > -@@ -1195,7 +1195,9 @@ AC_CONFIG_HEADERS([ftconfig.h]) > +@@ -1200,7 +1200,9 @@ AC_CONFIG_HEADERS([ftconfig.h]) > # and `builds/unix/unix-cc.mk' that will be used by the build system > # > AC_CONFIG_FILES([unix-cc.mk:unix-cc.in > diff --git a/patches/freetype-2.14.1/autogen.sh > b/patches/freetype-2.14.2/autogen.sh > similarity index 100% > rename from patches/freetype-2.14.1/autogen.sh > rename to patches/freetype-2.14.2/autogen.sh > diff --git a/patches/freetype-2.14.1/series b/patches/freetype-2.14.2/series > similarity index 100% > rename from patches/freetype-2.14.1/series > rename to patches/freetype-2.14.2/series > diff --git a/rules/freetype.make b/rules/freetype.make > index dfd8fea5efda..6d07097e53c6 100644 > --- a/rules/freetype.make > +++ b/rules/freetype.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype > # > # Paths and names > # > -FREETYPE_VERSION := 2.14.1 > -FREETYPE_MD5 := 78c7d7450fb7d0999ccd029f84094340 > +FREETYPE_VERSION := 2.14.2 > +FREETYPE_MD5 := b019e5b389e0ec08ebdfb4a50666cc5e > FREETYPE := freetype-$(FREETYPE_VERSION) > FREETYPE_SUFFIX := tar.xz > FREETYPE_SOURCE := $(SRCDIR)/$(FREETYPE).$(FREETYPE_SUFFIX) > @@ -48,6 +48,7 @@ FREETYPE_CONF_OPT := \ > --enable-freetype-config \ > $(GLOBAL_LARGE_FILE_OPTION) \ > --enable-mmap \ > + --$(call ptx/endis, PTXDIST_Y2038)-year2038 \ > --with-zlib \ > --without-bzip2 \ > --$(call ptx/wwo,PTXCONF_FREETYPE_LIBPNG)-png \
