From: Daniel P. Berrange <"Daniel P. Berrange "> Date: Mon, 22 Sep 2008 21:49:30 +0000 (-0400) Subject: Import patches from native build X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=90d39594092be0d5f2b2d6aa8a9c42ae49bc16bc;p=fedora-mingw.git Import patches from native build --- diff --git a/freetype/compare.supp b/freetype/compare.supp new file mode 100644 index 0000000..63fd541 --- /dev/null +++ b/freetype/compare.supp @@ -0,0 +1,6 @@ +# Applications not required for mingw +missing source: 'ft2demos-2.3.7.tar.bz2' +# Mingw does not have multilib +missing patch 'freetype-multilib.patch' +# Not including demos in mingw +missing patch 'ft2demos-2.1.9-mathlib.patch' \ No newline at end of file diff --git a/freetype/freetype-2.1.10-enable-ft2-bci.patch b/freetype/freetype-2.1.10-enable-ft2-bci.patch new file mode 100644 index 0000000..b1766a0 --- /dev/null +++ b/freetype/freetype-2.1.10-enable-ft2-bci.patch @@ -0,0 +1,11 @@ +--- freetype-2.1.10/include/freetype/config/ftoption.h.enable-ft2-bci 2005-10-12 13:50:40.000000000 -0400 ++++ freetype-2.1.10/include/freetype/config/ftoption.h 2005-10-12 14:18:50.000000000 -0400 +@@ -436,7 +436,7 @@ + /* Do not #undef this macro here, since the build system might */ + /* define it for certain configurations only. */ + /* */ +-/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ ++#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER + + + /*************************************************************************/ diff --git a/freetype/freetype-2.2.1-enable-valid.patch b/freetype/freetype-2.2.1-enable-valid.patch new file mode 100644 index 0000000..c78b6b7 --- /dev/null +++ b/freetype/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 @@ + AUX_MODULES += cache + + # TrueType GX/AAT table validation. Needs ftgxval.c below. +-# 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. + # +-# AUX_MODULES += otvalid ++AUX_MODULES += otvalid + + # Auxiliary PostScript driver component to share common code. + # diff --git a/freetype/freetype-2.2.1-memcpy-fix.patch b/freetype/freetype-2.2.1-memcpy-fix.patch new file mode 100644 index 0000000..67a1c07 --- /dev/null +++ b/freetype/freetype-2.2.1-memcpy-fix.patch @@ -0,0 +1,14 @@ +--- freetype-2.2.1/src/psaux/psobjs.c~ 2006-04-26 16:38:17.000000000 +0200 ++++ freetype-2.2.1/src/psaux/psobjs.c 2006-09-10 15:01:13.000000000 +0200 +@@ -165,6 +165,11 @@ + return PSaux_Err_Invalid_Argument; + } + ++ if ( length < 0 ) { ++ FT_ERROR(( "ps_table_add: invalid length\n" )); ++ return PSaux_Err_Invalid_Argument; ++ } ++ + /* grow the base block if needed */ + if ( table->cursor + length > table->capacity ) + { diff --git a/freetype/freetype-2.3.0-enable-spr.patch b/freetype/freetype-2.3.0-enable-spr.patch new file mode 100644 index 0000000..8432e28 --- /dev/null +++ b/freetype/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 @@ + /* This is done to allow FreeType clients to run unmodified, forcing */ + /* them to display normal gray-level anti-aliased glyphs. */ + /* */ +-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ ++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + + /*************************************************************************/ diff --git a/freetype/ft2demos-2.1.9-mathlib.patch b/freetype/ft2demos-2.1.9-mathlib.patch new file mode 100644 index 0000000..f67b363 --- /dev/null +++ b/freetype/ft2demos-2.1.9-mathlib.patch @@ -0,0 +1,11 @@ +--- ft2demos-2.1.9/graph/x11/rules.mk.mathlib 2004-08-04 16:11:22.534818408 -0400 ++++ ft2demos-2.1.9/graph/x11/rules.mk 2004-08-04 16:11:35.317875088 -0400 +@@ -70,7 +70,7 @@ + ifeq ($(PLATFORM),unix) + GRAPH_LINK += $(X11_LIB:%=-R%) + endif +- GRAPH_LINK += $(X11_LIB:%=-L%) -lX11 ++ GRAPH_LINK += $(X11_LIB:%=-L%) -lX11 -lm + + # Solaris needs a -lsocket in GRAPH_LINK. + # diff --git a/freetype/mingw-freetype.spec b/freetype/mingw-freetype.spec index 16ce10a..916d714 100644 --- a/freetype/mingw-freetype.spec +++ b/freetype/mingw-freetype.spec @@ -6,15 +6,22 @@ Name: mingw-freetype Version: 2.3.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows Freetype library License: FTL or GPLv2+ 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 Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: freetype-2.1.10-enable-ft2-bci.patch +Patch2: freetype-2.3.0-enable-spr.patch +Patch3: freetype-2.2.1-enable-valid.patch +Patch4: freetype-2.2.1-memcpy-fix.patch + + BuildArch: noarch BuildRequires: mingw-filesystem >= 25 @@ -27,7 +34,7 @@ MinGW Windows Freetype library. %prep -%setup -q -n freetype-%{version} +%setup -q -n freetype-%{version} -b 1 -a 1 %build %{_mingw_configure} @@ -59,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 22 2008 Daniel P. Berrange - 2.3.7-4 +- Import patches from rawhide & add docs + * Sun Sep 21 2008 Richard W.M. Jones - 2.3.7-3 - Depends on filesystem >= 25.