diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-03-11 06:37:24 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-03-11 06:37:24 +0000 |
| commit | 756e95283ea3218817ec67de0c233f3e264b7518 (patch) | |
| tree | d17cce3be6350f7bcfc290d42ccac807e8e70bc9 /www/mozilla/files/patch-qt | |
| parent | * Backout the OPTIONS commit. This requires more Makefile restructuring (diff) | |
Merge some fixes from mozilla-devel.
* Allow one to override JPI_LIST
* Fix some potential lock-ups related to esound
* Fix some potential pthread problems
* Fix libiconv support
* Use built-in libical
* Use included libart_lgpl
* Use SIZE
Notes
Notes:
svn path=/head/; revision=103608
Diffstat (limited to 'www/mozilla/files/patch-qt')
| -rw-r--r-- | www/mozilla/files/patch-qt | 38 |
1 files changed, 37 insertions, 1 deletions
diff --git a/www/mozilla/files/patch-qt b/www/mozilla/files/patch-qt index f4b74769e8d4..5420fec2679a 100644 --- a/www/mozilla/files/patch-qt +++ b/www/mozilla/files/patch-qt @@ -1,5 +1,41 @@ --- configure.orig Thu Dec 11 18:32:02 2003 -+++ configure Fri Jan 16 22:46:30 2004 ++++ configure Thu Mar 11 00:51:58 2004 +@@ -9181,7 +9181,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-liconv $LIBS" ++LIBS="-L$LOCALBASE/lib -liconv $LIBS" + cat > conftest.$ac_ext <<EOF + #line 9187 "configure" + #include "confdefs.h" +@@ -9212,7 +9212,7 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- _ICONV_LIBS="$_ICONV_LIBS -liconv" ++ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 +@@ -9222,7 +9222,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-liconv $LIBS" ++LIBS="-L$LOCALBASE/lib -liconv $LIBS" + cat > conftest.$ac_ext <<EOF + #line 9228 "configure" + #include "confdefs.h" +@@ -9253,7 +9253,7 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- _ICONV_LIBS="$_ICONV_LIBS -liconv" ++ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" + else + echo "$ac_t""no" 1>&6 + fi @@ -11969,9 +11969,9 @@ |