- FTBFS fltk-1.1.10-4.fc15: ImplicitDSOLinking (#660884)

This commit is contained in:
Rex Dieter 2010-12-07 12:40:20 -06:00
parent 44c4bfa808
commit 10df5db516
2 changed files with 7 additions and 4 deletions

View File

@ -7,8 +7,8 @@ diff -up fltk-1.1.10/configure.pkgconfig_xft fltk-1.1.10/configure
if test "x$FTCONFIG" != x; then
- CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS"
- CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS"
+ CPPFLAGS="`pkg-config xft --cflags` $CPPFLAGS"
+ CXXFLAGS="`pkg-config xft --cflags` $CXXFLAGS"
+ CPPFLAGS="`pkg-config --cflags xft fontconfig` $CPPFLAGS"
+ CXXFLAGS="`pkg-config --cflags xft fontconfig` $CXXFLAGS"
if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
@ -17,7 +17,7 @@ diff -up fltk-1.1.10/configure.pkgconfig_xft fltk-1.1.10/configure
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXft $LIBS"
+LIBS="`pkg-config xft --libs` $LIBS"
+LIBS="`pkg-config --libs xft fontconfig` $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF

View File

@ -4,7 +4,7 @@
Summary: C++ user interface toolkit
Name: fltk
Version: 1.1.10
Release: 4%{?dist}
Release: 5%{?dist}
# see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
License: LGPLv2+ with exceptions
@ -227,6 +227,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%changelog
* Tue Dec 07 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.1.10-5
- FTBFS fltk-1.1.10-4.fc15: ImplicitDSOLinking (#660884)
* Wed Sep 29 2010 jkeating - 1.1.10-4
- Rebuilt for gcc bug 634757