diff options
Diffstat (limited to 'www/firefox36/files')
27 files changed, 61 insertions, 1221 deletions
diff --git a/www/firefox36/files/firefox.desktop.in b/www/firefox36/files/firefox.desktop.in index 8d288dc574f4..509bd7b89aa0 100644 --- a/www/firefox36/files/firefox.desktop.in +++ b/www/firefox36/files/firefox.desktop.in @@ -182,8 +182,8 @@ Comment[vi]=Duyệt web Comment[wa]=Naivyî avå les waibes Comment[zh_CN]=浏览 Web Comment[zh_TW]=瀏覽網頁 -Exec=firefox %U -Icon=@PORTNAME_ICON@ +Exec=firefox@FF_SUFX@ %U +Icon=@FIREFOX_ICON@ StartupNotify=false Terminal=false Type=Application diff --git a/www/firefox36/files/firefox.rb b/www/firefox36/files/firefox.rb deleted file mode 100644 index 69e9bacdea1e..000000000000 --- a/www/firefox36/files/firefox.rb +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/env ruby -=begin -*-mode: ruby-*- - - MoZiLLa.in - - Copyright (c) 2002, Alan Eldridge - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - * Neither the name of the copyright owner nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - - $Id: firefox.rb,v 1.1 2005/03/05 01:49:02 marcus Exp $ - - 2002-12-16 Alan Eldridge <alane@geeksrus.net> - -=end - -X11BIN = "/usr/X11R6/bin" -NAME = File::basename($0, ".rb") -APP_PATH = File::join(X11BIN, NAME) - -if !File::executable?(APP_PATH) - raise "File '#{APP_PATH}' not found. Giving up." -elsif ($display = ENV["DISPLAY"]) == nil - raise "Environment variable DISPLAY not found. Giving up." -end - -if ARGV.size > 0 - if ARGV[0] == "--debug" - ARGV.shift - else - $stdin.reopen(File::open("/dev/null", "r")) - $stdout.reopen(File::open("/dev/null", "w")) - $stderr.reopen(File::open("/dev/null", "w")) - end -end - -if ARGV.size < 1 - $url = nil -else - $url = ARGV.pop - $url.sub!(/^ghelp:/, "file:") -end - -IO::popen("xwininfo -display #{$display} -root -tree") { - |io| - if NAME != "firefox" - $windows = io.grep(%r<"Mozilla"\s+"navigator:\s*browser">) - else - $windows = io.grep(%r<Firefox-bin.*>) - end -} - -if $windows.size > 0 - $id = $windows.map { - |s| s.strip.split.first - }.sort.first - $args = [ "-id", $id, "-raise", "-remote" ] - $args.push($url ? "\"openURL(#{$url},new-window)\"" : - "\"xfeDoCommand(openBrowser)\"") -else - $args = ARGV - $args.push("\"#{$url}\"") if $url -end - -fork { - exec(([APP_PATH] + $args).join(" ")) -} -exit! - -#EOF diff --git a/www/firefox36/files/mkdistfile b/www/firefox36/files/mkdistfile deleted file mode 100644 index 3c3ae1744c4c..000000000000 --- a/www/firefox36/files/mkdistfile +++ /dev/null @@ -1,171 +0,0 @@ -#!/bin/sh -# -*-shell-script-*- -# -# mkdistfile -- maintainer's utility to make a firefox distfile -# -# Copyright (c) 2002, Alan Eldridge -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# * Neither the name of the copyright owner nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -# $FreeBSD$ -# -# 2002/10/21 alane@geeksrus.net -# - -ORIGDIR=$(/bin/pwd); export ORIGDIR -APPNAME=${0##*/};APPNAME=${APPNAME#-}; export APPNAME -test -z "$TMPDIR" && TMPDIR=/tmp; export TMPDIR -test -z "$HOSTNAME" && HOSTNAME=$(hostname); export HOSTNAME -warn() { echo "[$APPNAME:$$]" "****" "$@";} -status() { echo "[$APPNAME:$$]" "===>" "$@";} -error() { echo "[$APPNAME:$$]" "ERROR:" "$@";} -die() { echo "[$APPNAME:$$]" "FATAL:" "$@"; exit 1;} -unset echo_n; test "X`echo -n`" = "X-n" \ - && echo_n() { echo "$@\c"; } || echo_n() { echo -n "$@"; } -status_n() { echo_n "[$APPNAME:$$]" "===>" "$@";} -log() { local cmd=$1;shift;echo_n $(date "+%Y%m%d.%T") "";$cmd "$@";} -qexpr() { expr "$@" >/dev/null 2>&1;} -qw() { echo \""$@"\"; } -listfiles() { ls -1 ${1:+"$@"} 2>/dev/null; } -whichre() { local n=$#; local s="$1"; shift; while test $# -ge 1; do - qexpr "$s" : "$1"&& echo $(($n - $#)) && return 0; shift; done; - echo 0; return 1;} -matchre() { test $(whichre "$@") -gt 0; } -streq() { local s="$1"; shift; while test $# -ge 1; do - test "X$s" = "X$1" && return 0; shift; done; return 1;} -strupper() { - echo "$@"|tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ -} -strlower() { - echo "$@"|tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz -} -chdir() { cd "$1" || die cd $(qw $1) failed; } -absdir() { chdir "$1" && pwd; } -abspath() { local p=''; case "$1" in /*);; *)p="$(pwd)/";; esac; echo "$p$1"; } -tmpfile() { mktemp -t .$APPNAME ${1:+"$@"}; } -############################################################ -# show usage and exit -############################################################ -usage() { - cat <<EOF -Usage: $APPNAME [options] [--] rev[.yyyymmdd] -Options: - -h,--help Show this help. - -V,--version Show version number. - -v,--verbose Produce more verbose output. - -x,--debug Turn on shell command tracing. - -- Stop option processing. -EOF - exit $1 -} -############################################################ -# show version and exit -############################################################ -VERSION='$Revision: 1.1 $' -VERSION=${VERSION#* }; VERSION=${VERSION% *} -version() { echo "$APPNAME $VERSION" \ - "Copyright (c) 2002 Alan Eldridge"; exit $1;} -############################################################ -# set default vars here -############################################################ -DEBUG=0 -VERBOSE=0; VFLG='' -DATETIME=$(date +%Y%m%d.%H%M) -DATE=${DATETIME%.*} -TIME=${DATETIME#*.} -############################################################ -# do command line options -############################################################ -while test $# -gt 0; do - n=1; case "$1" in - -h|--help) usage 0;; - -V|--version) version 0;; - -v|--verbose) VERBOSE=1;VFLG='-v';; - -x|--debug) set -x;DEBUG=1;; - --) shift; break;; -*) usage 1;; *) break;; - esac; shift $n -done - -############################################################ -# main(): script execution begins here -############################################################ - -test $# -eq 1 || usage 1 - -REV=$1 -test ${REV##*.} = today && REV=${REV%.*}.$DATE - -status "pruning tree..." -exfile=$(tmpfile) -cat >>$exfile <<'EOF' -^.*/CVS($|/) -^.*/macbuild($|/) -^.*/package($|/) -^.*/.cvsignore($|/) -^.*/windows($|/) -^.*/activex($|/) -^.*/os2($|/) -^.*/solaris($|/) -^.*/gc($|/) -^mozilla/apache($|/) -^mozilla/calendar($|/) -^mozilla/cck($|/) -^mozilla/chimera($|/) -^mozilla/ef($|/) -^mozilla/embed.mak($|/) -^mozilla/embed.mk($|/) -^mozilla/gconfig($|/) -^mozilla/gfx2($|/) -^mozilla/grendel($|/) -^mozilla/java($|/) -^mozilla/js2($|/) -^mozilla/mail($|/) -^mozilla/mailnews($|/) -^mozilla/mozilla($|/) -^mozilla/mozilla.kdevprj($|/) -^mozilla/mozilla.lsm($|/) -^mozilla/msgsdk($|/) -^mozilla/mstone($|/) -^mozilla/nglayout.mac($|/) -^mozilla/nunet($|/) -^mozilla/other-licenses($|/) -^mozilla/privacy($|/) -^mozilla/silentdl($|/) -^mozilla/timer($|/) -^mozilla/trex.mak($|/) -^mozilla/trex.mk($|/) -^mozilla/webtools($|/) -EOF -test -d mozilla || die "No mozilla dir here." -find mozilla 2>/dev/null | egrep -f $exfile | xargs rm -fr -rm -f $exfile -status "making firefox-$REV.tar.bz2 ..." -tar -cjpf firefox-$REV.tar.bz2 mozilla -status "done." -#EOF diff --git a/www/firefox36/files/mozconfig.in b/www/firefox36/files/mozconfig.in deleted file mode 100644 index 0ca3dff21f93..000000000000 --- a/www/firefox36/files/mozconfig.in +++ /dev/null @@ -1,82 +0,0 @@ -# .mozconfig.in -*-shell-script-*- -# $FreeBSD$ -###################################################################### -# standard opts from README -export MOZ_PHOENIX=1 -mk_add_options MOZ_PHOENIX=1 -ac_add_options --enable-crypto -ac_add_options --disable-tests -ac_add_options --disable-mailnews -ac_add_options --disable-composer -ac_add_options --enable-default-toolkit=gtk2 -# See the following URL for approval email for using official branding -# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt -ac_add_options --enable-official-branding -###################################################################### -# FBSD specific -export CPPFLAGS="@CPPFLAGS@" -export CFLAGS="@CFLAGS@" -export LIBS="@LIBS@" -export LDFLAGS="@LDFLAGS@" -export CONFIG_SH=/bin/sh -export XP_UNIX=1 -mk_add_options XP_UNIX=1 -export PERL="@PERL@" -mk_add_options PERL=$PERL -# Configure options for installation -ac_add_options --prefix=@FAKEDIR@ -ac_add_options --x-includes=@X11BASE@/include -ac_add_options --x-libraries=@X11BASE@/lib -###################################################################### -# Use ports for these libraries -ac_add_options --with-system-jpeg=@LOCALBASE@ -ac_add_options --with-system-zlib -ac_add_options --with-system-png=@LOCALBASE@ -ac_add_options --with-system-nspr -ac_add_options --with-gssapi=@KRB5_HOME@ -###################################################################### -# set compile/link features -ac_add_options --with-pthreads -###################################################################### -# disable unneeded/unavailable -ac_add_options --disable-auto-deps -ac_add_options --disable-bidi -ac_add_options --disable-dtd-debug -ac_add_options --disable-jsd -ac_add_options --disable-ldap -ac_add_options --disable-pedantic -ac_add_options --disable-profilesharing -ac_add_options --disable-installer -ac_add_options --enable-single-profile -ac_add_options --disable-profilesharing -ac_add_options --enable-image-decoders=all -ac_add_options --enable-extensions="cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,p3p,gnomevfs,negotiateauth" -###################################################################### -# conditional from port Makefile -#if test -n "$WITH_REORDER"; then -# ac_add_options --enable-reorder -#else -# ac_add_options --disable-reorder -#fi # test -n "$WITH_REORDER" -if test -n "$WITH_DEBUG"; then - ac_add_options --enable-debug - ac_add_options --disable-strip -else - ac_add_options --disable-debug - ac_add_options --enable-optimize=${WITH_OPTIMIZE} - ac_add_options --enable-strip -fi # test -n "$WITH_DEBUG" -if test -n "$WITH_LOGGING"; then - ac_add_options --enable-logging -else - ac_add_options --disable-logging -fi # test -n "$WITH_LOGGING" -if test -z "$WITHOUT_XFT"; then - ac_add_options --enable-xft -else - ac_add_options --disable-xft -fi # test -z "$WITHOUT_XFT" -if test -z "$WITH_SMB"; then - ac_add_options --disable-gnomevfs -fi # test -z "$WITH_SMB" -###################################################################### diff --git a/www/firefox36/files/patch-Double.cpp b/www/firefox36/files/patch-Double.cpp index 26a1fa56337a..06d16060503c 100644 --- a/www/firefox36/files/patch-Double.cpp +++ b/www/firefox36/files/patch-Double.cpp @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-Double.cpp,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- extensions/transformiix/source/base/Double.cpp.orig Thu Jan 30 09:26:46 2003 +++ extensions/transformiix/source/base/Double.cpp Sun Nov 16 01:46:42 2003 diff --git a/www/firefox36/files/patch-browser_app_mozilla.in b/www/firefox36/files/patch-browser_app_mozilla.in index 414bc881e492..c815a4780038 100644 --- a/www/firefox36/files/patch-browser_app_mozilla.in +++ b/www/firefox36/files/patch-browser_app_mozilla.in @@ -1,6 +1,6 @@ ---- browser/app/mozilla.in.orig Tue Oct 26 11:26:11 2004 -+++ browser/app/mozilla.in Wed Mar 23 20:43:07 2005 -@@ -29,51 +29,83 @@ +--- browser/app/mozilla.in.orig Mon Apr 4 15:08:49 2005 ++++ browser/app/mozilla.in Wed Jun 1 14:47:45 2005 +@@ -49,51 +49,83 @@ ## the mozilla-bin binary to work. ## @@ -123,349 +123,3 @@ # Use run-mozilla.sh in the current dir if it exists # If not, then start resolving symlinks until we find run-mozilla.sh -@@ -82,151 +114,221 @@ - curdir=`dirname "$progname"` - progbase=`basename "$progname"` - run_moz="$curdir/run-mozilla.sh" --if test -x "$run_moz"; then -- dist_bin="$curdir" -- found=1 -+if [ -x "$run_moz" ]; then -+ dist_bin="$curdir" -+ found=1 - else -- here=`/bin/pwd` -- while [ -h "$progname" ]; do -- bn=`basename "$progname"` -- cd `dirname "$progname"` -- progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' ` -- if [ ! -x "$progname" ]; then -- break -- fi -- curdir=`dirname "$progname"` -- run_moz="$curdir/run-mozilla.sh" -- if [ -x "$run_moz" ]; then -- cd "$curdir" -- dist_bin=`pwd` -- run_moz="$dist_bin/run-mozilla.sh" -- found=1 -- break -- fi -- done -- cd "$here" -+ while [ -h "${progname}" ]; do -+ bn=`basename "${progname}"` -+ cd `dirname "${progname}"` -+ progname=`ls -l "${bn}" | sed -e 's/^.* -> //'` -+ if [ ! -x "$progname" ]; then -+ break -+ fi -+ curdir=`dirname "${progname}"` -+ run_moz="${curdir}/run-mozilla.sh" -+ if [ -x "${run_moz}" ]; then -+ cd "$curdir" -+ dist_bin=`pwd` -+ run_moz="${dist_bin}/run-mozilla.sh" -+ found=1 -+ break -+ fi -+ done -+ cd "${here}" - fi - if [ $found = 0 ]; then -- # Check default compile-time libdir -- if [ -x "$moz_libdir/run-mozilla.sh" ]; then -- dist_bin="$moz_libdir" -- else -- echo "Cannot find mozilla runtime directory. Exiting." -- exit 1 -- fi --fi -- --script_args="" --debugging=0 --MOZILLA_BIN="${progbase}-bin" -- --# The following is to check for a currently running instance. --# This is taken almost verbatim from the Mozilla RPM package's launch script. --MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client" --check_running() { -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null -- RETURN_VAL=$? -- if [ $RETURN_VAL -eq 0 ]; then -- echo 1 -- return 1 -+ # Check default compile-time libdir -+ if [ -x "${moz_libdir}/run-mozilla.sh" ]; then -+ dist_bin="$moz_libdir" -+ run_moz="${dist_bin}/run-mozilla.sh" - else -- echo 0 -- return 0 -+ echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2 -+ exit 1 - fi --} -+fi - -+MOZILLA_BIN="${progbase}-bin" - if [ "$OSTYPE" = "beos" ]; then -- mimeset -F "$MOZILLA_BIN" -+ mimeset -F "$MOZILLA_BIN" - fi - --ALREADY_RUNNING=`check_running` -+# test for binary apps in ${dist_bin} -+if [ -x "${dist_bin}/${MOZILLA_BIN}" ]; then -+ MOZILLA_BIN="${dist_bin}/${progbase}-bin" -+else -+ echo "$0: Cannot find mozilla binary executable. Exiting." 1>&2 -+ exit 1 -+fi -+if [ -x "${dist_bin}/mozilla-xremote-client" ]; then -+ MOZ_CLIENT_PROGRAM="${dist_bin}/mozilla-xremote-client -a ${progbase}" -+else -+ MOZ_CLIENT_PROGRAM="${MOZILLA_BIN} -remote -a ${progbase}" -+fi - --################################################################ Parse Arguments --# If there's a command line argument but it doesn't begin with a - --# it's probably a url. Try to send it to a running instance. --_USE_EXIST=0 --_optOne="$1" --case "${_optOne}" in -- -*) -- ;; -+# guest a default remote command -+_remote_cmd="xfeDoCommand(openBrowser)" -+ -+# parse options -+script_args= # null -+moreargs= # null -+target= # null -+ALREADY_RUNNING="test" -+while [ $# -gt 0 ] -+do -+ if [ -n "${target}" ]; then -+ # well, this can't be the target if not last -+ moreargs="${moreargs} \"${target}\"" -+ target= # null -+ fi -+ case "$1" in -+ # preserve [pP] for profile -+ --pure | -pure) -+ MOZILLA_BIN="${MOZILLA_BIN}.pure" -+ shift -+ ;; -+ -g | --debug) -+ script_args="${script_args} -g" -+ debugging=1 -+ shift -+ ;; -+ -d | --debugger) -+ if [ -n "$2" ]; then -+ script_args="${script_args} -d $2" -+ shift 2 -+ else -+ "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -[Uu][Ii][Ll]ocale) -+ if [ -n "$2" ]; then -+ uilocale="$2" -+ shift 2 -+ else -+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -[Uu][Ii][Rr]egion) -+ if [ -n "$2" ]; then -+ uiregion="$2" -+ shift 2 -+ else -+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -browser) -+ # browser is default for firefox -+ shift -+ ;; -+ -turbo | -nosplash | -quiet) -+ # use remote even with this -+ moreargs="${moreargs} $1" -+ shift -+ ;; -+ -*) -+ # don't use remote with options -+ ALREADY_RUNNING= # null -+ moreargs="${moreargs} $1" -+ shift -+ ;; - *) -- _USE_EXIST=1 -- ;; --esac -- --_optLast= --for i in "$@"; do -- _optLast="${i}" --done #last arg -- --if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then -- # Last argument seems to be a local file/directory -- # Check, if it is absolutely specified (ie. /home/foo/file vs. ./file) -- # If it is just "relatively" (./file) specified, make it absolutely -- [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}" --fi --################################################################ Parse Arguments -- --########################################################################### Main --if [ $ALREADY_RUNNING -eq 1 ]; then -- # There's an instance already running. Use it. -- # Any command line args passed in? -- if [ $# -gt 0 ]; then -- # There were "some" command line args. -- if [ ${_USE_EXIST} -eq 1 ]; then -- # We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1 -- _remote_cmd="openURL(${_optLast})" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}" -- unset _remote_cmd -- exit $? -- fi -+ target="$1" -+ shift -+ ;; -+ esac -+done -+ -+# test for a running copy of firefox -+# seems this is not needed -+#if [-n "${ALREADY_RUNNING}" ]; then -+# if [ -n "${DISPLAY}" ]; then -+# if [ -n "${debugging}" ]; then -+# echo "${run_moz} ${MOZ_CLIENT_PROGRAM} ping()" -+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' && ALREADY_RUNNING="yes" -+# else -+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' >/dev/null 2>&1 && -+# ALREADY_RUNNING="yes" -+# fi -+# elif [ -n "${debugging}" ]; then -+# echo "$0: WARN, no DISPLAY environment" 1>&2 -+# fi -+#fi -+ -+# process target -+if [ -n "${target}" ]; then -+ moreargs="${moreargs} \"${target}\"" -+ if [ -n "${ALREADY_RUNNING}" ]; then -+ if [ `expr "${target}" : '.*:.*'` -eq 0 ]; then -+ if [ `expr "${target}" : '/.*'` -eq 0 ]; then -+ target="${here}/${target}" -+ fi -+ if [ -r "${target}" -o -d "${target}" ]; then -+ [ -n "${use_openFile}" ] || target="file://${target}" -+ else -+ echo "$0: WARN, target: ${target} not an URI/file/dir" 1>&2 -+ ALREADY_RUNNING= # null -+ fi - else -- # No command line args. Open new window/tab -- #exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)" -- exit $? -+ # an former URI, don't use openFile -+ use_openFile= # null - fi -+ fi - fi --# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1 --########################################################################### Main - --pass_arg_count=0 --while [ $# -gt $pass_arg_count ] --do -- case "$1" in -- -p | --pure | -pure) -- MOZILLA_BIN="${MOZILLA_BIN}.pure" -- shift -- ;; -- -g | --debug) -- script_args="$script_args -g" -- debugging=1 -- shift -- ;; -- -d | --debugger) -- script_args="$script_args -d $2" -- shift 2 -- ;; -- *) -- # Move the unrecognized argument to the end of the list. -- arg="$1" -- shift -- set -- "$@" "$arg" -- pass_arg_count=`expr $pass_arg_count + 1` -- ;; -- esac --done -+# try remote protocol if running -+if [ -n "${ALREADY_RUNNING}" ]; then -+ if [ -n "${target}" ]; then -+ if [ -n "${use_openFile}" ]; then -+ _remote_cmd="openFile(${target})" -+ elif [ -n "${location}" ]; then -+ _remote_cmd="openURL(${target},${location})" -+ else -+ _remote_cmd="openURL(${target})" -+ fi -+ fi -+ # FIXME problems with freedesktop StartupNotify -+ if [ -n "${debugging}" ]; then -+ echo "${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd}" -+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} && -+ exit 0 -+ else -+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} \ -+ >/dev/null 2>&1 && exit 0 -+ fi -+fi -+ -+# fallback to direct invocation -+ -+# UILocale, UIRegion -+if [ -z "${uilocale}" -a -n "${MOZILLA_UILOCALE}" ]; then -+ uilocale="${MOZILLA_UILOCALE}" -+fi -+if [ -z "${uiregion}" -a -n "${MOZILLA_UIREGION}" ]; then -+ uiregion="${MOZILLA_UIREGION}" -+fi -+if [ -n "${uiregion}" -a -z "${uilocale}" ]; then -+ uilocale="en-US" -+fi -+if [ -n "${uilocale}" ]; then -+ if [ -n "${uiregion}" ]; then -+ moreargs="-UIRegion ${uiregion} ${moreargs}" -+ fi -+ moreargs="-UILocale ${uilocale} ${moreargs}" -+fi - --export MRE_HOME -+# real invocation -+eval "set -- ${moreargs}" - - ## Start addon scripts - moz_pis_startstop_scripts "start" - --if [ $debugging = 1 ] --then -- echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@" -+if [ -n "${debugging}" ]; then -+ echo "${run_moz} ${script_args} ${MOZILLA_BIN} $@" - fi --"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@" -+${run_moz} ${script_args} ${MOZILLA_BIN} "$@" - exitcode=$? - - ## Stop addon scripts diff --git a/www/firefox36/files/patch-bugzilla149334 b/www/firefox36/files/patch-bugzilla149334 deleted file mode 100644 index fe1be5bc8fc0..000000000000 --- a/www/firefox36/files/patch-bugzilla149334 +++ /dev/null @@ -1,342 +0,0 @@ -Index: gfx/idl/nsIFreeType2.idl -=================================================================== -RCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v -retrieving revision 1.10 -diff -u -3 -p -r1.10 nsIFreeType2.idl ---- gfx/idl/nsIFreeType2.idl 15 Apr 2004 23:30:02 -0000 1.10 -+++ gfx/idl/nsIFreeType2.idl 26 May 2004 10:00:54 -0000 -@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer); - native FT_Sfnt_Tag(FT_Sfnt_Tag); - native FT_Size(FT_Size); - --[ptr] native FTC_Image_Desc_p(FTC_Image_Desc); -+[ptr] native FTC_ImageType_p(FTC_ImageType); - native FTC_Face_Requester(FTC_Face_Requester); - native FTC_Font(FTC_Font); --native FTC_Image_Cache(FTC_Image_Cache); -+native FTC_FaceID(FTC_FaceID); -+native FTC_ImageCache(FTC_ImageCache); - native FTC_Manager(FTC_Manager); - - // #ifdef MOZ_SVG -@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports - - readonly attribute FT_Library library; - readonly attribute FTC_Manager FTCacheManager; -- readonly attribute FTC_Image_Cache ImageCache; -+ readonly attribute FTC_ImageCache ImageCache; - - void doneFace(in FT_Face face); - void doneFreeType(in FT_Library lib); -@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports - void outlineDecompose(in FT_Outline_p outline, - in const_FT_Outline_Funcs_p funcs, in voidPtr p); - void setCharmap(in FT_Face face, in FT_CharMap charmap); -- void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc, -+ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc, - in FT_UInt gindex, out FT_Glyph glyph); -- void managerLookupSize(in FTC_Manager manager, in FTC_Font font, -- out FT_Face face, out FT_Size size); -+ void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id, -+ out FT_Face face); - void managerDone(in FTC_Manager manager); - void managerNew(in FT_Library lib, in FT_UInt max_faces, - in FT_UInt max_sizes, in FT_ULong max_bytes, - in FTC_Face_Requester requester, in FT_Pointer req_data, - out FTC_Manager manager); -- void imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache); -+ void imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache); - /* #ifdef MOZ_SVG */ - void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix, - in FT_Vector_p delta); -Index: gfx/src/freetype/nsFreeType.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v -retrieving revision 1.25 -diff -u -3 -p -r1.25 nsFreeType.cpp ---- gfx/src/freetype/nsFreeType.cpp 17 Apr 2004 21:52:29 -0000 1.25 -+++ gfx/src/freetype/nsFreeType.cpp 26 May 2004 10:00:54 -0000 -@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = { - {"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE}, - {"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE}, - {"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE}, -- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, -- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE}, -+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, -+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE}, - {"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE}, - {"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE}, -- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, -+ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, - // #ifdef MOZ_SVG - {"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE}, - {"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE}, -@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT - } - - NS_IMETHODIMP --nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc, -+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc, - FT_UInt glyphID, FT_Glyph *glyph) - { - // call the FreeType2 function via the function pointer -@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_ - } - - NS_IMETHODIMP --nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font, -- FT_Face *face, FT_Size *size) -+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id, -+ FT_Face *face) - { - // call the FreeType2 function via the function pointer -- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size); -+ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face); - return error ? NS_ERROR_FAILURE : NS_OK; - } - -@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra - } - - NS_IMETHODIMP --nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache) -+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache) - { - // call the FreeType2 function via the function pointer - FT_Error error = nsFTC_Image_Cache_New(manager, cache); -@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res - } - - NS_IMETHODIMP --nsFreeType2::GetImageCache(FTC_Image_Cache *aCache) -+nsFreeType2::GetImageCache(FTC_ImageCache *aCache) - { - *aCache = mImageCache; - return NS_OK; -Index: gfx/src/freetype/nsFreeType.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v -retrieving revision 1.17 -diff -u -3 -p -r1.17 nsFreeType.h ---- gfx/src/freetype/nsFreeType.h 17 Apr 2004 21:52:29 -0000 1.17 -+++ gfx/src/freetype/nsFreeType.h 26 May 2004 10:00:54 -0000 -@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_ - typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*); - typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap); - typedef FT_Error (*FTC_Image_Cache_Lookup_t) -- (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*); --typedef FT_Error (*FTC_Manager_Lookup_Size_t) -- (FTC_Manager, FTC_Font, FT_Face*, FT_Size*); -+ (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*); -+typedef FT_Error (*FTC_Manager_LookupFace_t) -+ (FTC_Manager, FTC_FaceID, FT_Face*); - typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager); - typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong, - FTC_Face_Requester, FT_Pointer, FTC_Manager*); --typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*); -+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*); - // #ifdef MOZ_SVG - typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*); - typedef FT_Error (*FT_Get_Kerning_t) -@@ -181,7 +181,7 @@ protected: - FT_Outline_Decompose_t nsFT_Outline_Decompose; - FT_Set_Charmap_t nsFT_Set_Charmap; - FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup; -- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size; -+ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace; - FTC_Manager_Done_t nsFTC_Manager_Done; - FTC_Manager_New_t nsFTC_Manager_New; - FTC_Image_Cache_New_t nsFTC_Image_Cache_New; -@@ -229,7 +229,7 @@ protected: - PRLibrary *mSharedLib; - FT_Library mFreeTypeLibrary; - FTC_Manager mFTCacheManager; -- FTC_Image_Cache mImageCache; -+ FTC_ImageCache mImageCache; - - static nsHashtable *sFontFamilies; - static nsHashtable *sRange1CharSetNames; -Index: gfx/src/ps/nsFontMetricsPS.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v -retrieving revision 1.43 -diff -u -3 -p -r1.43 nsFontMetricsPS.cpp ---- gfx/src/ps/nsFontMetricsPS.cpp 17 Apr 2004 21:52:31 -0000 1.43 -+++ gfx/src/ps/nsFontMetricsPS.cpp 26 May 2004 10:01:03 -0000 -@@ -1140,10 +1140,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa - - mPixelSize = NSToIntRound(app2dev * mFont->size); - -- mImageDesc.font.face_id = (void*)mEntry; -- mImageDesc.font.pix_width = mPixelSize; -- mImageDesc.font.pix_height = mPixelSize; -- mImageDesc.image_type = 0; -+ mImageDesc->face_id = (FTC_FaceID)&mEntry; -+ mImageDesc->width = mPixelSize; -+ mImageDesc->height = mPixelSize; -+ mImageDesc->flags = 0; - - nsresult rv; - mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv); -@@ -1189,7 +1189,7 @@ nsFontPSFreeType::GetWidth(const PRUnich - if (!face) - return 0; - -- FTC_Image_Cache iCache; -+ FTC_ImageCache iCache; - nsresult rv = mFt2->GetImageCache(&iCache); - if (NS_FAILED(rv)) { - NS_ERROR("Failed to get Image Cache"); -@@ -1227,8 +1227,8 @@ nsFontPSFreeType::getFTFace() - - FTC_Manager cManager; - mFt2->GetFTCacheManager(&cManager); -- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, -- &face, nsnull); -+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, -+ &face); - NS_ASSERTION(rv==0, "failed to get face/size"); - if (rv) - return nsnull; -@@ -1621,16 +1621,16 @@ void nsFT2Type8Generator::GeneratePSFont - mEntry->GetFamilyName(fontName); - mEntry->GetStyleName(styleName); - -- mImageDesc.font.face_id = (void*)mEntry; -+ mImageDesc->face_id = (FTC_FaceID)&mEntry; - // TT glyph has no relation to size -- mImageDesc.font.pix_width = 16; -- mImageDesc.font.pix_height = 16; -- mImageDesc.image_type = 0; -+ mImageDesc->width = 16; -+ mImageDesc->height = 16; -+ mImageDesc->flags = 0; - FT_Face face = nsnull; - FTC_Manager cManager; - mFt2->GetFTCacheManager(&cManager); -- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, -- &face, nsnull); -+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, -+ &face); - if (NS_FAILED(rv)) - return; - -Index: gfx/src/ps/nsFontMetricsPS.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.h,v -retrieving revision 1.25 -diff -u -3 -p -r1.25 nsFontMetricsPS.h ---- gfx/src/ps/nsFontMetricsPS.h 17 Apr 2004 21:52:31 -0000 1.25 -+++ gfx/src/ps/nsFontMetricsPS.h 26 May 2004 10:01:03 -0000 -@@ -319,7 +319,7 @@ protected: - nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID; - nsCOMPtr<nsIFreeType2> mFt2; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - - - static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont, -@@ -362,7 +362,7 @@ public: - protected: - nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry; - nsCOMPtr<nsIFreeType2> mFt2; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - }; - #endif - -Index: gfx/src/x11shared/nsFontFreeType.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v -retrieving revision 1.14 -diff -u -3 -p -r1.14 nsFontFreeType.cpp ---- gfx/src/x11shared/nsFontFreeType.cpp 17 Apr 2004 21:52:34 -0000 1.14 -+++ gfx/src/x11shared/nsFontFreeType.cpp 26 May 2004 10:01:03 -0000 -@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace() - FTC_Manager mgr; - nsresult rv; - mFt2->GetFTCacheManager(&mgr); -- rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull); -+ rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face); - NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size"); - if (NS_FAILED(rv)) - return nsnull; -@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy - PRBool embedded_bimap = PR_FALSE; - mFaceID = aFaceID; - mPixelSize = aPixelSize; -- mImageDesc.font.face_id = (void*)mFaceID; -- mImageDesc.font.pix_width = aPixelSize; -- mImageDesc.font.pix_height = aPixelSize; -- mImageDesc.image_type = 0; -+ mImageDesc->face_id = (FTC_FaceID)&mFaceID; -+ mImageDesc->width = aPixelSize; -+ mImageDesc->height = aPixelSize; -+ mImageDesc->flags = 0; - - if (aPixelSize < nsFreeType2::gAntiAliasMinimum) { -- mImageDesc.image_type |= ftc_image_mono; - anti_alias = PR_FALSE; - } - -- if (nsFreeType2::gFreeType2Autohinted) -- mImageDesc.image_type |= ftc_image_flag_autohinted; -- -- if (nsFreeType2::gFreeType2Unhinted) -- mImageDesc.image_type |= ftc_image_flag_unhinted; -- - PRUint32 num_embedded_bitmaps, i; - PRInt32* embedded_bitmapheights; - mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps, -@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy - if (embedded_bitmapheights[i] == aPixelSize) { - embedded_bimap = PR_TRUE; - // unhinted must be set for embedded bitmaps to be used -- mImageDesc.image_type |= ftc_image_flag_unhinted; - break; - } - } -@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con - if (!face) - return NS_ERROR_FAILURE; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return NS_ERROR_FAILURE; -@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar - if (!face) - return 0; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; -@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering - if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2); - #endif - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; -Index: gfx/src/x11shared/nsFontFreeType.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v -retrieving revision 1.10 -diff -u -3 -p -r1.10 nsFontFreeType.h ---- gfx/src/x11shared/nsFontFreeType.h 17 Apr 2004 21:52:34 -0000 1.10 -+++ gfx/src/x11shared/nsFontFreeType.h 26 May 2004 10:01:03 -0000 -@@ -110,7 +110,7 @@ protected: - XImage *GetXImage(PRUint32 width, PRUint32 height); - nsITrueTypeFontCatalogEntry *mFaceID; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - nsCOMPtr<nsIFreeType2> mFt2; - }; - diff --git a/www/firefox36/files/patch-bugzilla243151 b/www/firefox36/files/patch-bugzilla243151 deleted file mode 100644 index e1a2a77acc20..000000000000 --- a/www/firefox36/files/patch-bugzilla243151 +++ /dev/null @@ -1,10 +0,0 @@ -Bogus assertion, see https://bugzilla.mozilla.org/show_bug.cgi?id=243151 - ---- xpcom/threads/nsThread.cpp Sun Oct 5 21:42:05 2003 -+++ xpcom/threads/nsThread.cpp Mon Aug 8 00:33:45 2005 -@@ -374,5 +374,4 @@ - status = PR_NewThreadPrivateIndex(&nsThread::kIThreadSelfIndex, nsThread::Exit); - if (status != PR_SUCCESS) return NS_ERROR_FAILURE; -- NS_ASSERTION(nsThread::kIThreadSelfIndex != 0, "couldn't get thread private index"); - } - diff --git a/www/firefox36/files/patch-build_unix_mozilla-xpcom.pc.in b/www/firefox36/files/patch-build_unix_mozilla-xpcom.pc.in deleted file mode 100644 index 4e982a5443e8..000000000000 --- a/www/firefox36/files/patch-build_unix_mozilla-xpcom.pc.in +++ /dev/null @@ -1,8 +0,0 @@ ---- build/unix/mozilla-xpcom.pc.in.orig Thu Jun 24 12:23:09 2004 -+++ build/unix/mozilla-xpcom.pc.in Thu Jun 24 12:23:18 2004 -@@ -8,4 +8,4 @@ - Version: %MOZILLA_VERSION% - Requires: mozilla-nspr = %MOZILLA_VERSION% - Libs: -L${libdir} -lxpcom --Cflags: -I${includedir}/xpcom -I${includedir}/string -+Cflags: -I${includedir}/xpcom -I${includedir}/string -I${includedir} diff --git a/www/firefox36/files/patch-build_unix_run-mozilla.sh b/www/firefox36/files/patch-build_unix_run-mozilla.sh index c357e97ce8f9..9b72375be0d6 100644 --- a/www/firefox36/files/patch-build_unix_run-mozilla.sh +++ b/www/firefox36/files/patch-build_unix_run-mozilla.sh @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-build_unix_run-mozilla.sh,v 1.8 2005/11/14 19:17:12 ahze Exp $ --- 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 @@ -7,7 +8,7 @@ $FreeBSD$ ## ## Set LD_LIBRARY_PATH -LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} -+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:{MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} ++LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} if [ -n "$LD_LIBRARYN32_PATH" ] then LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} diff --git a/www/firefox36/files/patch-config-mkdepend-imakemdep.h b/www/firefox36/files/patch-config-mkdepend-imakemdep.h index d8b6e0b049e1..1761d513f04f 100644 --- a/www/firefox36/files/patch-config-mkdepend-imakemdep.h +++ b/www/firefox36/files/patch-config-mkdepend-imakemdep.h @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-config-mkdepend-imakemdep.h,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 +++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 diff --git a/www/firefox36/files/patch-config-rules.mk b/www/firefox36/files/patch-config-rules.mk index db3009d37ee3..61c1b1503d4e 100644 --- a/www/firefox36/files/patch-config-rules.mk +++ b/www/firefox36/files/patch-config-rules.mk @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-config-rules.mk,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- config/rules.mk.orig Tue Aug 26 13:28:47 2003 +++ config/rules.mk Sun Feb 1 15:11:41 2004 diff --git a/www/firefox36/files/patch-config_autoconf.mk.in b/www/firefox36/files/patch-config_autoconf.mk.in new file mode 100644 index 000000000000..29fe7f8fbde0 --- /dev/null +++ b/www/firefox36/files/patch-config_autoconf.mk.in @@ -0,0 +1,18 @@ +--- config/autoconf.mk.in.orig Thu Jul 14 00:50:06 2005 ++++ config/autoconf.mk.in Thu Jul 14 00:50:40 2005 +@@ -50,13 +50,13 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++includedir = @includedir@/%%MOZILLA%% + libdir = @libdir@ + datadir = @datadir@ + mandir = @mandir@ + idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + +-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++mozappdir = $(libdir)/%%MOZILLA%% + mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) + mrelibdir = $(mredir)/lib + diff --git a/www/firefox36/files/patch-config::mkdepend::Makefile.in b/www/firefox36/files/patch-config_mkdepend_Makefile.in index bace012a282e..bace012a282e 100644 --- a/www/firefox36/files/patch-config::mkdepend::Makefile.in +++ b/www/firefox36/files/patch-config_mkdepend_Makefile.in diff --git a/www/firefox36/files/patch-configure b/www/firefox36/files/patch-configure index 9e60372adb33..923cf5065f18 100644 --- a/www/firefox36/files/patch-configure +++ b/www/firefox36/files/patch-configure @@ -1,15 +1,15 @@ ---- configure.orig Fri Feb 13 01:06:29 2004 -+++ configure Fri Feb 13 01:07:17 2004 -@@ -9181,7 +9181,7 @@ +--- configure.orig Tue Oct 4 02:01:48 2005 ++++ configure Wed Nov 23 11:07:17 2005 +@@ -10016,7 +10016,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" + #line 10022 "configure" #include "confdefs.h" -@@ -9212,7 +9212,7 @@ +@@ -10047,7 +10047,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 -@@ -9222,7 +9222,7 @@ +@@ -10057,7 +10057,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" + #line 10063 "configure" #include "confdefs.h" -@@ -9253,7 +9253,7 @@ +@@ -10088,7 +10088,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 diff --git a/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp index 0a2fa7daac00..1afef24a4ef0 100644 --- a/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp +++ b/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig Wed Nov 19 01:20:47 2003 +++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp Tue Feb 10 02:52:26 2004 diff --git a/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h index 809531f726bc..80dd4ba7a8e8 100644 --- a/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h +++ b/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig Fri May 23 22:00:33 2003 +++ extensions/typeaheadfind/src/nsTypeAheadFind.h Mon Feb 9 22:21:43 2004 diff --git a/www/firefox36/files/patch-gfx-src-gtk-Makefile.in b/www/firefox36/files/patch-gfx-src-gtk-Makefile.in deleted file mode 100644 index ff8b699841a3..000000000000 --- a/www/firefox36/files/patch-gfx-src-gtk-Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -When using ``--with-system-nspr'' option, MOZ_COMPONENT_LIBS does not -contain the ``-L../../../dist/lib'' -- only ``-L../../../dist/bin''. - -This causes an error, because libgfxshared_s is only under dist/lib. - - -mi - ---- gfx/src/gtk/Makefile.in Mon Nov 10 07:24:51 2003 -+++ gfx/src/gtk/Makefile.in Thu Jul 21 23:58:26 2005 -@@ -165,4 +165,5 @@ - ifdef MOZ_ENABLE_GTK2 - EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \ -+ $(LIBS_DIR) \ - -lgkgfx \ - -lgfxshared_s \ diff --git a/www/firefox36/files/patch-jsosdep b/www/firefox36/files/patch-jsosdep deleted file mode 100644 index 7f54845657ed..000000000000 --- a/www/firefox36/files/patch-jsosdep +++ /dev/null @@ -1,9 +0,0 @@ ---- js/src/jsosdep.h Fri Nov 14 19:10:59 2003 -+++ js/src/jsosdep.h Fri Aug 5 00:50:44 2005 -@@ -102,5 +102,5 @@ - #define JS_HAVE_LONG_LONG - --#elif defined(FREEBSD) -+#elif defined(FREEBSD) || defined(__FreeBSD__) - #define JS_HAVE_LONG_LONG - diff --git a/www/firefox36/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c b/www/firefox36/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c deleted file mode 100644 index 9e58b51864f2..000000000000 --- a/www/firefox36/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c +++ /dev/null @@ -1,12 +0,0 @@ ---- widget/src/gtk2/mozdrawingarea.c.orig Tue Apr 30 12:29:00 2002 -+++ widget/src/gtk2/mozdrawingarea.c Thu Aug 18 22:27:27 2005 -@@ -168,7 +168,9 @@ - - drawingarea = MOZ_DRAWINGAREA(object); - -+ gdk_window_set_user_data(drawingarea->inner_window, NULL); - gdk_window_destroy(drawingarea->inner_window); -+ gdk_window_set_user_data(drawingarea->clip_window, NULL); - gdk_window_destroy(drawingarea->clip_window); - - (* parent_class->finalize) (object); diff --git a/www/firefox36/files/patch-nopangoxft b/www/firefox36/files/patch-nopangoxft new file mode 100644 index 000000000000..5a11c8c4864e --- /dev/null +++ b/www/firefox36/files/patch-nopangoxft @@ -0,0 +1,20 @@ +--- gfx/src/gtk/mozilla-decoder.cpp.orig 2005-08-18 22:41:26.000000000 -0400 ++++ gfx/src/gtk/mozilla-decoder.cpp 2005-08-18 22:38:01.000000000 -0400 +@@ -40,7 +40,7 @@ + #define PANGO_ENABLE_ENGINE + + #include "mozilla-decoder.h" +-#include <pango/pangoxft.h> ++#include <pango/pangocairo.h> + #include <pango/pangofc-fontmap.h> + #include <pango/pangofc-font.h> + #include <gdk/gdkx.h> +@@ -208,7 +208,7 @@ + } + } + +- pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())), ++ pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()), + mozilla_find_decoder, + NULL, + NULL); diff --git a/www/firefox36/files/patch-oji-threads b/www/firefox36/files/patch-oji-threads deleted file mode 100644 index 5d4031c8e6e6..000000000000 --- a/www/firefox36/files/patch-oji-threads +++ /dev/null @@ -1,60 +0,0 @@ ---- modules/oji/public/nsIThreadManager.h Fri Sep 28 16:08:27 2001 -+++ modules/oji/public/nsIThreadManager.h Sat Aug 6 03:27:26 2005 -@@ -113,5 +113,5 @@ - */ - NS_IMETHOD -- CreateThread(PRUint32* threadID, nsIRunnable* runnable) = 0; -+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable) = 0; - - /** -@@ -122,5 +122,5 @@ - */ - NS_IMETHOD -- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) = 0; -+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) = 0; - }; - ---- modules/oji/src/nsJVMManager.cpp Mon Feb 9 17:48:48 2004 -+++ modules/oji/src/nsJVMManager.cpp Sat Aug 6 03:29:19 2005 -@@ -268,9 +268,9 @@ - - NS_METHOD --nsJVMManager::CreateThread(PRUint32* outThreadID, nsIRunnable* runnable) -+nsJVMManager::CreateThread(uintptr_t* outThreadID, nsIRunnable* runnable) - { - PRThread* thread = PR_CreateThread(PR_USER_THREAD, &thread_starter, (void*) runnable, - PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0); -- *outThreadID = NS_PTR_TO_INT32(thread); -+ *outThreadID = (uintptr_t)(thread); - return (thread != NULL ? NS_OK : NS_ERROR_FAILURE); - } -@@ -308,5 +308,5 @@ - - NS_METHOD --nsJVMManager::PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) -+nsJVMManager::PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) - { - nsresult rv; -@@ -873,5 +873,5 @@ - - do { -- static PRBool registeredLiveConnectFactory = NS_SUCCEEDED(JSJ_RegisterLiveConnectFactory()); -+ JSJ_RegisterLiveConnectFactory(); - if (IsLiveConnectEnabled() && StartupJVM() == nsJVMStatus_Running) { - JVM_InitLCGlue(); ---- modules/oji/src/nsJVMManager.h Sat Nov 29 13:56:08 2003 -+++ modules/oji/src/nsJVMManager.h Sat Aug 6 03:30:01 2005 -@@ -122,5 +122,5 @@ - */ - NS_IMETHOD -- CreateThread(PRUint32* threadID, nsIRunnable* runnable); -+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable); - - /** -@@ -131,5 +131,5 @@ - */ - NS_IMETHOD -- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async); -+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async); - - /* from nsILiveConnectManager: */ diff --git a/www/firefox36/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/firefox36/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in index 5276b54f0a1a..d3c1e463f5a0 100644 --- a/www/firefox36/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ b/www/firefox36/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 15:06:40 2004 diff --git a/www/firefox36/files/patch-xptcall-alpha b/www/firefox36/files/patch-xptcall-alpha index 6052f3ecf6dc..e89460e6e544 100644 --- a/www/firefox36/files/patch-xptcall-alpha +++ b/www/firefox36/files/patch-xptcall-alpha @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xptcall-alpha,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 diff --git a/www/firefox36/files/patch-xptcall-ia64 b/www/firefox36/files/patch-xptcall-ia64 deleted file mode 100644 index 65e17ebb6c12..000000000000 --- a/www/firefox36/files/patch-xptcall-ia64 +++ /dev/null @@ -1,40 +0,0 @@ -$FreeBSD$ - ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003 -@@ -8,6 +8,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'XPTC_InvokeByIndex' -+ .global XPTC_InvokeByIndex - .proc XPTC_InvokeByIndex - // manual bundling - .explicit -@@ -24,7 +25,7 @@ - - // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, - // PRUint32 paramCount, nsXPTCVariant* params); --XPTC_InvokeByIndex:: -+XPTC_InvokeByIndex: - .prologue - .save ar.pfs, r37 - // allocate 4 input args, 6 local args, and 8 output args ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Sun Jul 20 00:02:02 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Sun Jul 20 00:02:40 2003 -@@ -6,6 +6,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'SharedStub' -+ .global SharedStub - .proc SharedStub - // manual bundling - .explicit -@@ -14,7 +15,7 @@ - // .exclass PrepareAndDispatch, @fullyvisible - .type PrepareAndDispatch,@function - --SharedStub:: -+SharedStub: - // 9 arguments, first 8 are the input arguments of previous - // function call. The last one is methodIndex, and is passed in memory - .prologue diff --git a/www/firefox36/files/patch-xptcall-sparc64 b/www/firefox36/files/patch-xptcall-sparc64 index 13745acf9f4f..7d0faf06fa54 100644 --- a/www/firefox36/files/patch-xptcall-sparc64 +++ b/www/firefox36/files/patch-xptcall-sparc64 @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xptcall-sparc64,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- /dev/null Mon May 26 13:22:00 2003 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 diff --git a/www/firefox36/files/patch-xptcinvoke_x86_64_linux b/www/firefox36/files/patch-xptcinvoke_x86_64_linux deleted file mode 100644 index 724e24089803..000000000000 --- a/www/firefox36/files/patch-xptcinvoke_x86_64_linux +++ /dev/null @@ -1,17 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Thu Apr 22 16:50:05 2004 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Fri Aug 5 02:16:00 2005 -@@ -82,11 +82,11 @@ - PRUint64 value; - -- for (uint32 i = 0; i < paramCount; i++, s++) { -+ for (unsigned int i = 0; i < paramCount; i++, s++) { - if (s->IsPtrData()) - value = (PRUint64) s->ptr; - else { - switch (s->type) { -- case nsXPTType::T_FLOAT: break; -- case nsXPTType::T_DOUBLE: break; -+ case nsXPTType::T_FLOAT: -+ case nsXPTType::T_DOUBLE: value = 0; /* initialize */ break; - case nsXPTType::T_I8: value = s->val.i8; break; - case nsXPTType::T_I16: value = s->val.i16; break; |