diff options
author | Michael Johnson <ahze@FreeBSD.org> | 2005-11-29 21:12:28 +0000 |
---|---|---|
committer | Michael Johnson <ahze@FreeBSD.org> | 2005-11-29 21:12:28 +0000 |
commit | 36353c589f868095c2c4e18fcdee86c8345cc2fc (patch) | |
tree | cd5afec946f2d0e169655af460f2c7135a2153f5 /www/mozilla/files/patch-qt | |
parent | Update to the 20051125 snapshot of GCC 4.1.0 (which gets us rid of a (diff) |
- Update firefox to 1.5
- Add Makefile.common
o A new build/install system for gecko ports, Makefile.common
includes many generic routines and common tasks.
o Fix ld-run-path in all gecko's by using -Wl,-rpath,${moz_libdir}
thus removing the need to have a startup script for ports that
depend on gecko. [2]
o Use system libm, nss, nspr in all gecko ports
- Add bsd.gecko.mk
o This is the predecessor to WITH_MOZILLA=[mozilla|firefox|...]
with a more robust way of detecting a gecko a end user wishs to
use.
o bsd.gecko.mk abstracts the selection of gecko-based backends. It
allows users and porters to support any available gecko backend
without needing to build many conditional tests. ${USE_GECKO} is the
list of backends that your port can handle, and ${GECKO} is set by
bsd.gecko.mk to be the chosen backend. Users set ${WITH_GECKO} to the
list of gecko backends they want on their system.
Port Makefile example:
USE_GECKO=firefox mozilla seamonkey thunderbird
.include <bsd.port.pre.mk>
.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
End user example:
WITH_GECKO=seamonkey firefox
We highly recommend moving away from using WITH_MOZILLA and switching to
USE/WITH_GECKO.
PR: 89052 [2]
Submitted by: vs [2]
Obtained from: www/firefox
Thanks to: adamw, marcus, and mezz for ideas, bug squashing, and more
sajd from irc.freenode.org/#FreeBSD-Gnome for
pointing out many bugs
Diffstat (limited to 'www/mozilla/files/patch-qt')
-rw-r--r-- | www/mozilla/files/patch-qt | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/www/mozilla/files/patch-qt b/www/mozilla/files/patch-qt index 6b72f3f007ae..d1cb9f9f7ece 100644 --- a/www/mozilla/files/patch-qt +++ b/www/mozilla/files/patch-qt @@ -1,15 +1,15 @@ ---- configure.orig Tue Apr 20 21:39:17 2004 -+++ configure Thu Apr 29 14:01:52 2004 -@@ -9362,7 +9362,7 @@ +--- configure.orig Tue Oct 12 00:13:29 2004 ++++ configure Wed Nov 23 01:48:55 2005 +@@ -9368,7 +9368,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 9368 "configure" + #line 9374 "configure" #include "confdefs.h" -@@ -9393,7 +9393,7 @@ +@@ -9399,7 +9399,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -18,16 +18,16 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -9403,7 +9403,7 @@ +@@ -9409,7 +9409,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 9409 "configure" + #line 9415 "configure" #include "confdefs.h" -@@ -9434,7 +9434,7 @@ +@@ -9440,7 +9440,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -36,7 +36,22 @@ else echo "$ac_t""no" 1>&6 fi -@@ -12298,9 +12298,9 @@ +@@ -11401,12 +11401,12 @@ + + echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 + echo "configure:11404: checking MOZ_GTK2_CFLAGS" >&5 +- MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"` ++ MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7" "pangox >= 1.1.0"` + echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6 + echo "configure:11409: checking MOZ_GTK2_LIBS" >&5 +- MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7"` ++ MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7" "pangox >= 1.1.0"` + echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6 + else + MOZ_GTK2_CFLAGS="" +@@ -12344,9 +12344,9 @@ |