diff --git a/.cvsignore b/.cvsignore index 9a69392..97b8f7f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -gd-2.0.28.tar.gz -gd-2.0.32.tar.gz gd-2.0.33.tar.gz diff --git a/gd-2.0.33-freetype.patch b/gd-2.0.33-freetype.patch new file mode 100644 index 0000000..fd8c94e --- /dev/null +++ b/gd-2.0.33-freetype.patch @@ -0,0 +1,13 @@ +--- gd-2.0.33/configure.freetype 2005-09-07 17:16:03.000000000 +0200 ++++ gd-2.0.33/configure 2005-09-07 17:16:54.000000000 +0200 +@@ -11705,8 +11705,8 @@ + else + libft_INCLUDES=`$FREETYPE_CONFIG --cflags` + fi +- libft_LDFLAGS=`$FREETYPE_CONFIG --libs` +- libft_LDFLAGS=`echo " $libft_LDFLAGS" |sed 's/ -l[^ ][^ ]*//g'` ++ # Hack to ingore the broken freetype config --libs flags ++ libft_LDFLAGS="" + else + if test -n "$FREETYPE_DIR"; then + libft_INCLUDES="-I$FREETYPE_DIR/include/freetype2 -I$FREETYPE_DIR/include" diff --git a/gd.spec b/gd.spec index 66a6076..2da9085 100644 --- a/gd.spec +++ b/gd.spec @@ -1,11 +1,12 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.0.33 -Release: 2 +Release: 3 Group: System Environment/Libraries License: BSD-style URL: http://www.boutell.com/gd/ Source0: http://www.boutell.com/gd/http/%{name}-%{version}.tar.gz +Patch0: gd-2.0.33-freetype.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: freetype-devel, fontconfig-devel, xorg-x11-devel BuildRequires: libjpeg-devel, libpng-devel, zlib-devel @@ -43,6 +44,7 @@ files for gd, a graphics library for creating PNG and JPEG graphics. %prep %setup -q +%patch0 -p1 -n .freetype %build %configure --disable-rpath @@ -81,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 07 2005 Phil Knirsch 2.0.33-3 +- Fixed broken freetype-config --libs flags in configure (#165875) + * Sun Apr 17 2005 Warren Togami 2.0.33-2 - devel reqs (#155183 thias)