rpms/fltk
6
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

5
fltk.spec
View File

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