New commits:
commit 5d41c9754e2ffe8b00e9adcca78a9aa89ee07837
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>
firefox: pretty major update to 2.0.0.1. Attempted to remove all the
accumulated hacks. Works good for me on two systms and I built liferea
and kazehakase against it with no problems. briareus also built.
Hopefully nothing major missing.
diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index af0bfa1..aefebbc 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -1,59 +1,23 @@
-FIREFOX_HOME=${INSTALL_ROOT}/usr/lib/firefox &&
-export MOZ_PHOENIX=1 &&
-
-# No fast optimization for Mozilla, bit us so many times...
-export CFLAGS="${CFLAGS//-O3/-O2}" &&
-export CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
-
-# these two are simply bugs in the Makefile-s
-sedit 's#-lgfxshared_s#-L../shared -lgfxshared_s#g' gfx/src/gtk/Makefile.in
&&
-sedit 's#-lxprintutil#-L../xprintutil -lxprintutil#g'
gfx/src/gtk/Makefile.in &&
-
-mozilla_remove_nspr_nss &&
-
-if [ -f /root/.mozconfig ]; then
- rm -f /root/.mozconfig
+FIREFOX_HOME=$INSTALL_ROOT/usr/lib/seamonkey &&
+export MOZ_PHOENIX=1 &&
+
+#
+# Only strip if the user wants us to
+#
+if echo $LDFLAGS | grep -q -- '-s'; then
+ OPTS="$OPTS --enable-strip"
fi &&
-if [ "$FIREFOX_CVS" == "y" ]; then
- OPTS="$OPTS --enable-application=browser"
-fi &&
-cp browser/config/mozconfig .mozconfig &&
-
-# Ugly hack to get spells using gecko engine to compile against the headers
and libs
-# under /usr/lib/firefox instead of /usr/lib.firefox-$VERSION, so that we
can avoid
-# to recompile them on each minor upgrade
-# This will make the replacement in pkconfig files and firefox-config command
-sedit 's#$(includedir)#/usr/include/firefox#g' build/unix/Makefile.in &&
-sedit 's#$(mozappdir)#/usr/lib/firefox#g' build/unix/Makefile.in &&
-sedit 's#$(idldir)#/usr/share/idl/firefox#g' build/unix/Makefile.in &&
-
-./configure \
- --prefix=${INSTALL_ROOT}/usr \
- --with-user-appdir=.firefox \
- --with-x \
- --with-pthreads \
- --enable-reorder \
- --enable-cpp-rtti \
- --enable-strip \
- --enable-optimize="$CFLAGS" \
- --with-default-mozilla-five-home=$FIREFOX_HOME \
- --disable-debug \
- --disable-tests \
- --disable-installer \
- --disable-pedantic \
- --disable-mailnews \
- --disable-composer \
- --enable-single-profile \
- --enable-extensions=default,typeaheadfind \
- --enable-canvas \
- $OPTS &&
-
-make_single &&
-make &&
-
-# fix pkgconfig files so that other spell using them can build properly
-# these files will be renamed to firefox-{nspr,nss}.pc during installation
-cp -f $GRIMOIRE/libs/nspr/mozilla-nspr.pc build/unix/firefox-nspr.pc &&
-cp -f $GRIMOIRE/crypto/nss/mozilla-nss.pc build/unix/firefox-nss.pc &&
-sedit 's|Requires:\s*firefox-nspr.*$|Requires: mozilla-nspr|g'
build/unix/firefox-xpcom.pc
+#
+# No fast optimization for Mozilla, bit us so many times...
+#
+CFLAGS="${CFLAGS//-O3/-O2}" &&
+CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
+
+./configure --prefix=$INSTALL_ROOT/usr \
+ --mandir=$INSTALL_ROOT/usr/share/man \
+ --enable-optimize="$CFLAGS" \
+ $OPTS &&
+make_single &&
+make -f client.mk build &&
+make_normal
diff --git a/http/firefox/CONFIGURE b/http/firefox/CONFIGURE
index 14c1ffc..aa1b263 100755
--- a/http/firefox/CONFIGURE
+++ b/http/firefox/CONFIGURE
@@ -1,3 +1,5 @@
config_query FIREFOX_MOZLINK "Create a symlink to mozilla?" n
config_query FIREFOX_NULLPLUGIN \
"Do you want nullplugin installed (to enable auto search and install of
other plugins)" y
+config_query FIREFOX_OFFICIAL "Enable official branding? If enabled, you \
+may be restricted in distributing these binaries IAW mozilla policies" n
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 846abff..7b3f545 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -5,7 +5,7 @@ if [ "$FIREFOX_CVS" == "y" ]; then
SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs-mirror.mozilla.org:/cvsroot:mozilla/client.mk
SOURCE_IGNORE=volatile
else
- VERSION=1.5.0.9
+ VERSION=2.0.0.1
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=${SOURCE}.asc
SOURCE_GPG="firefox.gpg:${SOURCE2}:UPSTREAM_KEY"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 793b1b9..31c0e80 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,24 @@
+2007-01-21 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.0.0.1
+ * PREPARE: Removed choice for gtk. Only could test with gtk+2
+ * CONFIGURE: Addeded query for official branding
+ * PRE_BUILD: Added patch to build against monolithic X.
+ Added sedit for official branding
+ cp mozconfig file to $SOURCE_DIRECTORY
+ Removed various 1.5 patches
+ * BUILD: Removed most configure options. Using mozconfig now.
+ Removed some nspr/nss hacks.
+ Removed hack for firefox libs. Installing now to /usr/lib/firefox
+ * INSTALL: Moved trick for installing to /usr/lib/firefox.
+ Added manual copying of files to /usr/lib/firefox
+ sedit *.pc files for correct installation directories
+ Don't run make install.
+ * x-lib.patch: Added patch for monolithic X.
+ * firefox-1.1-uriloader.patch, firefox-1.1-visibility.patch,
+ embed-typeaheadfind-1.patch, firefox-init.patch, init-files,
+ firefox-nopangoxft.patch, mozilla-firefox-1.5-mork.patch,
+ security_manager_makefile.diff: Removed old patches
+
2006-12-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.5.0.9, SECURITY_PATCH=6
-#
-# Firefox now installs to /usr/lib/firefox and leaves /usr/lib/mozilla alone
-
-#
-# Make sure these directories exist, symlink them, and /then/ install
-# This fixes both Wolfgang's problems and johnny17's problems. :)
-#
-if [ ! -d $FIREFOX_HOME ]; then
- mkdir -p $FIREFOX_HOME
-fi &&
+# Not recommended by http://www.mozilla.org/build to use
+# make install. Manually install the files.
#
-# Make sure $INSTALL_ROOT/usr/lib/firefox is not in
$INSTALL_ROOT/etc/ld.so.conf
+# Script to set MOZILLA_FIVE_HOME
#
-if grep -q firefox $INSTALL_ROOT/etc/ld.so.conf; then
- sedit "s:/usr/lib/firefox::" $INSTALL_ROOT/etc/ld.so.conf &&
- /sbin/ldconfig
-fi &&
+cp ${SCRIPT_DIRECTORY}/${SPELL}.sh $INSTALL_ROOT/etc/profile.d &&
#
# Create symlink to mozilla for hardwired applications
@@ -63,43 +43,29 @@ fi &&
# to be in the same directory as the current application binary. See:
# http://www.mozilla.org/projects/security/pki/nss/loadable_certs.html
# https://bugzilla.mozilla.org/show_bug.cgi?id=128290
-# Only create if $FIREFOX_HOME/libnssckbi.so does not exist or is already a
+# Only create if $MOZILLA_HOME/libnssckbi.so does not exist or is already a
# symlink.
#
if test -f $INSTALL_ROOT/usr/lib/libnssckbi.so; then
if ! test -f $FIREFOX_HOME/libnssckbi.so ||
test -h $FIREFOX_HOME/libnssckbi.so; then
ln -sf $TRACK_ROOT/usr/lib/libnssckbi.so $FIREFOX_HOME/libnssckbi.so
- fi
+ fi
fi &&
+if [[ "$FIREFOX_NULLPLUGIN" == "n" ]]
+then
+ rm $FIREFOX_HOME/plugins/libnullplugin.so
+fi &&
-#
-# Fix for starting firefox without running as root first
-# Bug #7114 (thanks to Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-#
-# first remove the files the patch creates so patch doesn't fail, see bug
#8874
-while read firefox_remove_file; do
- rm -f $FIREFOX_HOME/$firefox_remove_file
-done < $SCRIPT_DIRECTORY/init-files &&
-# now patch
-patch -d $FIREFOX_HOME -p1 -N \
- < $SCRIPT_DIRECTORY/firefox-init.patch &&
-
-#
-# Script to set MOZILLA_FIVE_HOME
-#
-cp ${SCRIPT_DIRECTORY}/${SPELL}.sh $INSTALL_ROOT/etc/profile.d &&
-if test "$FIREFOX_NULLPLUGIN" == "n"; then
- rm $FIREFOX_HOME/plugins/libnullplugin.so
-fi &&
#
-# Install firefox script so it loads properly
+# install firefox script so it loads properly even if MOZILLA_FIVE_HOME is
+# not set or set to a different mozilla/firefox directory
#
install -m 755 -o root -g root $SCRIPT_DIRECTORY/firefox \
$INSTALL_ROOT/usr/bin &&
# make the pkgconfig files reference the nspr from the standalone nspr spell
-#sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-nss.pc &&
+sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-nss.pc &&
sedit "s/nspr/mozilla-nspr/" ${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-js.pc
&&
sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-xpcom.pc
diff --git a/http/firefox/PREPARE b/http/firefox/PREPARE
index 8fbbab0..50df2b8 100755
--- a/http/firefox/PREPARE
+++ b/http/firefox/PREPARE
@@ -12,8 +12,6 @@ fi &&
config_query FIREFOX_CVS \
"Checkout the CVS version?" n &&
-config_query_list FIREFOX_GTK \
- "Which version of gtk+ do you want?" "2.x" "1.x" &&
# touch the SOURCE tarball if you update via cvs and already have a cvs
tarball
# otherwise you have to download 40 MB of crap
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 9e01662..042d15f 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -1,3 +1,5 @@
+if [ "$FIREFOX_CVS" = "y" ] &&
+ [ -f $SOURCE_CACHE/$FIREFOX_TARBALL ]; then
if [ ! -f /root/.cvspass ]; then
touch /root/.cvspass
fi
&&
@@ -6,19 +8,9 @@ mk_source_dir $SOURCE_DIRECTORY
FIREFOX_TARBALL=firefox-1.0+.tar.bz2 &&
-if [ "$FIREFOX_CVS" = "y" ] &&
- [ -f $SOURCE_CACHE/$FIREFOX_TARBALL ]; then
message "${MESSAGE_COLOR}Unpacking source file $FIREFOX_TARBALL" \
"$for ${SPELL_COLOR}$SPELL${DEFAULT_COLOR}"
&&
- tar jxf $SOURCE_CACHE/$FIREFOX_TARBALL
-else
- unpack_file ''
-fi
&&
-
-#
-#cvs updates anyone?
-#
-if [ "$FIREFOX_CVS" = "y" ]; then
+ tar jxf $SOURCE_CACHE/$FIREFOX_TARBALL
&&
message "${MESSAGE_COLOR}\tIt can take some considerable time to" \
"\tregenerate the cvs tags you will not see much progress or a" \
"\ttime but do not despair, GOOD THINGS are happening in the" \
@@ -32,18 +24,13 @@ if [ "$FIREFOX_CVS" = "y" ]; then
tar jcf $FIREFOX_TARBALL mozilla/
&&
message "Moving $FIREFOX_TARBALL to/var/spool/sorcery${DEFAULT_COLOR}"
&&
mv -v $FIREFOX_TARBALL $SOURCE_CACHE/
-fi
&&
-
-cd $SOURCE_DIRECTORY
&&
+else
+ default_pre_build
+ cd $SOURCE_DIRECTORY &&
+ patch -p0 < $SCRIPT_DIRECTORY/x-lib.patch
+fi &&
-# 1.5 patches
-# 1) visibility
-patch -p0 < $SCRIPT_DIRECTORY/firefox-1.1-visibility.patch &&
-# 2) removing pangoxft
-patch -p1 < $SCRIPT_DIRECTORY/firefox-nopangoxft.patch &&
-# 3) no crash uri loader with gnome-vfs
-patch -p0 < $SCRIPT_DIRECTORY/firefox-1.1-uriloader.patch &&
-# 4) typeahead
-patch -p1 < $SCRIPT_DIRECTORY/embed-typeaheadfind-1.patch &&
-# 5) sec fix
-patch -p0 < $SCRIPT_DIRECTORY/mozilla-firefox-1.5-mork.patch
+cp $SCRIPT_DIRECTORY/mozconfig $SOURCE_DIRECTORY/.mozconfig &&
+if [ "$FIREFOX_OFFICIAL" == "y" ]; then
+ sedit '24iac_add_options --enable-official-branding'
$SOURCE_DIRECTORY/.mozconfig
+fi
diff --git a/http/firefox/desktop/firefox.desktop
b/http/firefox/desktop/firefox.desktop
index e65295f..6701acd 100644
--- a/http/firefox/desktop/firefox.desktop
+++ b/http/firefox/desktop/firefox.desktop
@@ -2,7 +2,7 @@
Encoding=UTF-8
Name=Firefox
Exec=firefox
-Icon=/usr/lib/firefox/icons/default.xpm
+Icon=/usr/lib/firefox/icons/mozicon16.xpm
Terminal=false
Type=Application
Categories=Application;Network;Browsers
diff --git a/http/firefox/embed-typeaheadfind-1.patch
b/http/firefox/embed-typeaheadfind-1.patch
deleted file mode 100644
index d29780c..0000000
--- a/http/firefox/embed-typeaheadfind-1.patch
+++ /dev/null
@@ -1,1153 +0,0 @@
-diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/Makefile.in
mozilla/extensions/typeaheadfind/Makefile.in
---- mozilla.orig/extensions/typeaheadfind/Makefile.in 2005-03-26
00:12:02.000000000 -0500
-+++ mozilla/extensions/typeaheadfind/Makefile.in 2005-03-26
11:39:29.000000000 -0500
-@@ -31,7 +31,7 @@
-
- include $(DEPTH)/config/autoconf.mk
-
--MODULE = typeaheadfind
-+MODULE = typeaheadfindsea
- DIRS = public src resources
-
- include $(topsrcdir)/config/rules.mk
-diff -urN --exclude=CVS
mozilla.orig/extensions/typeaheadfind/public/Makefile.in
mozilla/extensions/typeaheadfind/public/Makefile.in
---- mozilla.orig/extensions/typeaheadfind/public/Makefile.in 2005-03-26
00:12:02.000000000 -0500
-+++ mozilla/extensions/typeaheadfind/public/Makefile.in 2005-03-26
11:39:29.000000000 -0500
-@@ -31,11 +31,11 @@
-
- include $(DEPTH)/config/autoconf.mk
-
--MODULE=typeaheadfind
--XPIDL_MODULE=typeaheadfind
-+MODULE=typeaheadfindsea
-+XPIDL_MODULE=typeaheadfindsea
- GRE_MODULE = 1
-
--XPIDLSRCS= ./nsITypeAheadFind.idl \
-+XPIDLSRCS= ./nsITypeAheadFindSea.idl \
- $(NULL)
-
-
-diff -urN --exclude=CVS
mozilla.orig/extensions/typeaheadfind/public/nsITypeAheadFind.idl
mozilla/extensions/typeaheadfind/public/nsITypeAheadFind.idl
---- mozilla.orig/extensions/typeaheadfind/public/nsITypeAheadFind.idl
2005-03-26 00:12:02.000000000 -0500
-+++ mozilla/extensions/typeaheadfind/public/nsITypeAheadFind.idl
1969-12-31 19:00:00.000000000 -0500
-@@ -1,88 +0,0 @@
--/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
--/* ***** BEGIN LICENSE BLOCK *****
-- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-- *
-- * The contents of this file are subject to the Mozilla Public License
Version
-- * 1.1 (the "License"); you may not use this file except in compliance with
-- * the License. You may obtain a copy of the License at
-- * http://www.mozilla.org/MPL/
-- *
-- * Software distributed under the License is distributed on an "AS IS"
basis,
-- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-- * for the specific language governing rights and limitations under the
-- * License.
-- *
-- * The Original Code is mozilla.org code.
-- *
-- * The Initial Developer of the Original Code is
-- * Netscape Communications Corporation.
-- * Portions created by the Initial Developer are Copyright (C) 1998
-- * the Initial Developer. All Rights Reserved.
-- *
-- * Contributor(s):
-- * Original Author: Aaron Leventhal (aaronl AT netscape.com)
-- *
-- * Alternatively, the contents of this file may be used under the terms of
-- * either the GNU General Public License Version 2 or later (the "GPL"), or
-- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-- * in which case the provisions of the GPL or the LGPL are applicable
instead
-- * of those above. If you wish to allow use of your version of this file
only
-- * under the terms of either the GPL or the LGPL, and not to allow others to
-- * use your version of this file under the terms of the MPL, indicate your
-- * decision by deleting the provisions above and replace them with the
notice
-- * and other provisions required by the GPL or the LGPL. If you do not
delete
-- * the provisions above, a recipient may use your version of this file under
-- * the terms of any one of the MPL, the GPL or the LGPL.
-- *
-- * ***** END LICENSE BLOCK ***** */
--
--#include "nsISupports.idl"
--#include "domstubs.idl"
--#include "nsISupportsPrimitives.idl"
--
--%{ C++
-- #include "nsIDOMEvent.h"
--
-- #define NS_TYPEAHEADFIND_CID \
-- {0x46590685, 0xbc00, 0x4aac, {0xab, 0xed, 0x2c, 0x10, 0xa5, 0xb9, 0x45,
0xa4}}
--
-- #define NS_TYPEAHEADFIND_CONTRACTID "@mozilla.org/typeaheadfind;1"
--%}
--
--interface nsIDOMEvent;
--
--[scriptable, uuid(AD1C62CC-72F4-4c5b-BE78-503854F9E0D8)]
--interface nsITypeAheadFind : nsISupports
--{
-- /** Is type ahead find mode currently on? */
-- readonly attribute boolean isActive;
--
-- /** Manually start type ahead find mode */
-- void startNewFind(in nsIDOMWindow aWindow, in boolean aLinksOnly);
--
-- /** Manually cancel type ahead find mode */
-- void cancelFind();
--
-- /**
-- * Will find as you type start automatically if the user
-- * types with the focus on page content other than a textfield or select?
-- * If autostart is off, the startNewFind() method can be used to enact
-- * type ahead find, as well as cmd_findTypeLinks or cmd_findTypeText.
-- */
-- void setAutoStart(in nsIDOMWindow aWindow, in boolean aIsAutoStartOn);
-- boolean getAutoStart(in nsIDOMWindow aWindow);
--
-- /**
-- * Find next recurrence if typeaheadfind was the last used find,
-- * as opposed to regular find. Returns false in nsISupportsPRBool if we
-- * don't handle the request.
-- */
-- void findNext(in boolean aReverse, in nsISupportsInterfacePointer
aCallerWindowSupports);
--
-- /*
-- * Go back and remove one character from find string
-- * Returns true if backspace used
-- */
-- boolean backOneChar();
--};
--
-diff -urN --exclude=CVS
mozilla.orig/extensions/typeaheadfind/public/nsITypeAheadFindSea.idl
mozilla/extensions/typeaheadfind/public/nsITypeAheadFindSea.idl
---- mozilla.orig/extensions/typeaheadfind/public/nsITypeAheadFindSea.idl
1969-12-31 19:00:00.000000000 -0500
-+++ mozilla/extensions/typeaheadfind/public/nsITypeAheadFindSea.idl
2005-03-26 11:39:29.000000000 -0500
-@@ -0,0 +1,88 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License
Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS"
basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Original Author: Aaron Leventhal (aaronl AT netscape.com)
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable
instead
-+ * of those above. If you wish to allow use of your version of this file
only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the
notice
-+ * and other provisions required by the GPL or the LGPL. If you do not
delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#include "nsISupports.idl"
-+#include "domstubs.idl"
-+#include "nsISupportsPrimitives.idl"
-+
-+%{ C++
-+ #include "nsIDOMEvent.h"
-+
-+ #define NS_TYPEAHEADFINDSEA_CID \
-+ {0x46590685, 0xbc00, 0x4aac, {0xab, 0xed, 0x2c, 0x10, 0xa5, 0xb9, 0x45,
0xa4}}
-+
-+ #define NS_TYPEAHEADFINDSEA_CONTRACTID "@mozilla.org/typeaheadfindsea;1"
-+%}
-+
-+interface nsIDOMEvent;
-+
-+[scriptable, uuid(AD1C62CC-72F4-4c5b-BE78-503854F9E0D8)]
-+interface nsITypeAheadFindSea : nsISupports
-+{
-+ /** Is type ahead find mode currently on? */
-+ readonly attribute boolean isActive;
-+
-+ /** Manually start type ahead find mode */
-+ void startNewFind(in nsIDOMWindow aWindow, in boolean aLinksOnly);
-+
-+ /** Manually cancel type ahead find mode */
-+ void cancelFind();
-+
-+ /**
-+ * Will find as you type start automatically if the user
-+ * types with the focus on page content other than a textfield or select?
-+ * If autostart is off, the startNewFind() method can be used to enact
-+ * type ahead find, as well as cmd_findTypeLinks or cmd_findTypeText.
-+ */
-+ void setAutoStart(in nsIDOMWindow aWindow, in boolean aIsAutoStartOn);
-+ boolean getAutoStart(in nsIDOMWindow aWindow);
-+
-+ /**
-+ * Find next recurrence if typeaheadfindsea was the last used find,
-+ * as opposed to regular find. Returns false in nsISupportsPRBool if we
-+ * don't handle the request.
-+ */
-+ void findNext(in boolean aReverse, in nsISupportsInterfacePointer
aCallerWindowSupports);
-+
-+ /*
-+ * Go back and remove one character from find string
-+ * Returns true if backspace used
-+ */
-+ boolean backOneChar();
-+};
-+
-diff -urN --exclude=CVS
mozilla.orig/extensions/typeaheadfind/resources/content/prefs/typeaheadfind.js
mozilla/extensions/typeaheadfind/resources/content/prefs/typeaheadfind.js
----
mozilla.orig/extensions/typeaheadfind/resources/content/prefs/typeaheadfind.js
2005-03-26 00:12:02.000000000 -0500
-+++
mozilla/extensions/typeaheadfind/resources/content/prefs/typeaheadfind.js
2005-03-26 11:39:29.000000000 -0500
-@@ -36,7 +36,7 @@
- *
- * ***** END LICENSE BLOCK ***** */
-
--pref("accessibility.typeaheadfind", true);
--pref("accessibility.typeaheadfind.linksonly", true);
--pref("accessibility.typeaheadfind.startlinksonly", false);
--pref("accessibility.typeaheadfind.timeout", 5000);
-+pref("accessibility.typeaheadfindsea", true);
-+pref("accessibility.typeaheadfindsea.linksonly", true);
-+pref("accessibility.typeaheadfindsea.startlinksonly", false);
-+pref("accessibility.typeaheadfindsea.timeout", 5000);
-diff -urN --exclude=CVS
mozilla.orig/extensions/typeaheadfind/resources/jar.mn
mozilla/extensions/typeaheadfind/resources/jar.mn
---- mozilla.orig/extensions/typeaheadfind/resources/jar.mn 2005-03-26
00:12:02.000000000 -0500
-+++ mozilla/extensions/typeaheadfind/resources/jar.mn 2005-03-26
11:39:29.000000000 -0500
-@@ -1,5 +1,5 @@
- en-US.jar:
-- locale/en-US/global/typeaheadfind.properties
(locale/en-US/typeaheadfind.properties)
-+ locale/en-US/global/typeaheadfindsea.properties
(locale/en-US/typeaheadfindsea.properties)
-
- toolkit.jar:
- content/global/notfound.wav (content/notfound.wav)
-diff -urN --exclude=CVS
mozilla.orig/extensions/typeaheadfind/resources/locale/en-US/typeaheadfind.properties
mozilla/extensions/typeaheadfind/resources/locale/en-US/typeaheadfind.properties
----
mozilla.orig/extensions/typeaheadfind/resources/locale/en-US/typeaheadfind.properties
2005-03-26 00:12:02.000000000 -0500
-+++
mozilla/extensions/typeaheadfind/resources/locale/en-US/typeaheadfind.properties
1969-12-31 19:00:00.000000000 -0500
-@@ -1,13 +0,0 @@
--openparen = (
--closeparen = )
--textfound = Text found: "
--textnotfound = Text not found: "
--linkfound = Link found: "
--linknotfound = Link not found: "
--closequote = "
--stopfind = Find stopped.
--starttextfind = Starting -- find text as you type
--startlinkfind = Starting -- find links as you type
--repeated = repeated
--nextmatch = - next match
--prevmatch = - previous match
-diff -urN --exclude=CVS
mozilla.orig/extensions/typeaheadfind/resources/locale/en-US/typeaheadfindsea.properties