diff options
Diffstat (limited to 'www/mozilla-devel/files')
5 files changed, 46 insertions, 135 deletions
diff --git a/www/mozilla-devel/files/patch-build_unix_run-mozilla.sh b/www/mozilla-devel/files/patch-build_unix_run-mozilla.sh index 96084fd68646..f93248fd107b 100644 --- a/www/mozilla-devel/files/patch-build_unix_run-mozilla.sh +++ b/www/mozilla-devel/files/patch-build_unix_run-mozilla.sh @@ -1,5 +1,7 @@ ---- build/unix/run-mozilla.sh.orig Wed Oct 23 00:08:03 2002 -+++ build/unix/run-mozilla.sh Wed Oct 23 00:08:59 2002 +$FreeBSD$ + +--- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003 ++++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004 @@ -355,7 +355,7 @@ fi ## @@ -9,16 +11,7 @@ if [ -n "$LD_LIBRARYN32_PATH" ] then LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} -@@ -392,7 +392,7 @@ - export XSUNTRANSPORT XSUNSMESIZE - fi - # Font path for Xft --FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft" -+FONTCONFIG_PATH="%%PREFIX%%/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft" - export FONTCONFIG_PATH - - if [ "$moz_debug" -eq 1 ] -@@ -435,6 +435,9 @@ +@@ -442,6 +442,9 @@ # export MOZILLA_FIVE_HOME LD_LIBRARY_PATH export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH diff --git a/www/mozilla-devel/files/patch-config_preprocess.pl b/www/mozilla-devel/files/patch-config_preprocess.pl deleted file mode 100644 index 390f4700dd53..000000000000 --- a/www/mozilla-devel/files/patch-config_preprocess.pl +++ /dev/null @@ -1,56 +0,0 @@ ---- config/preprocessor.pl.orig Fri Oct 24 18:17:32 2003 -+++ config/preprocessor.pl Sun Dec 7 15:17:57 2003 -@@ -76,16 +76,40 @@ - ######################################################################## - - package main; --use File::Spec 0.8; -+use File::Spec; - use File::Spec::Unix; # on all platforms, because the #include syntax is unix-based -+use File::Basename; -+use Cwd; -+ -+# This code is taken from File::Spec::Unix 0.8. -+sub rel2abs { -+ my ($path, $base) = @_; -+ -+ if ( ! File::Spec->file_name_is_absolute( $path ) ) { -+ if ( !defined( $base ) || $base eq '' ) { -+ $base = cwd() ; -+ } -+ elsif ( ! File::Spec->file_name_is_absolute( $base ) ) { -+ $base = rel2abs( $base ); -+ } -+ else { -+ $base = File::Spec->canonpath( $base ); -+ } -+ -+ $path = File::Spec->catdir( $base, $path ); -+ } -+ -+ return File::Spec->canonpath( $path ); -+} -+# End code from File::Spec::Unix -+ - - sub include { - my($stack, $filename) = @_; - my $directory = $stack->{'variables'}->{'DIRECTORY'}; - if ($filename ne '-') { -- $filename = File::Spec->rel2abs($filename, $directory); -- my($volume, $path) = File::Spec->splitpath($filename); -- $directory = File::Spec->catpath($volume, $path, ''); -+ $filename = rel2abs($filename, $directory); -+ $directory = File::Spec->catdir(dirname($filename)); - } - local $stack->{'variables'}->{'DIRECTORY'} = $directory; - local $stack->{'variables'}->{'FILE'} = $filename; -@@ -395,7 +419,7 @@ - my $stack = shift; - return if $stack->disabled; - die "argument expected\n" unless @_; -- my $filename = File::Spec->catpath(File::Spec::Unix->splitpath(@_)); -+ my $filename = File::Spec->catpath(dirname(@_), basename(@_)); - if ($stack->{'dependencies'}) { - $stack->visit($filename); - } else { diff --git a/www/mozilla-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/mozilla-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp deleted file mode 100644 index 2adcd3412e13..000000000000 --- a/www/mozilla-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp +++ /dev/null @@ -1,48 +0,0 @@ ---- gfx/src/gtk/nsFontMetricsXft.cpp.orig Tue Nov 25 21:44:50 2003 -+++ gfx/src/gtk/nsFontMetricsXft.cpp Sun Dec 7 15:20:48 2003 -@@ -105,6 +105,7 @@ - FcPattern *mPattern; - FcPattern *mFontName; - FcCharSet *mCharset; -+ int mNotXft; - }; - - class nsFontXftInfo; -@@ -1093,7 +1094,7 @@ - - for (PRInt32 i = 1, end = mLoadedFonts.Count(); i < end; ++i) { - nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i); -- if (font->HasChar(PRUint32(aChar))) -+ if (font->HasChar(PRUint32(aChar)) && font->GetXftFont()) - return font; - } - -@@ -1960,6 +1961,7 @@ - FcPatternReference(mFontName); - - mXftFont = nsnull; -+ mNotXft = 0; - - // set up our charset - mCharset = nsnull; -@@ -1986,7 +1988,7 @@ - XftFont * - nsFontXft::GetXftFont(void) - { -- if (!mXftFont) { -+ if (!mXftFont && !mNotXft) { - FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName); - if (!pat) - return nsnull; -@@ -2005,8 +2007,10 @@ - FcPatternDel(pat, FC_SPACING); - - mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat); -- if (!mXftFont) -+ if (!mXftFont) { - FcPatternDestroy(pat); -+ mNotXft = 1; -+ } - } - - return mXftFont; diff --git a/www/mozilla-devel/files/patch-modules::libpref::src::unix::unix.js b/www/mozilla-devel/files/patch-modules::libpref::src::unix::unix.js deleted file mode 100644 index bd39a70bf05d..000000000000 --- a/www/mozilla-devel/files/patch-modules::libpref::src::unix::unix.js +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- modules/libpref/src/unix/unix.js 2002/03/14 15:04:20 1.1 -+++ modules/libpref/src/unix/unix.js 2002/03/14 15:04:38 -@@ -227,7 +227,7 @@ - - // TrueType - pref("font.FreeType2.enable", false); --pref("font.freetype2.shared-library", "libfreetype.so.6"); -+pref("font.freetype2.shared-library", "libfreetype.so.9"); - // if libfreetype was built without hinting compiled in - // it is best to leave hinting off - pref("font.FreeType2.autohinted", false); diff --git a/www/mozilla-devel/files/patch-qt b/www/mozilla-devel/files/patch-qt index d7e0dd95bbc2..8f1959e47c31 100644 --- a/www/mozilla-devel/files/patch-qt +++ b/www/mozilla-devel/files/patch-qt @@ -1,14 +1,50 @@ ---- configure.orig Tue Aug 26 11:56:36 2003 -+++ configure Fri Aug 29 15:42:39 2003 -@@ -11870,9 +11870,9 @@ +--- configure.orig Thu Feb 12 11:11:29 2004 ++++ configure Wed Feb 25 17:48:17 2004 +@@ -9259,7 +9259,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 9265 "configure" + #include "confdefs.h" +@@ -9290,7 +9290,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 +@@ -9300,7 +9300,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 9306 "configure" + #include "confdefs.h" +@@ -9331,7 +9331,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 +@@ -12047,9 +12047,9 @@ -MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck" +MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices spellcheck" --MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm datetime finger cview layout-debug" -+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm datetime finger cview layout-debug" +-MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm datetime finger cview layout-debug tasks" ++MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm datetime finger cview layout-debug tasks" # Check whether --enable-extensions or --disable-extensions was given. if test "${enable_extensions+set}" = set; then |