summaryrefslogtreecommitdiff
path: root/www/mozilla/files/patch-qt
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2001-05-17 08:15:36 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2001-05-17 08:15:36 +0000
commit9cf230d3ac3db5f9e8ca5ed7013c800de173f35a (patch)
tree02c6de14ca124ca601c512afe817471475b3666f /www/mozilla/files/patch-qt
parentinstalls examples and docs (diff)
Update to 0.9.
Not objected to by: gnome@FreeBSD.org
Diffstat (limited to 'www/mozilla/files/patch-qt')
-rw-r--r--www/mozilla/files/patch-qt31
1 files changed, 21 insertions, 10 deletions
diff --git a/www/mozilla/files/patch-qt b/www/mozilla/files/patch-qt
index 20c5d31abc0c..5558e352edee 100644
--- a/www/mozilla/files/patch-qt
+++ b/www/mozilla/files/patch-qt
@@ -1,15 +1,18 @@
---- configure.orig Sat Sep 30 23:16:14 2000
-+++ configure Thu Dec 21 00:49:23 2000
-@@ -6020,7 +6020,7 @@
- echo $ac_n "checking for Qt insanity""... $ac_c" 1>&6
- echo "configure:6022: checking for Qt insanity" >&5
+
+$FreeBSD$
+
+--- configure.orig Tue Apr 24 01:59:58 2001
++++ configure Mon May 14 21:48:26 2001
+@@ -6596,7 +6596,7 @@
+ fi
-- QT_CFLAGS="-I${QTDIR}/include/qt"
-+ QT_CFLAGS="-I${QTDIR}/include/X11/qt"
+
+- QT_CFLAGS="-I${QTDIR}/include -DQT_GENUINE_STR"
++ QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR"
QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
# Check whether --with-static-qt or --without-static-qt was given.
-@@ -8052,6 +8052,9 @@
+@@ -8703,6 +8703,9 @@
os2*)
LIBS=
;;
@@ -19,7 +22,7 @@
esac
for ac_hdr in sys/byteorder.h compat.h getopt.h
do
-@@ -8702,8 +8705,6 @@
+@@ -9392,8 +9395,6 @@
if test $? -eq 0; then
if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
ac_cv_have_dash_pthread=yes
@@ -28,7 +31,7 @@
fi
fi
rm -f conftest*
-@@ -8737,7 +8738,7 @@
+@@ -9427,7 +9428,7 @@
EOF
if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -37,3 +40,11 @@
else
_PTHREAD_LDFLAGS="-lc_r"
fi
+@@ -13902,6 +13903,7 @@
+ ;;
+ *)
+ NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs`
++ NSPR_LIBS="$NSPR_LIBS $BSD_PTHREAD_LIBS"
+ $PERL -pi.bak -e "s {^NSPR_LIBS\s*=.*} {NSPR_LIBS = $NSPR_LIBS }" config/autoconf.mk
+ ;;
+ esac