From 3c277b2a44449df403a96d91d27b3f917cdd216d Mon Sep 17 00:00:00 2001 From: James Antill Date: Thu, 26 May 2022 07:11:41 -0400 Subject: [PATCH] Auto sync2gitlab import of freetype-2.9.1-4.el8_3.1.src.rpm --- .gitignore | 3 + EMPTY | 1 - freetype-2.2.1-enable-valid.patch | 20 + freetype-2.3.0-enable-spr.patch | 11 + freetype-2.5.2-more-demos.patch | 17 + freetype-2.6.5-libtool.patch | 11 + freetype-2.8-multilib.patch | 65 ++ freetype-2.9-ftsmooth.patch | 101 +++ freetype-2.9.1-covscan.patch | 178 +++++ freetype-2.9.1-png-bitmap-size.patch | 48 ++ freetype-2.9.1-png-memory-leak.patch | 28 + freetype.spec | 1027 ++++++++++++++++++++++++++ ftconfig.h | 14 + sources | 3 + 14 files changed, 1526 insertions(+), 1 deletion(-) create mode 100644 .gitignore delete mode 100644 EMPTY create mode 100644 freetype-2.2.1-enable-valid.patch create mode 100644 freetype-2.3.0-enable-spr.patch create mode 100644 freetype-2.5.2-more-demos.patch create mode 100644 freetype-2.6.5-libtool.patch create mode 100644 freetype-2.8-multilib.patch create mode 100644 freetype-2.9-ftsmooth.patch create mode 100644 freetype-2.9.1-covscan.patch create mode 100644 freetype-2.9.1-png-bitmap-size.patch create mode 100644 freetype-2.9.1-png-memory-leak.patch create mode 100644 freetype.spec create mode 100644 ftconfig.h create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..07f0926 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/freetype-2.9.1.tar.bz2 +/freetype-doc-2.9.1.tar.bz2 +/ft2demos-2.9.1.tar.bz2 diff --git a/EMPTY b/EMPTY deleted file mode 100644 index 0519ecb..0000000 --- a/EMPTY +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/freetype-2.2.1-enable-valid.patch b/freetype-2.2.1-enable-valid.patch new file mode 100644 index 0000000..d924705 --- /dev/null +++ b/freetype-2.2.1-enable-valid.patch @@ -0,0 +1,20 @@ +--- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 ++++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 +@@ -110,7 +110,7 @@ + # TrueType GX/AAT table validation. Needs `ftgxval.c' below. + # + # No FT_CONFIG_OPTION_PIC support. +-# AUX_MODULES += gxvalid ++AUX_MODULES += gxvalid + + # Support for streams compressed with gzip (files with suffix .gz). + # +@@ -124,7 +124,7 @@ + # OpenType table validation. Needs `ftotval.c' below. + # + # No FT_CONFIG_OPTION_PIC support. +-# AUX_MODULES += otvalid ++AUX_MODULES += otvalid + + # Auxiliary PostScript driver component to share common code. + # diff --git a/freetype-2.3.0-enable-spr.patch b/freetype-2.3.0-enable-spr.patch new file mode 100644 index 0000000..d551000 --- /dev/null +++ b/freetype-2.3.0-enable-spr.patch @@ -0,0 +1,11 @@ +--- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 ++++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 +@@ -92,7 +92,7 @@ + /* rendering technology that produces excellent output without LCD */ + /* filtering. */ + /* */ +-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ ++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + + /*************************************************************************/ diff --git a/freetype-2.5.2-more-demos.patch b/freetype-2.5.2-more-demos.patch new file mode 100644 index 0000000..e737cb7 --- /dev/null +++ b/freetype-2.5.2-more-demos.patch @@ -0,0 +1,17 @@ +--- ft2demos-2.5.2/Makefile ++++ ft2demos-2.5.2/Makefile +@@ -296,10 +296,10 @@ else + # The following programs are not compiled automatically; either comment + # out the affected line or use the program name as a Makefile target. + # +- # EXES += ftchkwd +- # EXES += ftmemchk +- # EXES += ftpatchk +- # EXES += fttimer ++ EXES += ftchkwd ++ EXES += ftmemchk ++ EXES += ftpatchk ++ EXES += fttimer + # EXES += testname + + exes: $(EXES:%=$(BIN_DIR_2)/%$E) diff --git a/freetype-2.6.5-libtool.patch b/freetype-2.6.5-libtool.patch new file mode 100644 index 0000000..4e0c2cb --- /dev/null +++ b/freetype-2.6.5-libtool.patch @@ -0,0 +1,11 @@ +--- freetype-2.8/builds/unix/freetype-config.in.orig 2017-03-30 12:20:23.000000001 +0200 ++++ freetype-2.8/builds/unix/freetype-config.in 2017-05-16 13:25:39.223041128 +0200 +@@ -205,7 +205,7 @@ if test "$echo_libs" = "yes" ; then + fi + + if test "$echo_libtool" = "yes" ; then +- echo ${SYSROOT}$libdir/libfreetype.la ++ echo "" + fi + + # EOF diff --git a/freetype-2.8-multilib.patch b/freetype-2.8-multilib.patch new file mode 100644 index 0000000..3ffd146 --- /dev/null +++ b/freetype-2.8-multilib.patch @@ -0,0 +1,65 @@ +--- freetype-2.9/builds/unix/freetype-config.in ++++ freetype-2.9/builds/unix/freetype-config.in +@@ -13,45 +13,25 @@ LC_ALL=C + export LC_ALL + + +-# if `pkg-config' is available, use values from `freetype2.pc' +-%PKG_CONFIG% --atleast-pkgconfig-version 0.24 >/dev/null 2>&1 +-if test $? -eq 0 ; then +- # note that option `--variable' is not affected by the +- # PKG_CONFIG_SYSROOT_DIR environment variable +- if test "x$SYSROOT" != "x" ; then +- PKG_CONFIG_SYSROOT_DIR="$SYSROOT" +- export PKG_CONFIG_SYSROOT_DIR +- fi +- +- prefix=`%PKG_CONFIG% --variable prefix freetype2` +- exec_prefix=`%PKG_CONFIG% --variable exec_prefix freetype2` +- +- includedir=`%PKG_CONFIG% --variable includedir freetype2` +- libdir=`%PKG_CONFIG% --variable libdir freetype2` +- +- version=`%PKG_CONFIG% --modversion freetype2` +- +- cflags=`%PKG_CONFIG% --cflags freetype2` +- dynamic_libs=`%PKG_CONFIG% --libs freetype2` +- static_libs=`%PKG_CONFIG% --static --libs freetype2` +-else +- prefix="%prefix%" +- exec_prefix="%exec_prefix%" +- +- includedir="%includedir%" +- libdir="%libdir%" +- +- version=%ft_version% +- +- cflags="-I${SYSROOT}$includedir/freetype2" +- dynamic_libs="-lfreetype" +- static_libs="%LIBSSTATIC_CONFIG%" +- if test "${SYSROOT}$libdir" != "/usr/lib" && +- test "${SYSROOT}$libdir" != "/usr/lib64" ; then +- libs_L="-L${SYSROOT}$libdir" +- fi ++# note that option `--variable' is not affected by the ++# PKG_CONFIG_SYSROOT_DIR environment variable ++if test "x$SYSROOT" != "x" ; then ++ PKG_CONFIG_SYSROOT_DIR="$SYSROOT" ++ export PKG_CONFIG_SYSROOT_DIR + fi + ++prefix=`pkgconf --variable prefix freetype2` ++exec_prefix=`pkgconf --variable exec_prefix freetype2` ++ ++includedir=`pkgconf --variable includedir freetype2` ++libdir=`pkgconf --variable libdir freetype2` ++ ++version=`pkgconf --modversion freetype2` ++ ++cflags=`pkgconf --cflags freetype2` ++dynamic_libs=`pkgconf --libs freetype2` ++static_libs=`pkgconf --static --libs freetype2` ++ + orig_prefix=$prefix + orig_exec_prefix=$exec_prefix + diff --git a/freetype-2.9-ftsmooth.patch b/freetype-2.9-ftsmooth.patch new file mode 100644 index 0000000..2735bd5 --- /dev/null +++ b/freetype-2.9-ftsmooth.patch @@ -0,0 +1,101 @@ +--- a/src/smooth/ftsmooth.c ++++ b/src/smooth/ftsmooth.c +@@ -232,39 +232,13 @@ + FT_UInt i, j; + + unsigned int height = bitmap->rows; +- unsigned int width = bitmap->width; ++ unsigned int width = bitmap->width / 3; + int pitch = bitmap->pitch; + +- +- /* Render 3 separate monochrome bitmaps, shifting the outline */ +- /* by 1/3 pixel. */ +- width /= 3; +- +- bitmap->buffer += width; +- +- error = render->raster_render( render->raster, ¶ms ); +- if ( error ) +- goto Exit; +- +- FT_Outline_Translate( outline, -21, 0 ); +- x_shift -= 21; +- bitmap->buffer += width; +- + error = render->raster_render( render->raster, ¶ms ); + if ( error ) + goto Exit; + +- FT_Outline_Translate( outline, 42, 0 ); +- x_shift += 42; +- bitmap->buffer -= 2 * width; +- +- error = render->raster_render( render->raster, ¶ms ); +- if ( error ) +- goto Exit; +- +- /* XXX: Rearrange the bytes according to FT_PIXEL_MODE_LCD. */ +- /* XXX: It is more efficient to render every third byte above. */ +- + if ( FT_ALLOC( temp, (FT_ULong)pitch ) ) + goto Exit; + +@@ -272,11 +246,7 @@ + { + line = bitmap->buffer + i * (FT_ULong)pitch; + for ( j = 0; j < width; j++ ) +- { +- temp[3 * j ] = line[j]; +- temp[3 * j + 1] = line[j + width]; +- temp[3 * j + 2] = line[j + width + width]; +- } ++ temp[3 * j] = temp[3 * j + 1] = temp[3 * j + 2] = line[j]; + FT_MEM_COPY( line, temp, pitch ); + } + +@@ -284,35 +254,23 @@ + } + else if ( vmul ) /* lcd_v */ + { +- int pitch = bitmap->pitch; +- ++ FT_Byte* line; ++ FT_UInt i; ++ int original_pitch = bitmap->pitch; + +- /* Render 3 separate monochrome bitmaps, shifting the outline */ +- /* by 1/3 pixel. Triple the pitch to render on each third row. */ + bitmap->pitch *= 3; + bitmap->rows /= 3; + +- bitmap->buffer += pitch; +- +- error = render->raster_render( render->raster, ¶ms ); +- if ( error ) +- goto Exit; +- +- FT_Outline_Translate( outline, 0, 21 ); +- y_shift += 21; +- bitmap->buffer += pitch; +- + error = render->raster_render( render->raster, ¶ms ); + if ( error ) + goto Exit; + +- FT_Outline_Translate( outline, 0, -42 ); +- y_shift -= 42; +- bitmap->buffer -= 2 * pitch; +- +- error = render->raster_render( render->raster, ¶ms ); +- if ( error ) +- goto Exit; ++ for ( i = 0; i < bitmap->rows; i++ ) ++ { ++ line = bitmap->buffer + i * bitmap->pitch; ++ FT_MEM_COPY( line + original_pitch, line, bitmap->width ); ++ FT_MEM_COPY( line + 2 * original_pitch, line, bitmap->width ); ++ } + + bitmap->pitch /= 3; + bitmap->rows *= 3; diff --git a/freetype-2.9.1-covscan.patch b/freetype-2.9.1-covscan.patch new file mode 100644 index 0000000..49c113a --- /dev/null +++ b/freetype-2.9.1-covscan.patch @@ -0,0 +1,178 @@ +--- freetype-2.9.1/builds/unix/freetype-config.in ++++ freetype-2.9.1/builds/unix/freetype-config.in +@@ -32,9 +32,6 @@ cflags=`%PKG_CONFIG% --cflags freetype2` + dynamic_libs=`pkgconf --libs freetype2` + static_libs=`pkgconf --static --libs freetype2` + +-orig_prefix=$prefix +-orig_exec_prefix=$exec_prefix +- + orig_includedir=$includedir + orig_libdir=$libdir + +--- freetype-2.9.1/ft2demos-2.9.1/src/ftbench.c ++++ freetype-2.9.1/ft2demos-2.9.1/src/ftbench.c +@@ -749,6 +749,7 @@ + { + fprintf( stderr, + "couldn't allocate memory to pre-load font file\n" ); ++ fclose( file ); + + return 1; + } +@@ -758,9 +759,12 @@ + fprintf( stderr, "read error\n" ); + free( memory_file ); + memory_file = NULL; ++ fclose( file ); + + return 1; + } ++ ++ fclose( file ); + } + + error = FT_New_Memory_Face( lib, +--- freetype-2.9.1/ft2demos-2.9.1/src/ftchkwd.c ++++ freetype-2.9.1/ft2demos-2.9.1/src/ftchkwd.c +@@ -118,8 +118,8 @@ + FT_Library library; + + int i, file_index; +- char filename[1024 + 4]; +- char alt_filename[1024 + 4]; ++ char filename[1024 + 5]; ++ char alt_filename[1024 + 5]; + char* execname; + char* fname; + +@@ -169,8 +169,8 @@ + #ifndef macintosh + if ( i >= 0 ) + { +- strncpy( filename + strlen( filename ), ".ttf", 4 ); +- strncpy( alt_filename + strlen( alt_filename ), ".ttc", 4 ); ++ strncpy( filename + strlen( filename ), ".ttf", 5 ); ++ strncpy( alt_filename + strlen( alt_filename ), ".ttc", 5 ); + } + #endif + +--- freetype-2.9.1/ft2demos-2.9.1/src/ftcommon.c ++++ freetype-2.9.1/ft2demos-2.9.1/src/ftcommon.c +@@ -110,7 +110,10 @@ + + if ( mode != gr_pixel_mode_gray && + mode != gr_pixel_mode_rgb24 ) ++ { ++ free( display ); + return NULL; ++ } + + grInitDevices(); + +--- freetype-2.9.1/ft2demos-2.9.1/src/ftdump.c ++++ freetype-2.9.1/ft2demos-2.9.1/src/ftdump.c +@@ -775,8 +775,8 @@ + char* argv[] ) + { + int i, file; +- char filename[1024 + 4]; +- char alt_filename[1024 + 4]; ++ char filename[1024 + 5]; ++ char alt_filename[1024 + 5]; + char* execname; + int num_faces; + int option; +@@ -872,8 +872,8 @@ + + if ( i >= 0 ) + { +- strncpy( filename + strlen( filename ), ".ttf", 4 ); +- strncpy( alt_filename + strlen( alt_filename ), ".ttc", 4 ); ++ strncpy( filename + strlen( filename ), ".ttf", 5 ); ++ strncpy( alt_filename + strlen( alt_filename ), ".ttc", 5 ); + } + #endif + +--- freetype-2.9.1/ft2demos-2.9.1/src/ftgrid.c ++++ freetype-2.9.1/ft2demos-2.9.1/src/ftgrid.c +@@ -662,6 +662,7 @@ + break; + + default: ++ free( t ); + return; + } + +--- freetype-2.9.1/ft2demos-2.9.1/src/ftlint.c ++++ freetype-2.9.1/ft2demos-2.9.1/src/ftlint.c +@@ -62,8 +62,8 @@ + { + int i, file_index; + unsigned int id; +- char filename[1024 + 4]; +- char alt_filename[1024 + 4]; ++ char filename[1024 + 5]; ++ char alt_filename[1024 + 5]; + char* execname; + char* fname; + +@@ -119,8 +119,8 @@ + #ifndef macintosh + if ( i >= 0 ) + { +- strncpy( filename + strlen( filename ), ".ttf", 4 ); +- strncpy( alt_filename + strlen( alt_filename ), ".ttc", 4 ); ++ strncpy( filename + strlen( filename ), ".ttf", 5 ); ++ strncpy( alt_filename + strlen( alt_filename ), ".ttc", 5 ); + } + #endif + i = (int)strlen( filename ); +--- freetype-2.9.1/ft2demos-2.9.1/src/ftmemchk.c ++++ freetype-2.9.1/ft2demos-2.9.1/src/ftmemchk.c +@@ -227,8 +227,8 @@ int main( int argc, char** argv ) + { + int i, file_index; + unsigned int id; +- char filename[1024 + 4]; +- char alt_filename[1024 + 4]; ++ char filename[1024 + 5]; ++ char alt_filename[1024 + 5]; + char* execname; + char* fname; + +@@ -270,8 +270,8 @@ int main( int argc, char** argv ) + #ifndef macintosh + if ( i >= 0 ) + { +- strncpy( filename + strlen( filename ), ".ttf", 4 ); +- strncpy( alt_filename + strlen( alt_filename ), ".ttc", 4 ); ++ strncpy( filename + strlen( filename ), ".ttf", 5 ); ++ strncpy( alt_filename + strlen( alt_filename ), ".ttc", 5 ); + } + #endif + i = strlen( filename ); +--- freetype-2.9.1/ft2demos-2.9.1/src/fttimer.c ++++ freetype-2.9.1/ft2demos-2.9.1/src/fttimer.c +@@ -162,8 +162,8 @@ + char** argv ) + { + int i, total, base, rendered_glyphs; +- char filename[1024 + 4]; +- char alt_filename[1024 + 4]; ++ char filename[1024 + 5]; ++ char alt_filename[1024 + 5]; + + long t, t0, tz0; + +@@ -230,8 +230,8 @@ + + if ( i >= 0 ) + { +- strncpy( filename + strlen( filename ), ".ttf", 4 ); +- strncpy( alt_filename + strlen( alt_filename ), ".ttc", 4 ); ++ strncpy( filename + strlen( filename ), ".ttf", 5 ); ++ strncpy( alt_filename + strlen( alt_filename ), ".ttc", 5 ); + } + + /* Initialize engine */ diff --git a/freetype-2.9.1-png-bitmap-size.patch b/freetype-2.9.1-png-bitmap-size.patch new file mode 100644 index 0000000..bd01ed2 --- /dev/null +++ b/freetype-2.9.1-png-bitmap-size.patch @@ -0,0 +1,48 @@ +From a3bab162b2ae616074c8877a04556932998aeacd Mon Sep 17 00:00:00 2001 +From: Werner Lemberg +Date: Mon, 19 Oct 2020 23:45:28 +0200 +Subject: [PATCH] [sfnt] Fix heap buffer overflow (#59308). + +This is CVE-2020-15999. + +* src/sfnt/pngshim.c (Load_SBit_Png): Test bitmap size earlier. +--- + ChangeLog | 8 ++++++++ + src/sfnt/pngshim.c | 14 +++++++------- + 2 files changed, 15 insertions(+), 7 deletions(-) + +diff --git a/src/sfnt/pngshim.c b/src/sfnt/pngshim.c +index 2e64e5846..f55016122 100644 +--- a/src/sfnt/pngshim.c ++++ b/src/sfnt/pngshim.c +@@ -332,6 +332,13 @@ + + if ( populate_map_and_metrics ) + { ++ /* reject too large bitmaps similarly to the rasterizer */ ++ if ( imgHeight > 0x7FFF || imgWidth > 0x7FFF ) ++ { ++ error = FT_THROW( Array_Too_Large ); ++ goto DestroyExit; ++ } ++ + metrics->width = (FT_UShort)imgWidth; + metrics->height = (FT_UShort)imgHeight; + +@@ -340,13 +347,6 @@ + map->pixel_mode = FT_PIXEL_MODE_BGRA; + map->pitch = (int)( map->width * 4 ); + map->num_grays = 256; +- +- /* reject too large bitmaps similarly to the rasterizer */ +- if ( map->rows > 0x7FFF || map->width > 0x7FFF ) +- { +- error = FT_THROW( Array_Too_Large ); +- goto DestroyExit; +- } + } + + /* convert palette/gray image to rgb */ +-- +2.26.2 + diff --git a/freetype-2.9.1-png-memory-leak.patch b/freetype-2.9.1-png-memory-leak.patch new file mode 100644 index 0000000..66f962f --- /dev/null +++ b/freetype-2.9.1-png-memory-leak.patch @@ -0,0 +1,28 @@ +From 007c109b4594c5e63948bd08b4d5011ad76ffb10 Mon Sep 17 00:00:00 2001 +From: Ben Wagner +Date: Fri, 23 Oct 2020 08:29:14 +0200 +Subject: [PATCH] * src/sfnt/pngshim.c (Load_SBit_Png): Fix memory leak + (#59322). + +The issue is that `rows` is allocated but will not be freed in the +event that the call to `png_read_image` fails and calls `longjmp`. +--- + ChangeLog | 7 +++++++ + src/sfnt/pngshim.c | 1 + + 2 files changed, 8 insertions(+) + +diff --git a/src/sfnt/pngshim.c b/src/sfnt/pngshim.c +index f55016122..d4e43a9f4 100644 +--- a/src/sfnt/pngshim.c ++++ b/src/sfnt/pngshim.c +@@ -443,6 +443,7 @@ + png_read_end( png, info ); + + DestroyExit: ++ FT_FREE( rows ); + png_destroy_read_struct( &png, &info, NULL ); + FT_Stream_Close( &stream ); + +-- +2.26.2 + diff --git a/freetype.spec b/freetype.spec new file mode 100644 index 0000000..3c124bf --- /dev/null +++ b/freetype.spec @@ -0,0 +1,1027 @@ +%{!?with_xfree86:%define with_xfree86 1} + +Summary: A free and portable font rendering engine +Name: freetype +Version: 2.9.1 +Release: 4%{?dist}.1 +License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement +Group: System Environment/Libraries +URL: http://www.freetype.org +Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2 +Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.bz2 +Source2: http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2 +Source3: ftconfig.h + +Patch0: freetype-2.3.0-enable-spr.patch + +# Enable otvalid and gxvalid modules +Patch1: freetype-2.2.1-enable-valid.patch +# Enable additional demos +Patch2: freetype-2.5.2-more-demos.patch + +Patch3: freetype-2.6.5-libtool.patch + +Patch4: freetype-2.8-multilib.patch + +Patch5: freetype-2.9-ftsmooth.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=1602501 +Patch6: freetype-2.9.1-covscan.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=1890210 +Patch7: freetype-2.9.1-png-bitmap-size.patch +Patch8: freetype-2.9.1-png-memory-leak.patch + +BuildRequires: libX11-devel +BuildRequires: libpng-devel +BuildRequires: zlib-devel +BuildRequires: bzip2-devel + +Provides: %{name}-bytecode +Provides: %{name}-subpixel +Obsoletes: freetype-freeworld + +%description +The FreeType engine is a free and portable font rendering +engine, developed to provide advanced font support for a variety of +platforms and environments. FreeType is a library which can open and +manages font files as well as efficiently load, hint and render +individual glyphs. FreeType is not a font server or a complete +text-rendering library. + + +%package demos +Summary: A collection of FreeType demos +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} + +%description demos +The FreeType engine is a free and portable font rendering +engine, developed to provide advanced font support for a variety of +platforms and environments. The demos package includes a set of useful +small utilities showing various capabilities of the FreeType library. + + +%package devel +Summary: FreeType development libraries and header files +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconf%{?_isa} + +%description devel +The freetype-devel package includes the static libraries and header files +for the FreeType font rendering engine. + +Install freetype-devel if you want to develop programs which will use +FreeType. + + +%prep +%setup -q -b 1 -a 2 + +%patch0 -p1 -b .enable-spr +%patch1 -p1 -b .enable-valid + +pushd ft2demos-%{version} +%patch2 -p1 -b .more-demos +popd + +%patch3 -p1 -b .libtool +%patch4 -p1 -b .multilib +%patch5 -p1 -b .ftsmooth +%patch6 -p1 -b .covscan +%patch7 -p1 -b .png-bitmap-size +%patch8 -p1 -b .png-memory-leak + +%build + +%configure --disable-static \ + --with-zlib=yes \ + --with-bzip2=yes \ + --with-png=yes \ + --enable-freetype-config \ + --with-harfbuzz=no +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' builds/unix/libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' builds/unix/libtool +make %{?_smp_mflags} + +%if %{with_xfree86} +# Build demos +pushd ft2demos-%{version} +make TOP_DIR=".." +popd +%endif + +# Convert FTL.txt and example3.cpp to UTF-8 +pushd docs +iconv -f latin1 -t utf-8 < FTL.TXT > FTL.TXT.tmp && \ +touch -r FTL.TXT FTL.TXT.tmp && \ +mv FTL.TXT.tmp FTL.TXT + +iconv -f iso-8859-1 -t utf-8 < "tutorial/example3.cpp" > "tutorial/example3.cpp.utf8" +touch -r tutorial/example3.cpp tutorial/example3.cpp.utf8 && \ +mv tutorial/example3.cpp.utf8 tutorial/example3.cpp +popd + + +%install + +%make_install gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale + +{ + for ftdemo in ftbench ftchkwd ftmemchk ftpatchk fttimer ftdump ftlint ftmemchk ftvalid ; do + builds/unix/libtool --mode=install install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir} + done +} +%if %{with_xfree86} +{ + for ftdemo in ftdiff ftgamma ftgrid ftmulti ftstring fttimer ftview ; do + builds/unix/libtool --mode=install install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir} + done +} +%endif + +# fix multilib issues +%define wordsize %{__isa_bits} + +mv $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h \ + $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig-%{wordsize}.h +install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h + +# Don't package static .a or .la files +rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} + + +%triggerpostun -- freetype < 2.0.5-3 +{ + # ttmkfdir updated - as of 2.0.5-3, on upgrades we need xfs to regenerate + # things to get the iso10646-1 encoding listed. + for I in %{_datadir}/fonts/*/TrueType /usr/share/X11/fonts/TTF; do + [ -d $I ] && [ -f $I/fonts.scale ] && [ -f $I/fonts.dir ] && touch $I/fonts.scale + done + exit 0 +} + +%ldconfig_scriptlets + +%files +%{!?_licensedir:%global license %%doc} +%license docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT +%{_libdir}/libfreetype.so.* +%doc README + +%files demos +%{_bindir}/ftbench +%{_bindir}/ftchkwd +%{_bindir}/ftmemchk +%{_bindir}/ftpatchk +%{_bindir}/fttimer +%{_bindir}/ftdump +%{_bindir}/ftlint +%{_bindir}/ftvalid +%if %{with_xfree86} +%{_bindir}/ftdiff +%{_bindir}/ftgamma +%{_bindir}/ftgrid +%{_bindir}/ftmulti +%{_bindir}/ftstring +%{_bindir}/ftview +%endif +%doc ChangeLog README + +%files devel +%doc docs/CHANGES docs/formats.txt docs/ft2faq.html +%dir %{_includedir}/freetype2 +%{_datadir}/aclocal/freetype2.m4 +%{_includedir}/freetype2/* +%{_libdir}/libfreetype.so +%{_bindir}/freetype-config +%{_libdir}/pkgconfig/freetype2.pc +%doc docs/design +%doc docs/glyphs +%doc docs/reference +%doc docs/tutorial +%{_mandir}/man1/* + +%changelog +* Fri Oct 30 2020 Marek Kasik - 2.9.1-4.el8_3.1 +- Test bitmap size earlier for PNGs +- Fix memory leak in pngshim.c +- Resolves: #1891905 + +* Fri Dec 7 2018 Marek Kasik - 2.9.1-4 +- Use pkgconf in freetype-config.in directly (RPMDiff) +- Related: #1651252 + +* Fri Dec 7 2018 Marek Kasik - 2.9.1-3 +- Enable ClearType subpixel rendering +- Resolves: #1651252 + +* Thu Sep 6 2018 Marek Kasik - 2.9.1-2 +- Fix important issues found by covscan +- Resolves: #1602501 + +* Wed Jun 27 2018 Marek Kasik - 2.9.1-1 +- Update to 2.9.1 +- Modify/remove/add patches as needed +- Resolves: #1595787 + +* Fri Feb 16 2018 Marek Kasik - 2.8-10 +- Avoid NULL reference +- Resolves: #1544776 + +* Wed Feb 07 2018 Fedora Release Engineering - 2.8-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Feb 02 2018 Igor Gnatenko - 2.8-8 +- Switch to %%ldconfig_scriptlets + +* Mon Oct 9 2017 Marek Kasik - 2.8-7 +- Require pkgconf so we can make freetype-config multilib compatible again +- Resolves: #1497443 + +* Thu Sep 21 2017 Marek Kasik - 2.8-6 +- Fix loading of named instances (TrueType) + +* Wed Aug 02 2017 Fedora Release Engineering - 2.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Jun 1 2017 Marek Kasik - 2.8-3 +- Adjust loop counter maximum for TrueType fonts +- Resolves: #1456585 + +* Wed May 24 2017 Marek Kasik - 2.8-2 +- Accept ISO646.1991-IRV as a Unicode charmap in PCF and BDF drivers +- Resolves: #1451795 + +* Wed May 17 2017 Marek Kasik - 2.8-1 +- Update to 2.8 +- Modify/remove patches as needed +- Resolves: #1450581 + +* Tue May 2 2017 Marek Kasik - 2.7.1-7 +- Fix numbers of tracking bugs + +* Tue May 2 2017 Marek Kasik - 2.7.1-6 +- Add safety guard (CVE-2017-8287) +- Resolves: #1446074 + +* Tue May 2 2017 Marek Kasik - 2.7.1-5 +- Better protect `flex' handling (CVE-2017-8105) +- Resolves: #1446501 + +* Mon Apr 10 2017 Marek Kasik - 2.7.1-4 +- Revert previous commit +- Related: #1437999 + +* Mon Apr 3 2017 Marek Kasik - 2.7.1-3 +- Allow linear scaling for unhinted rendering +- Resolves: #1437999 + +* Fri Feb 10 2017 Fedora Release Engineering - 2.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jan 3 2017 Marek Kasik - 2.7.1-1 +- Update to 2.7.1 +- Resolves: #1409271 + +* Mon Nov 21 2016 Marek Kasik - 2.7-2 +- Fix a valgrind warning +- Resolves: #1395915 + +* Mon Sep 12 2016 Marek Kasik - 2.7-1 +- Update to 2.7 +- Resolves: #1374305 + +* Mon Aug 22 2016 Marek Kasik - 2.6.5-2 +- Don't show path of non-existing libtool file + +* Wed Jul 13 2016 Marek Kasik - 2.6.5-1 +- Update to 2.6.5 +- Resolves: #1355743 + +* Sat Mar 5 2016 Peter Robinson 2.6.3-2 +- Use %%license and cleanup spec +- Move dev docs to devel package + +* Wed Feb 10 2016 Marek Kasik - 2.6.3-1 +- Update to 2.6.3 + +* Wed Feb 03 2016 Fedora Release Engineering - 2.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Dec 3 2015 Tom Callaway - 2.6.2-1 +- update to 2.6.2 + +* Mon Oct 12 2015 Marek Kasik - 2.6.1-1 +- Update to 2.6.1 +- Adapt to the new header structure +- Resolves: #1268661 + +* Tue Jul 28 2015 Marek Kasik - 2.6.0-3 +- Don't use `hmtx' table for LSB + +* Wed Jun 17 2015 Fedora Release Engineering - 2.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Jun 12 2015 Marek Kasik - 2.6.0-1 +- Update to 2.6 +- Resolves: #1229688 + +* Tue Jan 6 2015 Marek Kasik - 2.5.5-1 +- Update to 2.5.5 +- Resolves: #1178876 + +* Tue Dec 9 2014 Marek Kasik - 2.5.4-1 +- Update to 2.5.4 +- Resolves: #1171504 + +* Tue Nov 11 2014 Marek Kasik - 2.5.3-11 +- Fix directories returned by freetype-config with modified prefix +- Resolves: #1161963 + +* Tue Oct 21 2014 Marek Kasik - 2.5.3-10 +- Fix patch which enables subpixel rendering +- Resolves: #1154448 + +* Mon Aug 18 2014 Marek Kasik - 2.5.3-9 +- Simplify getting of wordsize + +* Sat Aug 16 2014 Fedora Release Engineering - 2.5.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Aug 2 2014 Peter Robinson 2.5.3-7 +- Generic 32/64 bit platform detection (fix it once and for all) + +* Sat Jun 07 2014 Fedora Release Engineering - 2.5.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 25 2014 Marek Kasik - 2.5.3-5 +- Be explicit about required libraries + +* Tue Mar 25 2014 Marek Kasik - 2.5.3-4 +- Don't return flags of privately used libraries when +- calling "freetype-config --libs" +- Resolves: #1079302 + +* Fri Mar 21 2014 Dan Horák - 2.5.3-3 +- drop private libs from freetype-config so it returns the same libs as pkg-config + +* Tue Mar 11 2014 Marek Kasik - 2.5.3-2 +- Enable support for bzip2 compressed fonts + +* Tue Mar 11 2014 Marek Kasik - 2.5.3-1 +- Update to 2.5.3 +- Resolves: #1073923 + +* Mon Jan 20 2014 Marek Kasik - 2.5.2-2 +- Fix include directory in freetype-config +- Resolves: #1055154 + +* Fri Jan 17 2014 Marek Kasik - 2.5.2-1 +- Update to 2.5.2 +- Modify spec file to respect the new header file layout +- Resolves: #1034065 + +* Fri Jan 10 2014 Marek Kasik - 2.5.0-5 +- Enable ppc64le architecture +- Resolves: #1051202 + +* Fri Sep 20 2013 Marek Kasik - 2.5.0-4 +- Fix vertical size of emboldened glyphs + +* Mon Aug 05 2013 Marek Kasik - 2.5.0-3 +- Fix changelog dates + +* Mon Aug 05 2013 Marek Kasik - 2.5.0-2 +- Require libpng + +* Mon Aug 05 2013 Marek Kasik - 2.5.0-1 +- Update to 2.5.0 +- Backport changes from freetype-2.5.0.1 +- (ft2demos-2.5.0.1 and freetype-doc-2.5.0.1 were not released) + +* Sat Aug 03 2013 Fedora Release Engineering - 2.4.12-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed May 29 2013 Peter Robinson 2.4.12-5 +- Add aarch64 to 64 bit arch list + +* Thu May 16 2013 Marek Kasik - 2.4.12-4 +- Change encoding of "docs/tutorial/example3.cpp" to UTF-8 + +* Thu May 16 2013 Marek Kasik - 2.4.12-3 +- Package ftconfig.h as source file + +* Mon May 13 2013 Marek Kasik - 2.4.12-2 +- Don't use quotes in freetype2.pc +- Resolves: #961855 + +* Thu May 9 2013 Marek Kasik - 2.4.12-1 +- Update to 2.4.12 +- Enable Adobe CFF engine +- Resolves: #959771 + +* Tue Mar 19 2013 Marek Kasik - 2.4.11-3 +- Fix emboldening: + - split out MSB function + - fix integer overflows + - fix broken emboldening at small sizes +- Resolves: #891457 + +* Wed Feb 13 2013 Fedora Release Engineering - 2.4.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jan 2 2013 Marek Kasik - 2.4.11-1 +- Update to 2.4.11 +- Resolves: #889177 + +* Wed Oct 24 2012 Marek Kasik - 2.4.10-3 +- Update License field + +* Fri Jul 27 2012 Fedora Release Engineering - 2.4.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jul 11 2012 Marek Kasik 2.4.10-1 +- Update to 2.4.10 +- Remove patches which are already included in upstream +- Resolves: #832651 + +* Fri Mar 30 2012 Marek Kasik 2.4.9-1 +- Update to 2.4.9 +- Fixes various CVEs +- Resolves: #806270 + +* Fri Jan 13 2012 Fedora Release Engineering - 2.4.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Nov 15 2011 Marek Kasik 2.4.8-1 +- Update to 2.4.8 +- Remove an unneeded patch + +* Wed Oct 26 2011 Fedora Release Engineering - 2.4.7-2 +- Rebuilt for glibc bug#747377 + +* Thu Oct 20 2011 Marek Kasik 2.4.7-1 +- Update to 2.4.7 +- Fixes CVE-2011-3256 +- Resolves: #747262 + +* Thu Aug 4 2011 Marek Kasik 2.4.6-1 +- Update to 2.4.6 + +* Wed Jul 20 2011 Marek Kasik 2.4.5-2 +- Add freetype-2.4.5-CVE-2011-0226.patch + (Add better argument check for `callothersubr'.) + - based on patches by Werner Lemberg, + Alexei Podtelezhnikov and Matthias Drochner +- Resolves: #723469 + +* Tue Jun 28 2011 Marek Kasik 2.4.5-1 +- Update to 2.4.5 + +* Tue Mar 8 2011 Marek Kasik 2.4.4-4 +- Fix autohinting fallback (#547532). +- Ignore CFF-based OTFs. + +* Sun Feb 20 2011 Marek Kasik 2.4.4-3 +- Enable bytecode interpreter (#547532). +- Fall back to autohinting if a TTF/OTF doesn't contain any bytecode. + +* Tue Feb 08 2011 Fedora Release Engineering - 2.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Dec 2 2010 Marek Kasik 2.4.4-1 +- Update to 2.4.4 +- Remove freetype-2.4.3-CVE-2010-3855.patch +- Resolves: #659020 + +* Mon Nov 15 2010 Marek Kasik 2.4.3-2 +- Add freetype-2.4.3-CVE-2010-3855.patch + (Protect against invalid `runcnt' values.) +- Resolves: #651764 + +* Tue Oct 26 2010 Marek Kasik 2.4.3-1 +- Update to 2.4.3 +- Resolves: #639906 + +* Wed Oct 6 2010 Marek Kasik 2.4.2-3 +- Add freetype-2.4.2-CVE-2010-3311.patch + (Don't seek behind end of stream.) +- Resolves: #638522 + +* Fri Aug 6 2010 Matthias Clasen 2.4.2-2 +- Fix a thinko, we still want to disable the bytecode interpreter + by default + +* Fri Aug 6 2010 Matthias Clasen 2.4.2-1 +- Update to 2.4.2 +- Drop upstreamed patch, bytecode interpreter now on by default + +* Tue Feb 23 2010 Behdad Esfahbod 2.3.12-1 +- Update to 2.3.12 +- Drop mathlib patch + +* Thu Dec 3 2009 Behdad Esfahbod 2.3.11-2 +- Drop upstreamed patch. +- Enable patented bytecode interpretter now that the patents are expired. + +* Thu Oct 22 2009 Behdad Esfahbod 2.3.11-1 +- Update to 2.3.11. +- Add freetype-2.3.11-more-demos.patch +- New demo programs ftmemchk, ftpatchk, and fttimer + +* Thu Oct 08 2009 Behdad Esfahbod 2.3.10-1 +- Drop freetype-2.3.9-aliasing.patch +- Update to 2.3.10. + +* Thu Jul 30 2009 Behdad Esfahbod 2.3.9-6 +- Add freetype-2.3.9-aliasing.patch +- Resolves: 513582 + +* Fri Jul 24 2009 Fedora Release Engineering - 2.3.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu May 7 2009 Matthias Clasen 2.3.9-4 +- Don't own /usr/lib/pkgconfig + +* Fri Mar 27 2009 Behdad Esfahbod 2.3.9-3 +- Disable subpixel hinting by default. Was turned on unintentionally. + +* Wed Mar 25 2009 Behdad Esfahbod 2.3.9-2 +- Add Provides: freetype-bytecode and freetype-subpixel if built + with those options. +- Resolves: #155210 + +* Fri Mar 13 2009 Behdad Esfahbod 2.3.9-1 +- Update to 2.3.9. +- Resolves #489928 + +* Mon Mar 09 2009 Behdad Esfahbod 2.3.8-2.1 +- Preserve timestamp of FTL.TXT when converting to UTF-8. + +* Tue Feb 24 2009 Fedora Release Engineering - 2.3.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Jan 15 2009 Behdad Esfahbod 2.3.8-1 +- Update to 2.3.8 +- Remove freetype-autohinter-ligature.patch + +* Tue Dec 09 2008 Behdad Esfahbod 2.3.7-3 +- Add full source URL to Source lines. +- Add docs to main and devel package. +- rpmlint is happy now. +- Resolves: #225770 + +* Fri Dec 05 2008 Behdad Esfahbod 2.3.7-2 +- Add freetype-autohinter-ligature.patch +- Resolves: #368561 + +* Thu Aug 14 2008 Behdad Esfahbod 2.3.7-1 +- Update to 2.3.7 + +* Tue Jun 10 2008 Behdad Esfahbod 2.3.6-1 +- Update to 2.3.6 + +* Wed May 21 2008 Tom "spot" Callaway - 2.3.5-5 +- fix license tag +- add sparc64 to list of 64bit arches + +* Mon Feb 18 2008 Fedora Release Engineering - 2.3.5-4 +- Autorebuild for GCC 4.3 + +* Thu Aug 23 2007 Adam Jackson - 2.3.5-3 +- Rebuild for build ID + +* Tue Jul 31 2007 Behdad Esfahbod 2.3.5-2 +- Change spec file to permit enabling bytecode-interpreter and + subpixel-rendering without editing spec file. +- Resolves: 249986 + +* Wed Jul 25 2007 Behdad Esfahbod 2.3.5-1 +- Update to 2.3.5. +- Drop freetype-2.3.4-ttf-overflow.patch + +* Fri Jun 29 2007 Adam Jackson 2.3.4-4 +- Fix builds/unix/libtool to not emit rpath into binaries. (#225770) + +* Thu May 31 2007 Behdad Esfahbod 2.3.4-3 +- Add freetype-2.3.4-ttf-overflow.patch + +* Thu Apr 12 2007 Behdad Esfahbod 2.3.4-2 +- Add alpha to 64-bit archs (#236166) + +* Thu Apr 05 2007 Behdad Esfahbod 2.3.4-1 +- Update to 2.3.4. + +* Thu Apr 05 2007 Behdad Esfahbod 2.3.3-2 +- Include new demos ftgrid and ftdiff in freetype-demos. (#235478) + +* Thu Apr 05 2007 Behdad Esfahbod 2.3.3-1 +- Update to 2.3.3. + +* Fri Mar 09 2007 Behdad Esfahbod 2.3.2-1 +- Update to 2.3.2. + +* Fri Feb 02 2007 Behdad Esfahbod 2.3.1-1 +- Update to 2.3.1. + +* Wed Jan 17 2007 Behdad Esfahbod 2.3.0-2 +- Add without_subpixel_rendering. +- Drop X11_PATH=/usr. Not needed anymore. + +* Wed Jan 17 2007 Behdad Esfahbod 2.3.0-1 +- Update to 2.3.0. +- Drop upstream patches. +- Drop -fno-strict-aliasing, it should just work. +- Fix typo in ftconfig.h generation. + +* Tue Jan 09 2007 Behdad Esfahbod 2.2.1-16 +- Backport binary-search fixes from HEAD +- Add freetype-2.2.1-ttcmap.patch +- Resolves: #208734 + +- Fix rendering issue with some Asian fonts. +- Add freetype-2.2.1-fix-get-orientation.patch +- Resolves: #207261 + +- Copy non-X demos even if not compiling with_xfree86. + +- Add freetype-2.2.1-zero-item-size.patch, to fix crasher. +- Resolves #214048 + +- Add X11_PATH=/usr to "make"s, to find modern X. +- Resolves #212199 + +* Mon Sep 11 2006 Behdad Esfahbod 2.2.1-10 +- Fix crasher https://bugs.freedesktop.org/show_bug.cgi?id=6841 +- Add freetype-2.2.1-memcpy-fix.patch + +* Thu Sep 07 2006 Behdad Esfahbod 2.2.1-9 +- Add BuildRequires: libX11-devel (#205355) + +* Tue Aug 29 2006 Behdad Esfahbod 2.2.1-8 +- Add freetype-composite.patch and freetype-more-composite.patch + from upstream. (#131851) + +* Mon Aug 28 2006 Matthias Clasen - 2.2.1-7 +- Require pkgconfig in the -devel package + +* Fri Aug 18 2006 Jesse Keating - 2.2.1-6 +- pass --disable-static to %%configure. (#172628) + +* Thu Aug 17 2006 Jesse Keating - 2.2.1-5 +- don't package static libs + +* Sun Aug 13 2006 Matthias Clasen - 2.2.1-4.fc6 +- fix a problem with the multilib patch (#202366) + +* Thu Jul 27 2006 Matthias Clasen - 2.2.1-3 +- fix multilib issues + +* Wed Jul 12 2006 Jesse Keating - 2.2.1-2.1 +- rebuild + +* Fri Jul 07 2006 Behdad Esfahbod 2.2.1-2 +- Remove unused BuildRequires + +* Fri Jul 07 2006 Behdad Esfahbod 2.2.1-1 +- Update to 2.2.1 +- Remove FreeType 1, to move to extras +- Install new demos ftbench, ftchkwd, ftgamma, and ftvalid +- Enable modules gxvalid and otvalid + +* Wed May 17 2006 Karsten Hopp 2.1.10-6 +- add buildrequires libICE-devel, libSM-devel + +* Fri Feb 10 2006 Jesse Keating - 2.1.10-5.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 2.1.10-5.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Fri Nov 18 2005 Bill Nottingham 2.1.10-5 +- Remove references to obsolete /usr/X11R6 paths + +* Tue Nov 1 2005 Matthias Clasen 2.1.10-4 +- Switch requires to modular X + +* Fri Oct 21 2005 Matthias Clasen 2.1.10-3 +- BuildRequire gettext + +* Wed Oct 12 2005 Jason Vas Dias 2.1.10-2 +- fix 'without_bytecode_interpreter 0' build: freetype-2.1.10-enable-ft2-bci.patch + +* Fri Oct 7 2005 Matthias Clasen 2.1.10-1 +- Update to 2.1.10 +- Add necessary fixes + +* Tue Aug 16 2005 Kristian Høgsberg 2.1.9-4 +- Fix freetype-config on 64 bit platforms. + +* Thu Jul 07 2005 Karsten Hopp 2.1.9-3 +- BuildRequires xorg-x11-devel + +* Fri Mar 4 2005 David Zeuthen - 2.1.9-2 +- Rebuild + +* Wed Aug 4 2004 Owen Taylor - 2.1.9-1 +- Upgrade to 2.1.9 +- Since we are just using automake for aclocal, use it unversioned, + instead of specifying 1.4. + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Mon Apr 19 2004 Owen Taylor 2.1.7-4 +- Add patch from freetype CVS to fix problem with eexec (#117743) +- Add freetype-devel to buildrequires and -devel requires + (Maxim Dzumanenko, #111108) + +* Wed Mar 10 2004 Mike A. Harris 2.1.7-3 +- Added -fno-strict-aliasing to CFLAGS and CXXFLAGS to try to fix SEGV and + SIGILL crashes in mkfontscale which have been traced into freetype and seem + to be caused by aliasing issues in freetype macros (#118021) + +* Tue Mar 02 2004 Elliot Lee 2.1.7-2.1 +- rebuilt + +* Fri Feb 13 2004 Elliot Lee 2.1.7-2 +- rebuilt + +* Fri Jan 23 2004 Owen Taylor 2.1.7-1 +- Upgrade to 2.1.7 + +* Tue Sep 23 2003 Florian La Roche +- allow compiling without the demos as that requires XFree86 + (this allows bootstrapping XFree86 on new archs) + +* Fri Aug 8 2003 Elliot Lee 2.1.4-4.1 +- Rebuilt + +* Tue Jul 8 2003 Owen Taylor 2.1.4-4.0 +- Bump for rebuild + +* Wed Jun 25 2003 Owen Taylor 2.1.4-3 +- Fix crash with non-format-0 hdmx tables (found by David Woodhouse) + +* Mon Jun 9 2003 Owen Taylor 2.1.4-1 +- Version 2.1.4 +- Relibtoolize to get deplibs right for x86_64 +- Use autoconf-2.5x for freetype-1.4 to fix libtool-1.5 compat problem (#91781) +- Relativize absolute symlinks to fix the -debuginfo package + (#83521, Mike Harris) + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Thu May 22 2003 Jeremy Katz 2.1.3-9 +- fix build with gcc 3.3 + +* Tue Feb 25 2003 Owen Taylor +- Add a memleak fix for the gzip backend from Federic Crozat + +* Thu Feb 13 2003 Elliot Lee 2.1.3-7 +- Run libtoolize/aclocal/autoconf so that libtool knows to generate shared libraries + on ppc64. +- Use _smp_mflags (for freetype 2.x only) + +* Tue Feb 4 2003 Owen Taylor +- Switch to using %%configure (should fix #82330) + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Jan 6 2003 Owen Taylor 2.1.3-4 +- Make FreeType robust against corrupt fonts with recursive composite + glyphs (#74782, James Antill) + +* Thu Jan 2 2003 Owen Taylor 2.1.3-3 +- Add a patch to implement FT_LOAD_TARGET_LIGHT +- Fix up freetype-1.4-libtool.patch + +* Thu Dec 12 2002 Mike A. Harris 2.1.3-2 +- Update to freetype 2.1.3 +- Removed ttmkfdir sources and patches, as they have been moved from the + freetype packaging to XFree86 packaging, and now to the ttmkfdir package +- Removed patches that are now included in 2.1.3: + freetype-2.1.1-primaryhints.patch, freetype-2.1.2-slighthint.patch, + freetype-2.1.2-bluefuzz.patch, freetype-2.1.2-stdw.patch, + freetype-2.1.2-transform.patch, freetype-2.1.2-autohint.patch, + freetype-2.1.2-leftright.patch +- Conditionalized inclusion of freetype 1.4 library. + +* Wed Dec 04 2002 Florian La Roche +- disable perl, it is not used at all + +* Tue Dec 03 2002 Elliot Lee 2.1.2-11 +- Instead of removing unpackaged file, include it in the package. + +* Sat Nov 30 2002 Mike A. Harris 2.1.2-10 +- Attempted to fix lib64 issue in freetype-demos build with X11_LINKLIBS +- Cleaned up various _foodir macros throughtout specfile +- Removed with_ttmkfdir build option as it is way obsolete + +* Fri Nov 29 2002 Tim Powers 2.1.2-8 +- remove unpackaged files from the buildroot + +* Wed Aug 28 2002 Owen Taylor +- Fix a bug with PCF metrics + +* Fri Aug 9 2002 Owen Taylor +- Backport autohinter improvements from CVS + +* Tue Jul 23 2002 Owen Taylor +- Fix from CVS for transformations (#68964) + +* Tue Jul 9 2002 Owen Taylor +- Add another bugfix for the postscript hinter + +* Mon Jul 8 2002 Owen Taylor +- Add support for BlueFuzz private dict value, fixing rendering + glitch for Luxi Mono. + +* Wed Jul 3 2002 Owen Taylor +- Add an experimental FT_Set_Hint_Flags() call + +* Mon Jul 1 2002 Owen Taylor +- Update to 2.1.2 +- Add a patch fixing freetype PS hinter bug + +* Fri Jun 21 2002 Mike A. Harris 2.1.1-2 +- Added ft rpm build time conditionalizations upon user requests + +* Tue Jun 11 2002 Owen Taylor 2.1.1-1 +- Version 2.1.1 + +* Mon Jun 10 2002 Owen Taylor +- Add a fix for PCF character maps + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Fri May 17 2002 Mike A. Harris 2.1.0-2 +- Updated freetype to version 2.1.0 +- Added libtool fix for freetype 1.4 (#64631) + +* Wed Mar 27 2002 Nalin Dahyabhai 2.0.9-2 +- use "libtool install" instead of "install" to install some binaries (#62005) + +* Mon Mar 11 2002 Mike A. Harris 2.0.9-1 +- Updated to freetype 2.0.9 + +* Sun Feb 24 2002 Mike A. Harris 2.0.8-4 +- Added proper docs+demos source for 2.0.8. + +* Sat Feb 23 2002 Mike A. Harris 2.0.8-3 +- Added compat patch so 2.x works more like 1.x +- Rebuilt with new build toolchain + +* Fri Feb 22 2002 Mike A. Harris 2.0.8-2 +- Updated to freetype 2.0.8, however docs and demos are stuck at 2.0.7 + on the freetype website. Munged specfile to deal with the problem by using + {oldversion} instead of version where appropriate. + +* Sat Feb 2 2002 Tim Powers 2.0.6-3 +- bumping release so that we don't collide with another build of + freetype, make sure to change the release requirement in the XFree86 + package + +* Fri Feb 1 2002 Mike A. Harris 2.0.6-2 +- Made ttmkfdir inclusion conditional, and set up a define to include + ttmkfdir in RHL 7.x builds, since ttmkfdir is now moving to the new + XFree86-font-utils package. + +* Wed Jan 16 2002 Mike A. Harris 2.0.6-1 +- Updated freetype to version 2.0.6 + +* Wed Jan 09 2002 Tim Powers 2.0.5-4 +- automated rebuild + +* Fri Nov 30 2001 Elliot Lee 2.0.5-3 +- Fix bug #56901 (ttmkfdir needed to list Unicode encoding when generating + font list). (ttmkfdir-iso10646.patch) +- Use _smp_mflags macro everywhere relevant. (freetype-pre1.4-make.patch) +- Undo fix for #24253, assume compiler was fixed. + +* Mon Nov 12 2001 Bernhard Rosenkraenzer 2.0.5-2 +- Fix build with gcc 3.1 (#56079) + +* Sun Nov 11 2001 Mike A. Harris 2.0.5-1 +- Updated freetype to version 2.0.5 + +* Sat Sep 22 2001 Mike A. Harris 2.0.4-2 +- Added new subpackage freetype-demos, added demos to build +- Disabled ftdump, ftlint in utils package favoring the newer utils in + demos package. + +* Tue Sep 11 2001 Mike A. Harris 2.0.4-1 +- Updated source to 2.0.4 +- Added freetype demo's back into src.rpm, but not building yet. + +* Wed Aug 15 2001 Mike A. Harris 2.0.3-7 +- Changed package to use {findlang} macro to fix bug (#50676) + +* Sun Jul 15 2001 Mike A. Harris 2.0.3-6 +- Changed freetype-devel to group Development/Libraries (#47625) + +* Mon Jul 9 2001 Bernhard Rosenkraenzer 2.0.3-5 +- Fix up FT1 headers to please Qt 3.0.0 beta 2 + +* Sun Jun 24 2001 Bernhard Rosenkraenzer 2.0.3-4 +- Add ft2build.h to -devel package, since it's included by all other + freetype headers, the package is useless without it + +* Thu Jun 21 2001 Nalin Dahyabhai 2.0.3-3 +- Change "Requires: freetype = name/ver" to "freetype = version/release", + and move the requirements to the subpackages. + +* Mon Jun 18 2001 Mike A. Harris 2.0.3-2 +- Added "Requires: freetype = name/ver" + +* Tue Jun 12 2001 Mike A. Harris 2.0.3-1 +- Updated to Freetype 2.0.3, minor specfile tweaks. +- Freetype2 docs are is in a separate tarball now. Integrated it. +- Built in new environment. + +* Fri Apr 27 2001 Bill Nottingham +- rebuild for C++ exception handling on ia64 + +* Sat Jan 20 2001 Bernhard Rosenkraenzer +- Build ttmkfdir with -O0, workaround for Bug #24253 + +* Fri Jan 19 2001 Nalin Dahyabhai +- libtool is used to build libttf, so use libtool to link ttmkfdir with it +- fixup a paths for a couple of missing docs + +* Thu Jan 11 2001 Bernhard Rosenkraenzer +- Update ttmkfdir + +* Wed Dec 27 2000 Bernhard Rosenkraenzer +- Update to 2.0.1 and 1.4 +- Mark locale files as such + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Mon Jun 12 2000 Preston Brown +- move .la file to devel pkg +- FHS paths + +* Thu Feb 17 2000 Preston Brown +- revert spaces patch, fix up some foundry names to match X ones + +* Mon Feb 07 2000 Nalin Dahyabhai +- add defattr, ftmetric, ftsbit, ftstrtto per bug #9174 + +* Wed Feb 02 2000 Cristian Gafton +- fix description and summary + +* Wed Jan 12 2000 Preston Brown +- make ttmkfdir replace spaces in family names with underscores (#7613) + +* Tue Jan 11 2000 Bernhard Rosenkraenzer +- 1.3.1 +- handle RPM_OPT_FLAGS + +* Wed Nov 10 1999 Preston Brown +- fix a path for ttmkfdir Makefile + +* Thu Aug 19 1999 Preston Brown +- newer ttmkfdir that works better, moved ttmkfdir to /usr/bin from /usr/sbin +- freetype utilities moved to subpkg, X dependency removed from main pkg +- libttf.so symlink moved to devel pkg + +* Mon Mar 22 1999 Preston Brown +- strip binaries + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 5) + +* Thu Mar 18 1999 Cristian Gafton +- fixed the doc file list + +* Wed Feb 24 1999 Preston Brown +- Injected new description and group. + +* Mon Feb 15 1999 Preston Brown +- added ttmkfdir + +* Tue Feb 02 1999 Preston Brown +- update to 1.2 + +* Thu Jan 07 1999 Cristian Gafton +- call libtoolize to sanitize config.sub and get ARM support +- dispoze of the patch (not necessary anymore) + +* Wed Oct 21 1998 Preston Brown +- post/postun sections for ldconfig action. + +* Tue Oct 20 1998 Preston Brown +- initial RPM, includes normal and development packages. diff --git a/ftconfig.h b/ftconfig.h new file mode 100644 index 0000000..8d4a074 --- /dev/null +++ b/ftconfig.h @@ -0,0 +1,14 @@ +#ifndef __FTCONFIG_H__MULTILIB +#define __FTCONFIG_H__MULTILIB + +#include + +#if __WORDSIZE == 32 +# include "ftconfig-32.h" +#elif __WORDSIZE == 64 +# include "ftconfig-64.h" +#else +# error "unexpected value for __WORDSIZE macro" +#endif + +#endif diff --git a/sources b/sources new file mode 100644 index 0000000..231fa83 --- /dev/null +++ b/sources @@ -0,0 +1,3 @@ +SHA512 (freetype-2.9.1.tar.bz2) = 856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708 +SHA512 (freetype-doc-2.9.1.tar.bz2) = 1668f02f67e6e047df04e5e2fccb564cd9af780ec9b3c4878109868302a83eaec7b627390ff82c3e875122400e6f20fc690936a1e4964dfa65143e5309fa22d4 +SHA512 (ft2demos-2.9.1.tar.bz2) = 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46