diff --git a/ports/libfreetype/libfreetype.patch b/ports/libfreetype/libfreetype.patch index 64de5e74..d347342e 100644 --- a/ports/libfreetype/libfreetype.patch +++ b/ports/libfreetype/libfreetype.patch @@ -1,312 +1,27 @@ diff -Paur --no-dereference -- libfreetype.upstream/builds/unix/configure libfreetype/builds/unix/configure --- libfreetype.upstream/builds/unix/configure +++ libfreetype/builds/unix/configure -@@ -13690,22 +13690,7 @@ - libpng_libspriv="$LIBPNG_LIBS" +@@ -14377,21 +14377,8 @@ libpng_libsstaticconf="$LIBPNG_LIBS" have_libpng="yes (LIBPNG_CFLAGS and LIBPNG_LIBS)" -- else -- # fall back to config script. -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng-config" >&5 --$as_echo_n "checking for libpng-config... " >&6; } + else +- # fall back to config script +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpng-config" >&5 +-printf %s "checking for libpng-config... " >&6; } - if which libpng-config > /dev/null 2>&1; then - LIBPNG_CFLAGS=`libpng-config --cflags` - LIBPNG_LIBS=`libpng-config --ldflags` - libpng_libspriv=`libpng-config --static --ldflags` - libpng_libsstaticconf="$libpng_libspriv" - have_libpng="yes (libpng-config)" -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } - fi -+ # PATCH: libpng-config should never be used. ++ # PATCH: libpng-config should never be used. ++ : fi fi fi -diff -Paur --no-dereference -- libfreetype.upstream/builds/unix/freetype2.in libfreetype/builds/unix/freetype2.in ---- libfreetype.upstream/builds/unix/freetype2.in -+++ libfreetype/builds/unix/freetype2.in -@@ -4,7 +4,7 @@ - includedir=%includedir% - - Name: FreeType 2 --URL: http://freetype.org -+URL: https://freetype.org - Description: A free, high-quality, and portable font engine. - Version: %ft_version% - Requires: -diff -Paur --no-dereference -- libfreetype.upstream/builds/unix/install.mk libfreetype/builds/unix/install.mk ---- libfreetype.upstream/builds/unix/install.mk -+++ libfreetype/builds/unix/install.mk -@@ -30,15 +30,14 @@ - # - # We also remove `$(includedir)/ft2build.h' for the same reason. - # -+# PATCH: freetype-config should never be used. - install: $(PROJECT_LIBRARY) - -$(DELDIR) $(DESTDIR)$(includedir)/freetype2 - -$(DELETE) $(DESTDIR)$(includedir)/ft2build.h - $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(libdir)/pkgconfig \ - $(DESTDIR)$(includedir)/freetype2/freetype/config \ -- $(DESTDIR)$(bindir) \ -- $(DESTDIR)$(datadir)/aclocal \ -- $(DESTDIR)$(mandir)/man1 -+ $(DESTDIR)$(datadir)/aclocal - $(LIBTOOL) --mode=install $(INSTALL) \ - $(PROJECT_LIBRARY) $(DESTDIR)$(libdir) - -for P in $(PUBLIC_H) ; do \ -@@ -55,23 +54,17 @@ - $(DESTDIR)$(includedir)/freetype2/freetype/config/ftconfig.h - $(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h \ - $(DESTDIR)$(includedir)/freetype2/freetype/config/ftmodule.h -- $(INSTALL_SCRIPT) -m 755 $(OBJ_BUILD)/freetype-config \ -- $(DESTDIR)$(bindir)/freetype-config - $(INSTALL_SCRIPT) -m 644 $(BUILD_DIR)/freetype2.m4 \ - $(DESTDIR)$(datadir)/aclocal/freetype2.m4 - $(INSTALL_SCRIPT) -m 644 $(OBJ_BUILD)/freetype2.pc \ - $(DESTDIR)$(libdir)/pkgconfig/freetype2.pc -- $(INSTALL_DATA) $(TOP_DIR)/docs/freetype-config.1 \ -- $(DESTDIR)$(mandir)/man1/freetype-config.1 - - - uninstall: - -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(LIBRARY).$A - -$(DELDIR) $(DESTDIR)$(includedir)/freetype2 -- -$(DELETE) $(DESTDIR)$(bindir)/freetype-config - -$(DELETE) $(DESTDIR)$(datadir)/aclocal/freetype2.m4 - -$(DELETE) $(DESTDIR)$(libdir)/pkgconfig/freetype2.pc -- -$(DELETE) $(DESTDIR)$(mandir)/man1/freetype-config.1 - - - check: -diff -Paur --no-dereference -- libfreetype.upstream/src/autofit/afhints.c libfreetype/src/autofit/afhints.c ---- libfreetype.upstream/src/autofit/afhints.c -+++ libfreetype/src/autofit/afhints.c -@@ -16,6 +16,8 @@ - /***************************************************************************/ - - -+/* PATCH: Make snprintf available. */ -+#define _ISOC99_SOURCE - #include "afhints.h" - #include "aferrors.h" - #include FT_INTERNAL_CALC_H -@@ -223,6 +225,7 @@ - - static char* - af_print_idx( char* p, -+ size_t len, - int idx ) - { - if ( idx == -1 ) -@@ -232,7 +235,7 @@ - p[2] = '\0'; - } - else -- ft_sprintf( p, "%d", idx ); -+ snprintf( p, len, "%d", idx ); - - return p; - } -@@ -338,12 +341,12 @@ - AF_DUMP(( " %5d %5s %5s %5s %5s %s" - " %5d %5d %7.2f %7.2f %7.2f %7.2f\n", - point_idx, -- af_print_idx( buf1, -+ af_print_idx( buf1, sizeof(buf1), - af_get_edge_index( hints, segment_idx_1, 1 ) ), -- af_print_idx( buf2, segment_idx_1 ), -- af_print_idx( buf3, -+ af_print_idx( buf2, sizeof(buf2), segment_idx_1 ), -+ af_print_idx( buf3, sizeof(buf3), - af_get_edge_index( hints, segment_idx_0, 0 ) ), -- af_print_idx( buf4, segment_idx_0 ), -+ af_print_idx( buf4, sizeof(buf4), segment_idx_0 ), - ( point->flags & AF_FLAG_NEAR ) - ? " near " - : ( point->flags & AF_FLAG_WEAK_INTERPOLATION ) -diff -Paur --no-dereference -- libfreetype.upstream/src/bdf/bdflib.c libfreetype/src/bdf/bdflib.c ---- libfreetype.upstream/src/bdf/bdflib.c -+++ libfreetype/src/bdf/bdflib.c -@@ -31,6 +31,8 @@ - /*************************************************************************/ - - -+/* PATCH: Make snprintf available. */ -+#define _ISOC99_SOURCE - #include - - #include FT_FREETYPE_H -@@ -1822,7 +1824,7 @@ - if ( bdf_get_font_property( p->font, "FONT_ASCENT" ) == 0 ) - { - p->font->font_ascent = p->font->bbx.ascent; -- ft_sprintf( nbuf, "%hd", p->font->bbx.ascent ); -+ snprintf( nbuf, sizeof ( nbuf ), "%hd", p->font->bbx.ascent ); - error = _bdf_add_property( p->font, (char *)"FONT_ASCENT", - nbuf, lineno ); - if ( error ) -@@ -1835,7 +1837,7 @@ - if ( bdf_get_font_property( p->font, "FONT_DESCENT" ) == 0 ) - { - p->font->font_descent = p->font->bbx.descent; -- ft_sprintf( nbuf, "%hd", p->font->bbx.descent ); -+ snprintf( nbuf, sizeof ( nbuf ), "%hd", p->font->bbx.descent ); - error = _bdf_add_property( p->font, (char *)"FONT_DESCENT", - nbuf, lineno ); - if ( error ) -@@ -2164,7 +2166,7 @@ - /* Add the two standard X11 properties which are required */ - /* for compiling fonts. */ - p->font->font_ascent = p->font->bbx.ascent; -- ft_sprintf( nbuf, "%hd", p->font->bbx.ascent ); -+ snprintf( nbuf, sizeof ( nbuf ), "%hd", p->font->bbx.ascent ); - error = _bdf_add_property( p->font, (char *)"FONT_ASCENT", - nbuf, lineno ); - if ( error ) -@@ -2172,7 +2174,7 @@ - FT_TRACE2(( "_bdf_parse_properties: " ACMSG1, p->font->bbx.ascent )); - - p->font->font_descent = p->font->bbx.descent; -- ft_sprintf( nbuf, "%hd", p->font->bbx.descent ); -+ snprintf( nbuf, sizeof ( nbuf ), "%hd", p->font->bbx.descent ); - error = _bdf_add_property( p->font, (char *)"FONT_DESCENT", - nbuf, lineno ); - if ( error ) -diff -Paur --no-dereference -- libfreetype.upstream/src/gzip/adler32.c libfreetype/src/gzip/adler32.c ---- libfreetype.upstream/src/gzip/adler32.c -+++ libfreetype/src/gzip/adler32.c -@@ -1,3 +1,4 @@ -+#error no - /* adler32.c -- compute the Adler-32 checksum of a data stream - * Copyright (C) 1995-2002 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h -diff -Paur --no-dereference -- libfreetype.upstream/src/gzip/ftzconf.h libfreetype/src/gzip/ftzconf.h ---- libfreetype.upstream/src/gzip/ftzconf.h -+++ libfreetype/src/gzip/ftzconf.h -@@ -1,3 +1,4 @@ -+#error no - /* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-2002 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h -diff -Paur --no-dereference -- libfreetype.upstream/src/gzip/infblock.c libfreetype/src/gzip/infblock.c ---- libfreetype.upstream/src/gzip/infblock.c -+++ libfreetype/src/gzip/infblock.c -@@ -1,3 +1,4 @@ -+#error no - /* infblock.c -- interpret and process block types to last block - * Copyright (C) 1995-2002 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h -diff -Paur --no-dereference -- libfreetype.upstream/src/gzip/infblock.h libfreetype/src/gzip/infblock.h ---- libfreetype.upstream/src/gzip/infblock.h -+++ libfreetype/src/gzip/infblock.h -@@ -1,3 +1,4 @@ -+#error no - /* infblock.h -- header to use infblock.c - * Copyright (C) 1995-2002 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h -diff -Paur --no-dereference -- libfreetype.upstream/src/gzip/infcodes.c libfreetype/src/gzip/infcodes.c ---- libfreetype.upstream/src/gzip/infcodes.c -+++ libfreetype/src/gzip/infcodes.c -@@ -1,3 +1,4 @@ -+#error no - /* infcodes.c -- process literals and length/distance pairs - * Copyright (C) 1995-2002 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h -diff -Paur --no-dereference -- libfreetype.upstream/src/gzip/infcodes.h libfreetype/src/gzip/infcodes.h ---- libfreetype.upstream/src/gzip/infcodes.h -+++ libfreetype/src/gzip/infcodes.h -@@ -1,3 +1,4 @@ -+#error no - /* infcodes.h -- header to use infcodes.c - * Copyright (C) 1995-2002 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h -diff -Paur --no-dereference -- libfreetype.upstream/src/gzip/inffixed.h libfreetype/src/gzip/inffixed.h ---- libfreetype.upstream/src/gzip/inffixed.h -+++ libfreetype/src/gzip/inffixed.h -@@ -1,3 +1,4 @@ -+#error no - /* inffixed.h -- table for decoding fixed codes - * Generated automatically by the maketree.c program - */ -diff -Paur --no-dereference -- libfreetype.upstream/src/gzip/inflate.c libfreetype/src/gzip/inflate.c ---- libfreetype.upstream/src/gzip/inflate.c -+++ libfreetype/src/gzip/inflate.c -@@ -1,3 +1,4 @@ -+#error no - /* inflate.c -- zlib interface to inflate modules - * Copyright (C) 1995-2002 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h -diff -Paur --no-dereference -- libfreetype.upstream/src/gzip/inftrees.c libfreetype/src/gzip/inftrees.c ---- libfreetype.upstream/src/gzip/inftrees.c -+++ libfreetype/src/gzip/inftrees.c -@@ -1,3 +1,4 @@ -+#error no - /* inftrees.c -- generate Huffman trees for efficient decoding - * Copyright (C) 1995-2002 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h -diff -Paur --no-dereference -- libfreetype.upstream/src/gzip/inftrees.h libfreetype/src/gzip/inftrees.h ---- libfreetype.upstream/src/gzip/inftrees.h -+++ libfreetype/src/gzip/inftrees.h -@@ -1,3 +1,4 @@ -+#error no - /* inftrees.h -- header to use inftrees.c - * Copyright (C) 1995-2002 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h -diff -Paur --no-dereference -- libfreetype.upstream/src/gzip/infutil.c libfreetype/src/gzip/infutil.c ---- libfreetype.upstream/src/gzip/infutil.c -+++ libfreetype/src/gzip/infutil.c -@@ -1,3 +1,4 @@ -+#error no - /* inflate_util.c -- data and routines common to blocks and codes - * Copyright (C) 1995-2002 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h -diff -Paur --no-dereference -- libfreetype.upstream/src/gzip/infutil.h libfreetype/src/gzip/infutil.h ---- libfreetype.upstream/src/gzip/infutil.h -+++ libfreetype/src/gzip/infutil.h -@@ -1,3 +1,4 @@ -+#error no - /* infutil.h -- types and macros common to blocks and codes - * Copyright (C) 1995-2002 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h -diff -Paur --no-dereference -- libfreetype.upstream/src/gzip/zlib.h libfreetype/src/gzip/zlib.h ---- libfreetype.upstream/src/gzip/zlib.h -+++ libfreetype/src/gzip/zlib.h -@@ -1,3 +1,4 @@ -+#error no - /* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.1.4, March 11th, 2002 - -diff -Paur --no-dereference -- libfreetype.upstream/src/gzip/zutil.c libfreetype/src/gzip/zutil.c ---- libfreetype.upstream/src/gzip/zutil.c -+++ libfreetype/src/gzip/zutil.c -@@ -1,3 +1,4 @@ -+#error no - /* zutil.c -- target dependent utility functions for the compression library - * Copyright (C) 1995-2002 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h -diff -Paur --no-dereference -- libfreetype.upstream/src/gzip/zutil.h libfreetype/src/gzip/zutil.h ---- libfreetype.upstream/src/gzip/zutil.h -+++ libfreetype/src/gzip/zutil.h -@@ -1,3 +1,4 @@ -+#error no - /* zutil.h -- internal interface and configuration of the compression library - * Copyright (C) 1995-2002 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h -diff -Paur --no-dereference -- libfreetype.upstream/src/sfnt/ttload.c libfreetype/src/sfnt/ttload.c ---- libfreetype.upstream/src/sfnt/ttload.c -+++ libfreetype/src/sfnt/ttload.c -@@ -338,7 +338,9 @@ - SFNT_HeaderRec sfnt; - FT_Error error; - FT_Memory memory = stream->memory; -- FT_UShort nn, valid_entries; -+ /* PATCH: warning: `valid_entries' may be used uninitialized in this -+ function [-Wmaybe-uninitialized] */ -+ FT_UShort nn, valid_entries = 0; - - static const FT_Frame_Field offset_table_fields[] = - { diff --git a/ports/libfreetype/libfreetype.port b/ports/libfreetype/libfreetype.port index f2a01cac..e8335e18 100644 --- a/ports/libfreetype/libfreetype.port +++ b/ports/libfreetype/libfreetype.port @@ -1,12 +1,13 @@ NAME=libfreetype -BUILD_LIBRARIES='libz libbz2? libpng?' -VERSION=2.8.1 +BUILD_LIBRARIES='libz libbz2? libpng? libbrotli? libharfbuzz? librsvg?' +VERSION=2.12.1 DISTNAME=freetype-$VERSION -COMPRESSION=tar.bz2 +COMPRESSION=tar.xz ARCHIVE=$DISTNAME.$COMPRESSION -SHA256SUM=e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78 +SHA256SUM=4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f UPSTREAM_SITE=https://download.savannah.gnu.org/releases/freetype UPSTREAM_ARCHIVE=$ARCHIVE +LICENSE='FTL OR GPL-2.0-or-later' BUILD_SYSTEM=configure DIRTY_FILE=config.log POST_INSTALL=tix-eradicate-libtool-la diff --git a/ports/libfreetype/libfreetype.rmpatch b/ports/libfreetype/libfreetype.rmpatch index 7d00ad63..51649bc3 100644 --- a/ports/libfreetype/libfreetype.rmpatch +++ b/ports/libfreetype/libfreetype.rmpatch @@ -1,48 +1 @@ -rm -rf -- 'docs/reference/' -rm -rf -- 'docs/reference/README' -rm -rf -- 'docs/reference/ft2-auto_hinter.html' -rm -rf -- 'docs/reference/ft2-base_interface.html' -rm -rf -- 'docs/reference/ft2-basic_types.html' -rm -rf -- 'docs/reference/ft2-bdf_fonts.html' -rm -rf -- 'docs/reference/ft2-bitmap_handling.html' -rm -rf -- 'docs/reference/ft2-bzip2.html' -rm -rf -- 'docs/reference/ft2-cache_subsystem.html' -rm -rf -- 'docs/reference/ft2-cff_driver.html' -rm -rf -- 'docs/reference/ft2-cid_fonts.html' -rm -rf -- 'docs/reference/ft2-computations.html' -rm -rf -- 'docs/reference/ft2-error_code_values.html' -rm -rf -- 'docs/reference/ft2-error_enumerations.html' -rm -rf -- 'docs/reference/ft2-font_formats.html' -rm -rf -- 'docs/reference/ft2-gasp_table.html' -rm -rf -- 'docs/reference/ft2-glyph_management.html' -rm -rf -- 'docs/reference/ft2-glyph_stroker.html' -rm -rf -- 'docs/reference/ft2-glyph_variants.html' -rm -rf -- 'docs/reference/ft2-gx_validation.html' -rm -rf -- 'docs/reference/ft2-gzip.html' -rm -rf -- 'docs/reference/ft2-header_file_macros.html' -rm -rf -- 'docs/reference/ft2-header_inclusion.html' -rm -rf -- 'docs/reference/ft2-incremental.html' -rm -rf -- 'docs/reference/ft2-index.html' -rm -rf -- 'docs/reference/ft2-lcd_filtering.html' -rm -rf -- 'docs/reference/ft2-list_processing.html' -rm -rf -- 'docs/reference/ft2-lzw.html' -rm -rf -- 'docs/reference/ft2-mac_specific.html' -rm -rf -- 'docs/reference/ft2-module_management.html' -rm -rf -- 'docs/reference/ft2-multiple_masters.html' -rm -rf -- 'docs/reference/ft2-ot_validation.html' -rm -rf -- 'docs/reference/ft2-outline_processing.html' -rm -rf -- 'docs/reference/ft2-pcf_driver.html' -rm -rf -- 'docs/reference/ft2-pfr_fonts.html' -rm -rf -- 'docs/reference/ft2-quick_advance.html' -rm -rf -- 'docs/reference/ft2-raster.html' -rm -rf -- 'docs/reference/ft2-sfnt_names.html' -rm -rf -- 'docs/reference/ft2-sizes_management.html' -rm -rf -- 'docs/reference/ft2-system_interface.html' -rm -rf -- 'docs/reference/ft2-toc.html' -rm -rf -- 'docs/reference/ft2-truetype_engine.html' -rm -rf -- 'docs/reference/ft2-truetype_tables.html' -rm -rf -- 'docs/reference/ft2-tt_driver.html' -rm -rf -- 'docs/reference/ft2-type1_tables.html' -rm -rf -- 'docs/reference/ft2-user_allocation.html' -rm -rf -- 'docs/reference/ft2-version.html' -rm -rf -- 'docs/reference/ft2-winfnt_fonts.html' +rm -rf -- 'docs/reference'