- Fixed broken freetype-config --libs flags in configure (#165875)
This commit is contained in:
parent
ab7019cf8a
commit
93fdfb51df
@ -1,3 +1 @@
|
|||||||
gd-2.0.28.tar.gz
|
|
||||||
gd-2.0.32.tar.gz
|
|
||||||
gd-2.0.33.tar.gz
|
gd-2.0.33.tar.gz
|
||||||
|
13
gd-2.0.33-freetype.patch
Normal file
13
gd-2.0.33-freetype.patch
Normal file
@ -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"
|
7
gd.spec
7
gd.spec
@ -1,11 +1,12 @@
|
|||||||
Summary: A graphics library for quick creation of PNG or JPEG images
|
Summary: A graphics library for quick creation of PNG or JPEG images
|
||||||
Name: gd
|
Name: gd
|
||||||
Version: 2.0.33
|
Version: 2.0.33
|
||||||
Release: 2
|
Release: 3
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
License: BSD-style
|
License: BSD-style
|
||||||
URL: http://www.boutell.com/gd/
|
URL: http://www.boutell.com/gd/
|
||||||
Source0: http://www.boutell.com/gd/http/%{name}-%{version}.tar.gz
|
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)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: freetype-devel, fontconfig-devel, xorg-x11-devel
|
BuildRequires: freetype-devel, fontconfig-devel, xorg-x11-devel
|
||||||
BuildRequires: libjpeg-devel, libpng-devel, zlib-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
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1 -n .freetype
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --disable-rpath
|
%configure --disable-rpath
|
||||||
@ -81,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 07 2005 Phil Knirsch <pknirsch@redhat.com> 2.0.33-3
|
||||||
|
- Fixed broken freetype-config --libs flags in configure (#165875)
|
||||||
|
|
||||||
* Sun Apr 17 2005 Warren Togami <wtogami@redhat.com> 2.0.33-2
|
* Sun Apr 17 2005 Warren Togami <wtogami@redhat.com> 2.0.33-2
|
||||||
- devel reqs (#155183 thias)
|
- devel reqs (#155183 thias)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user