324 lines
16 KiB
Diff
324 lines
16 KiB
Diff
|
diff --no-dereference -Naur -- libfreetype.normalized/builds/unix/configure libfreetype.srctix/builds/unix/configure
|
||
|
--- libfreetype.normalized/builds/unix/configure 2017-09-16 19:09:13.000000000 +0200
|
||
|
+++ libfreetype.srctix/builds/unix/configure 2017-10-24 19:15:13.016115244 +0200
|
||
|
@@ -13690,22 +13690,7 @@
|
||
|
libpng_libspriv="$LIBPNG_LIBS"
|
||
|
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; }
|
||
|
- 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; }
|
||
|
- else
|
||
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||
|
-$as_echo "no" >&6; }
|
||
|
- fi
|
||
|
+ # PATCH: libpng-config should never be used.
|
||
|
fi
|
||
|
fi
|
||
|
fi
|
||
|
diff --no-dereference -Naur -- libfreetype.normalized/builds/unix/freetype2.in libfreetype.srctix/builds/unix/freetype2.in
|
||
|
--- libfreetype.normalized/builds/unix/freetype2.in 2017-07-09 12:28:15.000000000 +0200
|
||
|
+++ libfreetype.srctix/builds/unix/freetype2.in 2017-10-24 17:53:39.568362655 +0200
|
||
|
@@ -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 --no-dereference -Naur -- libfreetype.normalized/builds/unix/install.mk libfreetype.srctix/builds/unix/install.mk
|
||
|
--- libfreetype.normalized/builds/unix/install.mk 2017-07-09 12:28:15.000000000 +0200
|
||
|
+++ libfreetype.srctix/builds/unix/install.mk 2017-10-24 19:15:43.799338012 +0200
|
||
|
@@ -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 --no-dereference -Naur -- libfreetype.normalized/src/autofit/afhints.c libfreetype.srctix/src/autofit/afhints.c
|
||
|
--- libfreetype.normalized/src/autofit/afhints.c 2017-09-14 11:09:54.000000000 +0200
|
||
|
+++ libfreetype.srctix/src/autofit/afhints.c 2017-10-24 19:17:58.655933081 +0200
|
||
|
@@ -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 --no-dereference -Naur -- libfreetype.normalized/src/bdf/bdflib.c libfreetype.srctix/src/bdf/bdflib.c
|
||
|
--- libfreetype.normalized/src/bdf/bdflib.c 2017-07-09 12:28:15.000000000 +0200
|
||
|
+++ libfreetype.srctix/src/bdf/bdflib.c 2017-10-24 17:35:48.523404973 +0200
|
||
|
@@ -31,6 +31,8 @@
|
||
|
/*************************************************************************/
|
||
|
|
||
|
|
||
|
+/* PATCH: Make snprintf available. */
|
||
|
+#define _ISOC99_SOURCE
|
||
|
#include <ft2build.h>
|
||
|
|
||
|
#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 --no-dereference -Naur -- libfreetype.normalized/src/gzip/adler32.c libfreetype.srctix/src/gzip/adler32.c
|
||
|
--- libfreetype.normalized/src/gzip/adler32.c 2017-07-09 12:28:15.000000000 +0200
|
||
|
+++ libfreetype.srctix/src/gzip/adler32.c 2017-10-24 19:22:43.244747631 +0200
|
||
|
@@ -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 --no-dereference -Naur -- libfreetype.normalized/src/gzip/ftzconf.h libfreetype.srctix/src/gzip/ftzconf.h
|
||
|
--- libfreetype.normalized/src/gzip/ftzconf.h 2017-07-09 12:28:15.000000000 +0200
|
||
|
+++ libfreetype.srctix/src/gzip/ftzconf.h 2017-10-24 19:23:13.295988881 +0200
|
||
|
@@ -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 --no-dereference -Naur -- libfreetype.normalized/src/gzip/infblock.c libfreetype.srctix/src/gzip/infblock.c
|
||
|
--- libfreetype.normalized/src/gzip/infblock.c 2017-07-09 12:28:15.000000000 +0200
|
||
|
+++ libfreetype.srctix/src/gzip/infblock.c 2017-10-24 19:23:19.075842948 +0200
|
||
|
@@ -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 --no-dereference -Naur -- libfreetype.normalized/src/gzip/infblock.h libfreetype.srctix/src/gzip/infblock.h
|
||
|
--- libfreetype.normalized/src/gzip/infblock.h 2017-07-09 12:28:15.000000000 +0200
|
||
|
+++ libfreetype.srctix/src/gzip/infblock.h 2017-10-24 19:23:21.347785585 +0200
|
||
|
@@ -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 --no-dereference -Naur -- libfreetype.normalized/src/gzip/infcodes.c libfreetype.srctix/src/gzip/infcodes.c
|
||
|
--- libfreetype.normalized/src/gzip/infcodes.c 2017-07-09 12:28:15.000000000 +0200
|
||
|
+++ libfreetype.srctix/src/gzip/infcodes.c 2017-10-24 19:23:24.099716102 +0200
|
||
|
@@ -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 --no-dereference -Naur -- libfreetype.normalized/src/gzip/infcodes.h libfreetype.srctix/src/gzip/infcodes.h
|
||
|
--- libfreetype.normalized/src/gzip/infcodes.h 2017-07-09 12:28:15.000000000 +0200
|
||
|
+++ libfreetype.srctix/src/gzip/infcodes.h 2017-10-24 19:23:25.971668837 +0200
|
||
|
@@ -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 --no-dereference -Naur -- libfreetype.normalized/src/gzip/inffixed.h libfreetype.srctix/src/gzip/inffixed.h
|
||
|
--- libfreetype.normalized/src/gzip/inffixed.h 2017-07-09 12:28:15.000000000 +0200
|
||
|
+++ libfreetype.srctix/src/gzip/inffixed.h 2017-10-24 19:23:27.839621675 +0200
|
||
|
@@ -1,3 +1,4 @@
|
||
|
+#error no
|
||
|
/* inffixed.h -- table for decoding fixed codes
|
||
|
* Generated automatically by the maketree.c program
|
||
|
*/
|
||
|
diff --no-dereference -Naur -- libfreetype.normalized/src/gzip/inflate.c libfreetype.srctix/src/gzip/inflate.c
|
||
|
--- libfreetype.normalized/src/gzip/inflate.c 2017-07-09 12:28:15.000000000 +0200
|
||
|
+++ libfreetype.srctix/src/gzip/inflate.c 2017-10-24 19:23:29.727574007 +0200
|
||
|
@@ -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 --no-dereference -Naur -- libfreetype.normalized/src/gzip/inftrees.c libfreetype.srctix/src/gzip/inftrees.c
|
||
|
--- libfreetype.normalized/src/gzip/inftrees.c 2017-07-09 12:28:15.000000000 +0200
|
||
|
+++ libfreetype.srctix/src/gzip/inftrees.c 2017-10-24 19:23:31.883519572 +0200
|
||
|
@@ -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 --no-dereference -Naur -- libfreetype.normalized/src/gzip/inftrees.h libfreetype.srctix/src/gzip/inftrees.h
|
||
|
--- libfreetype.normalized/src/gzip/inftrees.h 2017-07-09 12:28:15.000000000 +0200
|
||
|
+++ libfreetype.srctix/src/gzip/inftrees.h 2017-10-24 19:23:33.831470390 +0200
|
||
|
@@ -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 --no-dereference -Naur -- libfreetype.normalized/src/gzip/infutil.c libfreetype.srctix/src/gzip/infutil.c
|
||
|
--- libfreetype.normalized/src/gzip/infutil.c 2017-07-09 12:28:15.000000000 +0200
|
||
|
+++ libfreetype.srctix/src/gzip/infutil.c 2017-10-24 19:23:38.479353037 +0200
|
||
|
@@ -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 --no-dereference -Naur -- libfreetype.normalized/src/gzip/infutil.h libfreetype.srctix/src/gzip/infutil.h
|
||
|
--- libfreetype.normalized/src/gzip/infutil.h 2017-07-09 12:28:15.000000000 +0200
|
||
|
+++ libfreetype.srctix/src/gzip/infutil.h 2017-10-24 19:23:40.303306984 +0200
|
||
|
@@ -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 --no-dereference -Naur -- libfreetype.normalized/src/gzip/zlib.h libfreetype.srctix/src/gzip/zlib.h
|
||
|
--- libfreetype.normalized/src/gzip/zlib.h 2017-07-09 12:28:15.000000000 +0200
|
||
|
+++ libfreetype.srctix/src/gzip/zlib.h 2017-10-24 19:24:11.058530461 +0200
|
||
|
@@ -1,3 +1,4 @@
|
||
|
+#error no
|
||
|
/* zlib.h -- interface of the 'zlib' general purpose compression library
|
||
|
version 1.1.4, March 11th, 2002
|
||
|
|
||
|
diff --no-dereference -Naur -- libfreetype.normalized/src/gzip/zutil.c libfreetype.srctix/src/gzip/zutil.c
|
||
|
--- libfreetype.normalized/src/gzip/zutil.c 2017-07-09 12:28:15.000000000 +0200
|
||
|
+++ libfreetype.srctix/src/gzip/zutil.c 2017-10-24 19:24:25.394168507 +0200
|
||
|
@@ -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 --no-dereference -Naur -- libfreetype.normalized/src/gzip/zutil.h libfreetype.srctix/src/gzip/zutil.h
|
||
|
--- libfreetype.normalized/src/gzip/zutil.h 2017-07-09 12:28:15.000000000 +0200
|
||
|
+++ libfreetype.srctix/src/gzip/zutil.h 2017-10-24 19:25:15.400905909 +0200
|
||
|
@@ -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 --no-dereference -Naur -- libfreetype.normalized/src/sfnt/ttload.c libfreetype.srctix/src/sfnt/ttload.c
|
||
|
--- libfreetype.normalized/src/sfnt/ttload.c 2017-07-09 12:28:15.000000000 +0200
|
||
|
+++ libfreetype.srctix/src/sfnt/ttload.c 2017-10-24 17:25:15.743381742 +0200
|
||
|
@@ -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 --no-dereference -Naur -- libfreetype.normalized/tixbuildinfo libfreetype.srctix/tixbuildinfo
|
||
|
--- libfreetype.normalized/tixbuildinfo 1970-01-01 01:00:00.000000000 +0100
|
||
|
+++ libfreetype.srctix/tixbuildinfo 2017-10-24 19:33:11.324889526 +0200
|
||
|
@@ -0,0 +1,7 @@
|
||
|
+tix.version=1
|
||
|
+tix.class=srctix
|
||
|
+pkg.name=libfreetype
|
||
|
+pkg.build-libraries=libz bzip2? libpng?
|
||
|
+pkg.build-system=configure
|
||
|
+pkg.dirty-file=config.log
|
||
|
+pkg.post-install.cmd=tix-eradicate-libtool-la
|