rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

remove some no longer used patches

Browse Source
This commit is contained in:
Christopher Aillon 2007-09-25 04:49:20 +00:00
parent 885c4fb867
commit 4ca0d1acd4
9 changed files with 0 additions and 3770 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1056
firefox-1.0-system-nspr-ldap.patch
View File

File diff suppressed because it is too large Load Diff

0
firefox-1.1-nss-system-nspr.patch
View File

627
firefox-1.5-with-system-nss.patch
View File

@ -1,627 +0,0 @@
Index: mozilla/configure.in
===================================================================
RCS file: /cvsroot/mozilla/configure.in,v
retrieving revision 1.1503.2.15
diff -u -r1.1503.2.15 configure.in
--- mozilla/configure.in 4 Oct 2005 05:53:49 -0000 1.1503.2.15
+++ mozilla/configure.in 15 Dec 2005 05:40:40 -0000
@@ -86,6 +86,7 @@
MOZPNG=10207
MOZZLIB=1.2.3
NSPR_VERSION=4
+NSS_VERSION=3
dnl Set the minimum version of toolkit libs used by mozilla
dnl ========================================================
@@ -3472,6 +3473,19 @@
fi
fi
+dnl ========================================================
+dnl = If NSS was not detected in the system,
+dnl = use the one in the source tree (mozilla/security/nss)
+dnl ========================================================
+
+MOZ_ARG_WITH_BOOL(system-nss,
+[ --with-system-nss Use system installed NSS],
+ _USE_SYSTEM_NSS=1 )
+
+if test -n "$_USE_SYSTEM_NSS"; then
+ AM_PATH_NSS(3.0.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
+fi
+
if test -z "$SKIP_LIBRARY_CHECKS"; then
dnl system JPEG support
dnl ========================================================
@@ -6698,6 +6712,10 @@
AC_SUBST(NSPR_LIBS)
AC_SUBST(MOZ_NATIVE_NSPR)
+AC_SUBST(NSS_CFLAGS)
+AC_SUBST(NSS_LIBS)
+AC_SUBST(MOZ_NATIVE_NSS)
+
AC_SUBST(CFLAGS)
AC_SUBST(CXXFLAGS)
AC_SUBST(CPPFLAGS)
Index: mozilla/configure
===================================================================
RCS file: /cvsroot/mozilla/configure,v
retrieving revision 1.1492.2.17
diff -u -r1.1492.2.17 configure
--- mozilla/configure 4 Oct 2005 06:01:48 -0000 1.1492.2.17
+++ mozilla/configure 15 Dec 2005 05:40:53 -0000
@@ -44,6 +44,13 @@
--with-nspr-exec-prefix=PFX
Exec prefix where NSPR is installed"
ac_help="$ac_help
+ --with-system-nss Use system installed NSS"
+ac_help="$ac_help
+ --with-nss-prefix=PFX Prefix where NSS is installed"
+ac_help="$ac_help
+ --with-nss-exec-prefix=PFX
+ Exec prefix where NSS is installed"
+ac_help="$ac_help
--with-system-jpeg[=PFX]
Use system libjpeg [installed at prefix PFX]"
ac_help="$ac_help
@@ -1020,6 +1027,7 @@
MOZPNG=10207
MOZZLIB=1.2.3
NSPR_VERSION=4
+NSS_VERSION=3
GLIB_VERSION=1.2.0
GTK_VERSION=1.2.0
@@ -11300,6 +11308,123 @@
fi
fi
+
+# Check whether --with-system-nss or --without-system-nss was given.
+if test "${with_system_nss+set}" = set; then
+ withval="$with_system_nss"
+ if test "$withval" = "yes"; then
+ _USE_SYSTEM_NSS=1
+ elif test "$withval" = "no"; then
+ :
+ else
+ { echo "configure: error: Option, system-nss, does not take an argument ($withval)." 1>&2; exit 1; }
+ fi
+fi
+
+
+if test -n "$_USE_SYSTEM_NSS"; then
+
+# Check whether --with-nss-prefix or --without-nss-prefix was given.
+if test "${with_nss_prefix+set}" = set; then
+ withval="$with_nss_prefix"
+ nss_config_prefix="$withval"
+else
+ nss_config_prefix=""
+fi
+
+
+# Check whether --with-nss-exec-prefix or --without-nss-exec-prefix was given.
+if test "${with_nss_exec_prefix+set}" = set; then
+ withval="$with_nss_exec_prefix"
+ nss_config_exec_prefix="$withval"
+else
+ nss_config_exec_prefix=""
+fi
+
+
+ if test -n "$nss_config_exec_prefix"; then
+ nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix"
+ if test -z "$NSS_CONFIG"; then
+ NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config
+ fi
+ fi
+ if test -n "$nss_config_prefix"; then
+ nss_config_args="$nss_config_args --prefix=$nss_config_prefix"
+ if test -z "$NSS_CONFIG"; then
+ NSS_CONFIG=$nss_config_prefix/bin/nss-config
+ fi
+ fi
+
+ unset ac_cv_path_NSS_CONFIG
+ # Extract the first word of "nss-config", so it can be a program name with args.
+set dummy nss-config; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:11363: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ case "$NSS_CONFIG" in
+ /*)
+ ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a dos path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_NSS_CONFIG="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_NSS_CONFIG" && ac_cv_path_NSS_CONFIG="no"
+ ;;
+esac
+fi
+NSS_CONFIG="$ac_cv_path_NSS_CONFIG"
+if test -n "$NSS_CONFIG"; then
+ echo "$ac_t""$NSS_CONFIG" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ min_nss_version=3.0.0
+ echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6
+echo "configure:11398: checking for NSS - version >= $min_nss_version (skipping)" >&5
+
+ no_nss=""
+ if test "$NSS_CONFIG" = "no"; then
+ no_nss="yes"
+ else
+ NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
+ NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
+
+ nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+ nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+ nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+ fi
+
+ if test -z "$no_nss"; then
+ echo "$ac_t""yes" 1>&6
+ MOZ_NATIVE_NSS=1
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+
+
+
+
+fi
+
if test -z "$SKIP_LIBRARY_CHECKS"; then
# Check whether --with-system-jpeg or --without-system-jpeg was given.
if test "${with_system_jpeg+set}" = set; then
@@ -19473,6 +19602,9 @@
s%@NSPR_CONFIG@%$NSPR_CONFIG%g
s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g
s%@NSPR_LIBS@%$NSPR_LIBS%g
+s%@NSS_CONFIG@%$NSS_CONFIG%g
+s%@NSS_CFLAGS@%$NSS_CFLAGS%g
+s%@NSS_LIBS@%$NSS_LIBS%g
s%@GTK_CONFIG@%$GTK_CONFIG%g
s%@GTK_CFLAGS@%$GTK_CFLAGS%g
s%@GTK_LIBS@%$GTK_LIBS%g
@@ -19753,6 +19885,7 @@
s%@MOZ_PNG_CFLAGS@%$MOZ_PNG_CFLAGS%g
s%@MOZ_PNG_LIBS@%$MOZ_PNG_LIBS%g
s%@MOZ_NATIVE_NSPR@%$MOZ_NATIVE_NSPR%g
+s%@MOZ_NATIVE_NSS@%$MOZ_NATIVE_NSS%g
s%@COMPILE_CFLAGS@%$COMPILE_CFLAGS%g
s%@COMPILE_CXXFLAGS@%$COMPILE_CXXFLAGS%g
s%@CROSS_COMPILE@%$CROSS_COMPILE%g
Index: mozilla/aclocal.m4
===================================================================
RCS file: /cvsroot/mozilla/aclocal.m4,v
retrieving revision 1.14
diff -u -r1.14 aclocal.m4
--- mozilla/aclocal.m4 13 May 2004 03:12:47 -0000 1.14
+++ mozilla/aclocal.m4 15 Dec 2005 05:40:53 -0000
@@ -8,6 +8,7 @@
builtin(include, build/autoconf/libIDL.m4)dnl
builtin(include, build/autoconf/libIDL-2.m4)dnl
builtin(include, build/autoconf/nspr.m4)dnl
+builtin(include, build/autoconf/nss.m4)dnl
builtin(include, build/autoconf/libart.m4)dnl
builtin(include, build/autoconf/pkg.m4)dnl
builtin(include, build/autoconf/freetype2.m4)dnl
Index: mozilla/config/autoconf.mk.in
===================================================================
RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v
retrieving revision 3.363.2.1
diff -u -r3.363.2.1 autoconf.mk.in
--- mozilla/config/autoconf.mk.in 17 Aug 2005 17:17:17 -0000 3.363.2.1
+++ mozilla/config/autoconf.mk.in 15 Dec 2005 05:40:53 -0000
@@ -229,6 +229,7 @@
MOZ_INSURE_EXCLUDE_DIRS = @MOZ_INSURE_EXCLUDE_DIRS@
MOZ_NATIVE_NSPR = @MOZ_NATIVE_NSPR@
+MOZ_NATIVE_NSS = @MOZ_NATIVE_NSS@
CROSS_COMPILE = @CROSS_COMPILE@
@@ -384,6 +385,48 @@
NSPR_CFLAGS = @NSPR_CFLAGS@
NSPR_LIBS = @NSPR_LIBS@
+NSS_CONFIG = @NSS_CONFIG@
+NSS_CFLAGS = @NSS_CFLAGS@
+NSS_LIBS = @NSS_LIBS@
+
+ifdef MOZ_NATIVE_NSS
+NSS_DEP_LIBS = \
+ $(NULL)
+NSS_LIBS += \
+ -lcrmf \
+ $(NULL)
+else
+NSS_DEP_LIBS = \
+ $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+ $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
+ $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
+ $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
+ $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
+ $(NULL)
+NSS_LIBS = \
+ $(LIBS_DIR) \
+ $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+ -lsmime3 \
+ -lssl3 \
+ -lnss3 \
+ -lsoftokn3 \
+ $(NULL)
+endif
+
+ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH)))
+ifndef GNU_CC
+ifndef MOZ_NATIVE_NSS
+NSS_LIBS = \
+ $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+ $(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \
+ $(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \
+ $(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \
+ $(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \
+ $(NULL)
+endif
+endif
+endif
+
LDAP_CFLAGS = @LDAP_CFLAGS@
LDAP_LIBS = @LDAP_LIBS@
XPCOM_GLUE_LDOPTS = @XPCOM_GLUE_LDOPTS@
Index: mozilla/config/config.mk
===================================================================
RCS file: /cvsroot/mozilla/config/config.mk,v
retrieving revision 3.337
diff -u -r3.337 config.mk
--- mozilla/config/config.mk 28 Jul 2005 19:48:11 -0000 3.337
+++ mozilla/config/config.mk 15 Dec 2005 05:40:54 -0000
@@ -138,39 +138,6 @@
FINAL_LINK_COMPS = $(DEPTH)/config/final-link-comps
FINAL_LINK_COMP_NAMES = $(DEPTH)/config/final-link-comp-names
-#
-# NSS libs needed for final link in static build
-#
-
-NSS_LIBS = \
- $(LIBS_DIR) \
- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
- -lsmime3 \
- -lssl3 \
- -lnss3 \
- -lsoftokn3 \
- $(NULL)
-
-ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH)))
-ifndef GNU_CC
-NSS_LIBS = \
- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \
- $(NULL)
-endif
-endif
-
-NSS_DEP_LIBS = \
- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
- $(NULL)
-
MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
MOZ_REGISTRY_LIBS = $(DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)
MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX)
Index: mozilla/build/autoconf/nss.m4
===================================================================
RCS file: mozilla/build/autoconf/nss.m4
diff -N mozilla/build/autoconf/nss.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mozilla/build/autoconf/nss.m4 15 Dec 2005 05:40:54 -0000
@@ -0,0 +1,67 @@
+# -*- tab-width: 4; -*-
+# Configure paths for NSS
+# Public domain - Chris Seawood <cls@seawood.org> 2001-04-05
+# Based upon gtk.m4 (also PD) by Owen Taylor
+
+dnl AM_PATH_NSS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for NSS, and define NSS_CFLAGS and NSS_LIBS
+AC_DEFUN(AM_PATH_NSS,
+[dnl
+
+AC_ARG_WITH(nss-prefix,
+ [ --with-nss-prefix=PFX Prefix where NSS is installed],
+ nss_config_prefix="$withval",
+ nss_config_prefix="")
+
+AC_ARG_WITH(nss-exec-prefix,
+ [ --with-nss-exec-prefix=PFX
+ Exec prefix where NSS is installed],
+ nss_config_exec_prefix="$withval",
+ nss_config_exec_prefix="")
+
+ if test -n "$nss_config_exec_prefix"; then
+ nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix"
+ if test -z "$NSS_CONFIG"; then
+ NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config
+ fi
+ fi
+ if test -n "$nss_config_prefix"; then
+ nss_config_args="$nss_config_args --prefix=$nss_config_prefix"
+ if test -z "$NSS_CONFIG"; then
+ NSS_CONFIG=$nss_config_prefix/bin/nss-config
+ fi
+ fi
+
+ unset ac_cv_path_NSS_CONFIG
+ AC_PATH_PROG(NSS_CONFIG, nss-config, no)
+ min_nss_version=ifelse([$1], ,3.0.0,$1)
+ AC_MSG_CHECKING(for NSS - version >= $min_nss_version (skipping))
+
+ no_nss=""
+ if test "$NSS_CONFIG" = "no"; then
+ no_nss="yes"
+ else
+ NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
+ NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
+
+ dnl Skip version check for now
+ nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ fi
+
+ if test -z "$no_nss"; then
+ AC_MSG_RESULT(yes)
+ ifelse([$2], , :, [$2])
+ else
+ AC_MSG_RESULT(no)
+ fi
+
+
+ AC_SUBST(NSS_CFLAGS)
+ AC_SUBST(NSS_LIBS)
+
+])
Index: mozilla/security/manager/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/security/manager/Makefile.in,v
retrieving revision 1.57
diff -u -r1.57 Makefile.in
--- mozilla/security/manager/Makefile.in 2 Jun 2005 02:03:05 -0000 1.57
+++ mozilla/security/manager/Makefile.in 15 Dec 2005 05:40:54 -0000
@@ -46,6 +46,8 @@
MODULE = psm
PACKAGE_FILE = psm.pkg
+
+ifndef MOZ_NATIVE_NSS
PACKAGE_VARS += \
NSS3_LIB \
SMIME3_LIB \
@@ -57,6 +59,7 @@
$(NULL)
LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
+endif
NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
@@ -147,6 +150,7 @@
export:: .nss.cleaned
.nss.cleaned: .nss.checkout
+ifndef MOZ_NATIVE_NSS
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
ifndef SKIP_CHK
@@ -154,9 +158,12 @@
$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
endif
touch $@
+endif
.nss.checkout:
+ifndef MOZ_NATIVE_NSS
touch $(srcdir)/$@
+endif
dependclean export packages chrome::
$(MAKE) -C boot $@
@@ -167,12 +174,15 @@
endif
libs::
+ifndef MOZ_NATIVE_NSS
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
+endif
ifeq ($(OS_ARCH),WINNT)
cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
else
cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
endif
+ifndef MOZ_NATIVE_NSS
$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
ifndef SKIP_CHK
$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
@@ -210,6 +220,7 @@
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
endif
endif
+endif
$(MAKE) -C boot $@
$(MAKE) -C ssl $@
$(MAKE) -C locales $@
@@ -218,6 +229,7 @@
endif
install::
+ifndef MOZ_NATIVE_NSS
$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
ifndef SKIP_CHK
$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
@@ -232,6 +244,7 @@
$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
endif
+endif
$(MAKE) -C boot $@
$(MAKE) -C ssl $@
$(MAKE) -C locales $@
@@ -246,15 +259,18 @@
ifdef MOZ_XUL
$(MAKE) -C pki $@
endif
+ifndef MOZ_NATIVE_NSS
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
ifndef SKIP_CHK
$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
endif
+endif
echo-requires-recursive::
$(MAKE) -C boot $@
$(MAKE) -C ssl $@
$(MAKE) -C pki $@
$(MAKE) -C locales $@
+
Index: mozilla/security/manager/ssl/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/security/manager/ssl/src/Makefile.in,v
retrieving revision 1.67
diff -u -r1.67 Makefile.in
--- mozilla/security/manager/ssl/src/Makefile.in 3 Aug 2005 05:24:18 -0000 1.67
+++ mozilla/security/manager/ssl/src/Makefile.in 15 Dec 2005 05:40:56 -0000
@@ -123,8 +123,13 @@
# Use local includes because they are inserted before INCLUDES
# so that Mozilla's nss.h is used, not glibc's
+ifdef MOZ_NATIVE_NSS
+LOCAL_INCLUDES += $(NSS_CFLAGS) \
+ $(NULL)
+else
LOCAL_INCLUDES += -I$(DIST)/public/nss \
$(NULL)
+endif
EXTRA_DSO_LDOPTS += \
$(MOZ_UNICHARUTIL_LIBS) \
Index: mozilla/security/manager/ssl/src/nsNSSComponent.cpp
===================================================================
RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsNSSComponent.cpp,v
retrieving revision 1.126.2.1
diff -u -r1.126.2.1 nsNSSComponent.cpp
--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp 26 Aug 2005 06:41:50 -0000 1.126.2.1
+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp 15 Dec 2005 05:41:00 -0000
@@ -488,14 +488,6 @@
}
-#ifdef XP_MAC
-#ifdef DEBUG
-#define LOADABLE_CERTS_MODULE NS_LITERAL_CSTRING("NSSckbiDebug.shlb")
-#else
-#define LOADABLE_CERTS_MODULE NS_LITERAL_CSTRING("NSSckbi.shlb")
-#endif /*DEBUG*/
-#endif /*XP_MAC*/
-
static void setOCSPOptions(nsIPrefBranch * pref);
NS_IMETHODIMP
@@ -689,40 +681,40 @@
const char *possible_ckbi_locations[] = {
NS_GRE_DIR,
- NS_XPCOM_CURRENT_PROCESS_DIR
+ NS_XPCOM_CURRENT_PROCESS_DIR,
+ 0
};
-
+
for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
nsCOMPtr<nsILocalFile> mozFile;
- directoryService->Get( possible_ckbi_locations[il],
- NS_GET_IID(nsILocalFile),
- getter_AddRefs(mozFile));
+ char *fullModuleName = nsnull;
+
+ if (!possible_ckbi_locations[il])
+ {
+ fullModuleName = PR_GetLibraryName(nsnull, "nssckbi");
+ }
+ else
+ {
+ directoryService->Get( possible_ckbi_locations[il],
+ NS_GET_IID(nsILocalFile),
+ getter_AddRefs(mozFile));
- if (!mozFile) {
- continue;
+ if (!mozFile) {
+ continue;
+ }
+
+ nsCAutoString processDir;
+ mozFile->GetNativePath(processDir);
+ fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
}
- char *fullModuleName = nsnull;
-#ifdef XP_MAC
- nsCAutoString nativePath;
- mozFile->AppendNative(NS_LITERAL_CSTRING("Essential Files"));
- mozFile->AppendNative(LOADABLE_CERTS_MODULE);
- mozFile->GetNativePath(nativePath);
- fullModuleName = (char *) nativePath.get();
-#else
- nsCAutoString processDir;
- mozFile->GetNativePath(processDir);
- fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
-#endif
/* If a module exists with the same name, delete it. */
NS_ConvertUCS2toUTF8 modNameUTF8(modName);
int modType;
SECMOD_DeleteModule(NS_CONST_CAST(char*, modNameUTF8.get()), &modType);
SECStatus rv_add =
SECMOD_AddNewModule(NS_CONST_CAST(char*, modNameUTF8.get()), fullModuleName, 0, 0);
-#ifndef XP_MAC
- PR_Free(fullModuleName); // allocated by NSPR
-#endif
+ PR_FreeLibraryName(fullModuleName); // allocated by NSPR
if (SECSuccess == rv_add) {
// found a module, no need to try other directories
break;

73
firefox-2.0-visibility.patch
View File

@ -1,73 +0,0 @@
--- mozilla/config/system-headers.visibility 2005-06-17 17:03:42.000000000 -0400
+++ mozilla/config/system-headers 2006-10-26 22:40:49.000000000 -0400
@@ -66,6 +66,8 @@
Button.h
byteswap.h
cairo.h
+cairo-xlib.h
+cairo-xlib-xrender.h
callconv.h
Carbon/Carbon.h
CarbonEvents.h
@@ -176,7 +178,7 @@
freetype/freetype.h
freetype/ftcache.h
freetype/ftglyph.h
-freetype/ftoutlin.h
+freetype/ftoutln.h
freetype/ttnameid.h
freetype/tttables.h
fribidi/fribidi.h
@@ -192,6 +194,8 @@
gdk/gdkregion.h
gdk/gdkwindow.h
gdk/gdkx.h
+gdk/gdkpango.h
+gdk/gdkalias.h
gdk-pixbuf/gdk-pixbuf.h
Gestalt.h
getopt.h
@@ -212,7 +216,11 @@
gtk/gtkcontainer.h
gtk/gtkdialog.h
gtk/gtkentry.h
+gtk/gtkfilechooser.h
+gtk/gtkfixed.h
gtk/gtk.h
+gtk/gtkiconfactory.h
+gtk/gtkimage.h
gtk/gtkimmulticontext.h
gtk/gtkinvisible.h
gtk/gtkmain.h
@@ -496,10 +504,12 @@
photon/PtWebClient.h
photon/PxImage.h
pk11func.h
+pk11pub.h
pkcs11t.h
PLStringFuncs.h
PMApplication.h
pmddim.h
+png.h
poll.h
Polygon.h
portable.h
@@ -874,6 +884,7 @@
X11/Xutil.h
xpt_struct.h
xpt_xdr.h
+zlib.h
zmouse.h
sslt.h
smime.h
--- mozilla/modules/oji/src/nsJVMManager.cpp.visibility 2005-08-22 10:09:59.000000000 -0400
+++ mozilla/modules/oji/src/nsJVMManager.cpp 2006-10-26 22:38:48.000000000 -0400
@@ -845,7 +845,7 @@
return fStatus;
}
-extern "C" nsresult JSJ_RegisterLiveConnectFactory(void);
+extern "C" NS_VISIBILITY_DEFAULT nsresult JSJ_RegisterLiveConnectFactory(void);
PRBool
nsJVMManager::MaybeStartupLiveConnect(void)

1161
firefox-RC1-stock-icons-be.patch
View File

File diff suppressed because it is too large Load Diff

784
firefox-RC1-stock-icons-fe.patch
View File

@ -1,784 +0,0 @@
Index: toolkit/components/filepicker/content/filepicker.js
===================================================================
RCS file: /cvsroot/mozilla/toolkit/components/filepicker/content/filepicker.js,v
retrieving revision 1.5.18.1.2.1
diff -u -r1.5.18.1.2.1 filepicker.js
--- toolkit/components/filepicker/content/filepicker.js 10 Aug 2004 00:20:32 -0000 1.5.18.1.2.1
+++ toolkit/components/filepicker/content/filepicker.js 3 Nov 2004 13:21:22 -0000
@@ -67,6 +67,7 @@
if (o.displayDirectory) {
const directory = o.displayDirectory.path;
}
+
const initialText = o.defaultString;
const filterTitles = o.filters.titles;
const filterTypes = o.filters.types;
@@ -121,13 +122,18 @@
treeView.showOnlyDirectories = true;
}
+ // set up the right icon for GNOME stock icons
+ if (filePickerMode == nsIFilePicker.modeSave)
+ okButton.setAttribute("icon","save");
+ else
+ okButton.setAttribute("icon","open");
+
// start out with a filename sort
handleColumnClick("FilenameColumn");
document.documentElement.setAttribute("ondialogcancel", "return onCancel();");
try {
- var buttonLabel = getOKAction();
- okButton.setAttribute("label", buttonLabel);
+ setOKAction();
} catch (exception) {
// keep it set to "OK"
}
@@ -496,8 +502,9 @@
onFileSelected(treeView.selectedFiles);
}
-function getOKAction(file) {
+function setOKAction(file) {
var buttonLabel;
+ var buttonIcon = "open"; // used in all but one case
if (file && file.isDirectory() && filePickerMode != nsIFilePicker.modeGetFolder) {
document.documentElement.setAttribute("ondialogaccept", "return openOnOK();");
@@ -515,11 +522,12 @@
break;
case nsIFilePicker.modeSave:
buttonLabel = gFilePickerBundle.getString("saveButtonLabel");
+ buttonIcon = "save";
break;
}
}
-
- return buttonLabel;
+ okButton.setAttribute("label", buttonLabel);
+ okButton.setAttribute("icon", buttonIcon);
}
function onSelect(event) {
@@ -558,8 +566,7 @@
}
if (validFileSelected) {
- var buttonLabel = getOKAction(file);
- okButton.setAttribute("label", buttonLabel);
+ setOKAction(file);
okButton.disabled = invalidSelection;
} else
okButton.disabled = (textInput.value == "");
@@ -586,8 +593,7 @@
}
function onTextFieldFocus() {
- var buttonLabel = getOKAction(null);
- okButton.setAttribute("label", buttonLabel);
+ setOKAction(null);
doEnabling();
}
Index: toolkit/components/filepicker/content/filepicker.xul
===================================================================
RCS file: /cvsroot/mozilla/toolkit/components/filepicker/content/filepicker.xul,v
retrieving revision 1.4.8.1
diff -u -r1.4.8.1 filepicker.xul
--- toolkit/components/filepicker/content/filepicker.xul 24 Jul 2004 23:36:19 -0000 1.4.8.1
+++ toolkit/components/filepicker/content/filepicker.xul 3 Nov 2004 13:21:24 -0000
@@ -95,7 +95,7 @@
<hbox class="dialog-button-box" align="center">
<checkbox label="&showHiddenFiles.label;" oncommand="toggleShowHidden();"
flex="1" align="left" accesskey="&showHiddenFiles.accesskey;"/>
- <button dlgtype="cancel" class="dialog-button"/>
- <button dlgtype="accept" class="dialog-button"/>
+ <button dlgtype="cancel" icon="cancel" class="dialog-button"/>
+ <button dlgtype="accept" icon="accept" class="dialog-button"/>
</hbox>
</dialog>
Index: toolkit/components/passwordmgr/resources/content/passwordManager.xul
===================================================================
RCS file: /cvsroot/mozilla/toolkit/components/passwordmgr/resources/content/passwordManager.xul,v
retrieving revision 1.2.22.1
diff -u -r1.2.22.1 passwordManager.xul
--- toolkit/components/passwordmgr/resources/content/passwordManager.xul 16 Jul 2004 16:15:36 -0000 1.2.22.1
+++ toolkit/components/passwordmgr/resources/content/passwordManager.xul 3 Nov 2004 13:21:25 -0000
@@ -29,6 +29,7 @@
title="&windowtitle.label;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
buttons="accept"
+ buttoniconaccept="close"
onload="Startup()"
onunload="Shutdown()"
persist="screenX screenY width height">
@@ -66,9 +67,9 @@
</tree>
<separator class="thin"/>
<hbox>
- <button id="removeSignon" disabled="true"
+ <button id="removeSignon" disabled="true" icon="remove"
label="&remove.label;" oncommand="DeleteSignon();"/>
- <button id="removeAllSignons"
+ <button id="removeAllSignons" icon="remove"
label="&removeall.label;"
oncommand="DeleteAllSignons();"/>
<spacer flex="1"/>
@@ -91,9 +92,9 @@
</tree>
<separator class="thin"/>
<hbox>
- <button id="removeReject" disabled="true"
+ <button id="removeReject" disabled="true" icon="remove"
label="&remove.label;" oncommand="DeleteReject();"/>
- <button id="removeAllRejects"
+ <button id="removeAllRejects" icon="remove"
label="&removeall.label;"
oncommand="DeleteAllRejects();"/>
</hbox>
Index: toolkit/components/printing/content/printPreviewBindings.xml
===================================================================
RCS file: /cvsroot/mozilla/toolkit/components/printing/content/printPreviewBindings.xml,v
retrieving revision 1.15
diff -u -r1.15 printPreviewBindings.xml
--- toolkit/components/printing/content/printPreviewBindings.xml 20 Nov 2003 05:13:57 -0000 1.15
+++ toolkit/components/printing/content/printPreviewBindings.xml 3 Nov 2004 13:21:27 -0000
@@ -53,7 +53,7 @@
<content>
<xul:button label="&print.label;" accesskey="&print.accesskey;"
- oncommand="PrintUtils.print();"/>
+ oncommand="PrintUtils.print();" icon="print"/>
<xul:button label="&pageSetup.label;" accesskey="&pageSetup.accesskey;"
oncommand="this.parentNode.doPageSetup();"/>
@@ -118,7 +118,7 @@
<xul:toolbarseparator class="toolbarseparator-primary"/>
<xul:button label="&close.label;" accesskey="&close.accesskey;"
- oncommand="PrintUtils.exitPrintPreview();"/>
+ oncommand="PrintUtils.exitPrintPreview();" icon="close"/>
<xul:data value="&customPrompt.title;"/>
</content>
Index: toolkit/components/printing/content/printProgress.xul
===================================================================
RCS file: /cvsroot/mozilla/toolkit/components/printing/content/printProgress.xul,v
retrieving revision 1.1
diff -u -r1.1 printProgress.xul
--- toolkit/components/printing/content/printProgress.xul 16 Aug 2003 11:39:04 -0000 1.1
+++ toolkit/components/printing/content/printProgress.xul 3 Nov 2004 13:21:28 -0000
@@ -94,7 +94,7 @@
</grid>
<separator/>
<hbox id="CancelButton" pack="end">
- <button id="cancel" label="&dialogCancel.label;"
+ <button id="cancel" label="&dialogCancel.label;" icon="cancel"
oncommand="doCancelButton()"/>
</hbox>
</window>
Index: toolkit/components/printing/content/printdialog.xul
===================================================================
RCS file: /cvsroot/mozilla/toolkit/components/printing/content/printdialog.xul,v
retrieving revision 1.1
diff -u -r1.1 printdialog.xul
--- toolkit/components/printing/content/printdialog.xul 16 Aug 2003 11:39:04 -0000 1.1
+++ toolkit/components/printing/content/printdialog.xul 3 Nov 2004 13:21:29 -0000
@@ -48,6 +48,7 @@
onload="onLoad();"
ondialogaccept="return onAccept();"
oncancel="return onCancel();"
+ buttoniconaccept="print"
title="&printDialog.title;"
persist="screenX screenY"
screenX="24" screenY="24">
@@ -82,14 +83,14 @@
<menulist id="printerList" flex="1" oncommand="setPrinterDefaultsForSelectedPrinter();">
<menupopup/>
</menulist>
- <button id="properties" label="&propertiesButton.label;" oncommand="displayPropertiesDialog();"/>
+ <button id="properties" label="&propertiesButton.label;" icon="properties" oncommand="displayPropertiesDialog();"/>
</row>
<row align="center">
<hbox align="center" pack="end">
<label id="fileLabel" control="fileInput" value="&fileInput.label;"/>
</hbox>
<textbox id="fileInput" flex="1" onblur="stripTrailingWhitespace(this)"/>
- <button id="chooseFile" label="&chooseButton.label;" oncommand="onChooseFile()"/>
+ <button id="chooseFile" label="&chooseButton.label;" icon="open" oncommand="onChooseFile()"/>
</row>
</rows>
Index: toolkit/content/customizeCharset.xul
===================================================================
RCS file: /cvsroot/mozilla/toolkit/content/customizeCharset.xul,v
retrieving revision 1.2
diff -u -r1.2 customizeCharset.xul
--- toolkit/content/customizeCharset.xul 26 Oct 2003 21:10:16 -0000 1.2
+++ toolkit/content/customizeCharset.xul 3 Nov 2004 13:21:30 -0000
@@ -72,7 +72,7 @@
<hbox align="center">
<button id="add_button" oncommand="AddAvailableCharset();"
- label="&add.label;" disabled="true"/>
+ label="&add.label;" icon="add" disabled="true"/>
</hbox>
</vbox>
@@ -87,7 +87,7 @@
<separator class="thin"/>
<hbox align="center">
<button id="remove_button" oncommand="RemoveActiveCharset();"
- disabled="true"
+ disabled="true" icon="remove"
label="&remove.label;"/>
</hbox>
</vbox>
Index: toolkit/content/customizeToolbar.xul
===================================================================
RCS file: /cvsroot/mozilla/toolkit/content/customizeToolbar.xul,v
retrieving revision 1.9.30.2
diff -u -r1.9.30.2 customizeToolbar.xul
--- toolkit/content/customizeToolbar.xul 29 Sep 2004 07:08:10 -0000 1.9.30.2
+++ toolkit/content/customizeToolbar.xul 3 Nov 2004 13:21:31 -0000
@@ -73,14 +73,14 @@
<checkbox id="smallicons" oncommand="updateIconSize(this.checked);" label="&useSmallIcons.label;"/>
- <button label="&addNewToolbar.label;" oncommand="addNewToolbar();"/>
- <button label="&restoreDefaultSet.label;" oncommand="restoreDefaultSet();"/>
+ <button label="&addNewToolbar.label;" oncommand="addNewToolbar();" icon="add"/>
+ <button label="&restoreDefaultSet.label;" oncommand="restoreDefaultSet();" icon="refresh"/>
</box>
<separator class="groove"/>
<hbox align="center" pack="end">
- <button label="&saveChanges.label;" oncommand="onAccept();" default="true"/>
+ <button label="&saveChanges.label;" oncommand="onAccept();" default="true" icon="close"/>
</hbox>
</vbox>
Index: toolkit/content/finddialog.xul
===================================================================
RCS file: /cvsroot/mozilla/toolkit/content/finddialog.xul,v
retrieving revision 1.12
diff -u -r1.12 finddialog.xul
--- toolkit/content/finddialog.xul 2 Dec 2003 02:47:08 -0000 1.12
+++ toolkit/content/finddialog.xul 3 Nov 2004 13:21:31 -0000
@@ -66,8 +66,12 @@
</vbox>
<vbox flex="1">
<button id="btnFind" label="&findButton.label;" accesskey="&findButton.accesskey;"
- dlgtype="accept"/>
+ dlgtype="accept" icon="find"/>
+#ifdef XP_UNIX
+ <button label="&closeButton.label;" icon="close" dlgtype="cancel"/>
+#else
<button label="&cancelButton.label;" dlgtype="cancel"/>
+#endif
</vbox>
</hbox>
</dialog>
Index: toolkit/content/widgets/dialog.xml
===================================================================
RCS file: /cvsroot/mozilla/toolkit/content/widgets/dialog.xml,v
retrieving revision 1.12
diff -u -r1.12 dialog.xml
--- toolkit/content/widgets/dialog.xml 11 Feb 2004 00:56:15 -0000 1.12
+++ toolkit/content/widgets/dialog.xml 3 Nov 2004 13:21:33 -0000
@@ -221,6 +221,30 @@
button.setAttribute("accesskey", accessKey);
}
}
+ // allow specifying alternate icons in the dialog header
+ if (!button.hasAttribute("icon")) {
+ // if there's an icon specified, use that
+ if (this.hasAttribute("buttonicon"+dlgtype))
+ button.setAttribute("icon", this.getAttribute("buttonicon"+dlgtype));
+ // otherwise set defaults
+ else
+ switch (dlgtype) {
+ case "accept":
+ button.setAttribute("icon","accept");
+ break;
+ case "cancel":
+ button.setAttribute("icon","cancel");
+ break;
+ case "disclosue":
+ button.setAttribute("icon","properties");
+ break;
+ case "help":
+ button.setAttribute("icon","help");
+ break;
+ default:
+ break;
+ }
+ }
}
// ensure that hitting enter triggers ondialogaccept
Index: toolkit/content/widgets/expander.xml
===================================================================
RCS file: /cvsroot/mozilla/toolkit/content/widgets/expander.xml,v
retrieving revision 1.2.24.1.2.1
diff -u -r1.2.24.1.2.1 expander.xml
--- toolkit/content/widgets/expander.xml 16 May 2004 18:16:40 -0000 1.2.24.1.2.1
+++ toolkit/content/widgets/expander.xml 3 Nov 2004 13:21:36 -0000
@@ -12,7 +12,7 @@
<xul:hbox align="center">
<xul:button type="disclosure" class="expanderButton" anonid="disclosure" xbl:inherits="disabled" mousethrough="always"/>
<xul:label class="header expanderButton" anonid="label" xbl:inherits="value=label,disabled" mousethrough="always" flex="1"/>
- <xul:button anonid="clear-button" xbl:inherits="label=clearlabel,disabled=cleardisabled,hidden=clearhidden" mousethrough="always"/>
+ <xul:button anonid="clear-button" xbl:inherits="label=clearlabel,disabled=cleardisabled,hidden=clearhidden" mousethrough="always" icon="clear"/>
</xul:hbox>
<xul:vbox flex="1" anonid="settings" class="settingsContainer" collapsed="true" xbl:inherits="align">
<children/>
Index: toolkit/content/widgets/wizard.xml
===================================================================
RCS file: /cvsroot/mozilla/toolkit/content/widgets/wizard.xml,v
retrieving revision 1.10.6.2
diff -u -r1.10.6.2 wizard.xml
--- toolkit/content/widgets/wizard.xml 29 Sep 2004 18:11:19 -0000 1.10.6.2
+++ toolkit/content/widgets/wizard.xml 3 Nov 2004 13:21:38 -0000
@@ -64,9 +64,19 @@
if (this.onFirstPage) {
this.canRewind = false;
this.setAttribute("firstpage", "true");
+#ifdef XP_UNIX
+#ifndef XP_MACOSX
+ this._backButton.setAttribute('hidden', 'true');
+#endif
+#endif
} else {
this.canRewind = true;
this.setAttribute("firstpage", "false");
+#ifdef XP_UNIX
+#ifndef XP_MACOSX
+ this._backButton.setAttribute('hidden', 'false');
+#endif
+#endif
}
if (this.onLastPage) {
@@ -328,7 +338,11 @@
var btn = document.getAnonymousElementByAttribute(this._wizardButtons, "dlgtype", aName);
if (btn) {
btn.addEventListener("command", this["_"+aName+"Func"], false);
- btn.setAttribute("label", this._bundle.GetStringFromName("button-"+aName));
+#ifdef XP_UNIX
+#ifndef XP_MACOSX
+ btn.setAttribute("label", this._bundle.GetStringFromName("button-"+aName+"-gnome"));
+#endif
+#endif
this["_"+aName+"Button"] = btn;
}
return btn;
@@ -478,16 +492,22 @@
<xul:separator class="wizard-buttons-separator groove"/>
<xul:hbox class="wizard-buttons-box-2">
<xul:spacer flex="1"/>
- <xul:button class="wizard-button" dlgtype="back"/>
+#ifdef XP_UNIX
+ <xul:button class="wizard-button" dlgtype="cancel" icon="cancel"/>
+ <xul:spacer style="width: 24px"/>
+#endif
+ <xul:button class="wizard-button" dlgtype="back" icon="go-back"/>
<xul:deck class="wizard-next-deck" anonid="WizardButtonDeck">
<xul:hbox>
<xul:button class="wizard-button" dlgtype="finish" default="true" flex="1"/>
</xul:hbox>
<xul:hbox>
- <xul:button class="wizard-button" dlgtype="next" default="true" flex="1"/>
+ <xul:button class="wizard-button" dlgtype="next" icon="go-forward" default="true" flex="1"/>
</xul:hbox>
</xul:deck>
- <xul:button class="wizard-button" dlgtype="cancel"/>
+#ifdef XP_WIN
+ <xul:button class="wizard-button" dlgtype="cancel" icon="cancel"/>
+#endif
</xul:hbox>
</xul:vbox>
</content>
Index: toolkit/locales/en-US/chrome/global/finddialog.dtd
===================================================================
RCS file: /cvsroot/mozilla/toolkit/locales/en-US/chrome/global/Attic/finddialog.dtd,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 finddialog.dtd
--- toolkit/locales/en-US/chrome/global/finddialog.dtd 23 Jul 2004 19:26:59 -0000 1.1.2.2
+++ toolkit/locales/en-US/chrome/global/finddialog.dtd 3 Nov 2004 13:21:38 -0000
@@ -13,7 +13,7 @@
<!ENTITY findField.tooltip "Type one or more words to search for">
<!ENTITY findButton.label "Find Next">
<!ENTITY findButton.accesskey "F">
-<!ENTITY cancelButton.label "Cancel">
+<!ENTITY closeButton.label "Close">
<!ENTITY up.label "Up">
<!ENTITY up.accesskey "U">
<!ENTITY down.label "Down">
Index: toolkit/mozapps/downloads/content/pref-downloads.xul
===================================================================
RCS file: /cvsroot/mozilla/toolkit/mozapps/downloads/content/pref-downloads.xul,v
retrieving revision 1.10.16.1
diff -u -r1.10.16.1 pref-downloads.xul
--- toolkit/mozapps/downloads/content/pref-downloads.xul 13 Jul 2004 03:24:41 -0000 1.10.16.1
+++ toolkit/mozapps/downloads/content/pref-downloads.xul 3 Nov 2004 13:21:43 -0000
@@ -59,7 +59,7 @@
<radio id="alwaysAsk" label="&alwaysAsk.label;" value="false"/>
<hbox flex="1">
<radio id="neverAsk" label="&neverAsk.label;" value="true"/>
- <button id="showFolder" label="&showFolder.label;" oncommand="showFolder();"/>
+ <button id="showFolder" label="&showFolder.label;" oncommand="showFolder();" icon="open"/>
</hbox>
</radiogroup>
</groupbox>
@@ -154,13 +154,13 @@
<separator class="thin"/>
<hbox>
<button label="&editFileHandler.label;" accesskey="&editFileHandler.accesskey;"
- id="editFileHandler" oncommand="editFileHandler();"/>
+ id="editFileHandler" oncommand="editFileHandler();" icon="properties"/>
<button label="&removeFileHandler.label;" accesskey="&removeFileHandler.accesskey;"
- id="removeFileHandler" oncommand="removeFileHandler();"/>
+ id="removeFileHandler" oncommand="removeFileHandler();" icon="remove"/>
#ifdef MOZ_PHOENIX
<spring flex="1"/>
<button label="&plugins.label;" accesskey="&plugins.accesskey;"
- id="plugins" oncommand="showPlugins();"/>
+ id="plugins" oncommand="showPlugins();" icon="properties"/>
#endif
</hbox>
</vbox>
Index: toolkit/themes/gnomestripe/global/button.css
===================================================================
RCS file: /cvsroot/mozilla/toolkit/themes/gnomestripe/global/button.css,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 button.css
--- toolkit/themes/gnomestripe/global/button.css 14 Sep 2004 20:22:51 -0000 1.1.2.3
+++ toolkit/themes/gnomestripe/global/button.css 3 Nov 2004 13:21:47 -0000
@@ -162,3 +162,86 @@
list-style-image: url("chrome://global/skin/tree/twisty-open.png");
}
+/*
+ * GNOME Stock Icon Styles
+ */
+
+button[icon="accept"] .button-icon {
+ list-style-image: url("moz-icon://stock/gtk-ok?size=button");
+}
+
+button[icon="cancel"] .button-icon {
+ list-style-image: url("moz-icon://stock/gtk-cancel?size=button");
+}
+
+button[icon="help"] .button-icon {
+ list-style-image: url("moz-icon://stock/gtk-help?size=button");
+}
+
+button[icon="open"] .button-icon {
+ list-style-image: url("moz-icon://stock/gtk-open?size=button");
+}
+
+button[icon="save"] .button-icon {
+ list-style-image: url(moz-icon://stock/gtk-save?size=button);
+}
+
+button[icon="find"] .button-icon {
+ list-style-image: url("moz-icon://stock/gtk-find?size=button");
+}
+
+button[icon="clear"] .button-icon {
+ list-style-image: url("moz-icon://stock/gtk-clear?size=button");
+}
+
+button[icon="yes"] .button-icon {
+ list-style-image: url("moz-icon://stock/gtk-yes?size=button");
+}
+
+button[icon="no"] .button-icon {
+ list-style-image: url("moz-icon://stock/gtk-no?size=button");
+}
+
+button[icon="apply"] .button-icon {
+ list-style-image: url("moz-icon://stock/gtk-apply?size=button");
+}
+
+button[icon="close"] .button-icon {
+ list-style-image: url("moz-icon://stock/gtk-close?size=button");
+}
+
+button[icon="print"] .button-icon {
+ list-style-image: url("moz-icon://stock/gtk-print?size=button");
+}
+
+button[icon="add"] .button-icon {
+ list-style-image: url("moz-icon://stock/gtk-add?size=button");
+}
+
+button[icon="remove"] .button-icon {
+ list-style-image: url("moz-icon://stock/gtk-remove?size=button");
+}
+
+button[icon="refresh"] .button-icon {
+ list-style-image: url("moz-icon://stock/gtk-refresh?size=button");
+}
+
+button[icon="go-forward"] .button-icon {
+ list-style-image: url("moz-icon://stock/gtk-go-forward?size=button");
+}
+
+button[icon="go-back"] .button-icon {
+ list-style-image: url("moz-icon://stock/gtk-go-back?size=button");
+}
+
+button[icon="properties"] .button-icon {
+ list-style-image: url("moz-icon://stock/gtk-properties?size=button");
+}
+
+button[icon="select-font"] .button-icon {
+ list-style-image: url("moz-icon://stock/gtk-select-font?size=button");
+}
+
+button[icon="network"] .button-icon {
+ list-style-image: url("moz-icon://stock/gtk-network?size=button");
+}
Index: browser/base/content/openLocation.xul
===================================================================
RCS file: /cvsroot/mozilla/browser/base/content/openLocation.xul,v
retrieving revision 1.6
diff -u -r1.6 openLocation.xul
--- browser/base/content/openLocation.xul 20 Feb 2004 02:21:10 -0000 1.6
+++ browser/base/content/openLocation.xul 3 Nov 2004 13:22:05 -0000
@@ -32,6 +32,7 @@
title="&caption.label;"
onload="onLoad()"
buttonlabelaccept="&openBtn.label;"
+ buttoniconaccept="open"
ondialogaccept="open()"
style="width: 40em;"
persist="screenX screenY"
Index: browser/base/content/pageInfo.xul
===================================================================
RCS file: /cvsroot/mozilla/browser/base/content/pageInfo.xul,v
retrieving revision 1.13.4.1.2.1
diff -u -r1.13.4.1.2.1 pageInfo.xul
--- browser/base/content/pageInfo.xul 21 Sep 2004 05:00:41 -0000 1.13.4.1.2.1
+++ browser/base/content/pageInfo.xul 3 Nov 2004 13:22:07 -0000
@@ -297,7 +297,8 @@
</rows>
</grid>
<hbox>
- <button label="&mediaSaveAs;" accesskey="&mediaSaveAsAccesskey;" id="imagesaveasbutton" disabled="true" oncommand="saveMedia();"/>
+ <button label="&mediaSaveAs;" accesskey="&mediaSaveAsAccesskey;" id="imagesaveasbutton"
+ icon="save" disabled="true" oncommand="saveMedia();"/>
</hbox>
<vbox class="inset iframe" flex="1" pack="center">
<hbox id="theimagecontainer" pack="center">
Index: browser/base/content/pageReport.xul
===================================================================
RCS file: /cvsroot/mozilla/browser/base/content/pageReport.xul,v
retrieving revision 1.9
diff -u -r1.9 pageReport.xul
--- browser/base/content/pageReport.xul 29 Apr 2003 08:31:45 -0000 1.9
+++ browser/base/content/pageReport.xul 3 Nov 2004 13:22:07 -0000
@@ -49,9 +49,9 @@
<separator class="thin"/>
<hbox>
<button label="&unblock.label;" id="unblockButton" oncommand="whitelistSite();"
- disabled="true" accesskey="&unblock.accesskey;"/>
+ disabled="true" accesskey="&unblock.accesskey;" icon="yes"/>
<spacer flex="1"/>
- <button dlgtype="accept" label="&done.label;" default="true"
+ <button dlgtype="accept" label="&done.label;" default="true" icon="close"
oncommand="window.close();" accesskey="&done.accesskey;"/>
</hbox>
</dialog>
Index: browser/components/bookmarks/content/addBookmark.xul
===================================================================
RCS file: /cvsroot/mozilla/browser/components/bookmarks/content/addBookmark.xul,v
retrieving revision 1.2.16.1
diff -u -r1.2.16.1 addBookmark.xul
--- browser/components/bookmarks/content/addBookmark.xul 11 Aug 2004 22:34:30 -0000 1.2.16.1
+++ browser/components/bookmarks/content/addBookmark.xul 3 Nov 2004 13:22:08 -0000
@@ -93,7 +93,7 @@
<bookmarks-tree id="bookmarks-view" flex="1" type="folders"/>
<vbox>
<button label="&button.newfolder.label;" accesskey="&button.newfolder.accesskey;"
- oncommand="createNewFolder();"/>
+ oncommand="createNewFolder();" icon="open"/>
<button label="&button.defaultfolder.label;"
accesskey="&button.defaultfolder.accesskey;"
oncommand="useDefaultFolder();"/>
Index: browser/components/bookmarks/content/addBookmark2.xul
===================================================================
RCS file: /cvsroot/mozilla/browser/components/bookmarks/content/addBookmark2.xul,v
retrieving revision 1.13.4.2
diff -u -r1.13.4.2 addBookmark2.xul
--- browser/components/bookmarks/content/addBookmark2.xul 25 Jul 2004 03:02:16 -0000 1.13.4.2
+++ browser/components/bookmarks/content/addBookmark2.xul 3 Nov 2004 13:22:08 -0000
@@ -42,6 +42,8 @@
buttonlabelextra2="&newFolder.label;" buttonaccesskeyextra2="&newFolder.accesskey;"
#ifdef XP_UNIX
buttonlabelaccept="&acceptButton.label;"
+ buttoniconaccept="add"
+ buttoniconextra2="open"
#endif
title="&newBookmark.title;" title-selectFolder="&selectFolder.label;"
onload="Startup();"
Index: browser/components/cookieviewer/content/CookieExceptions.xul
===================================================================
RCS file: /cvsroot/mozilla/browser/components/cookieviewer/content/CookieExceptions.xul,v
retrieving revision 1.5.12.3
diff -u -r1.5.12.3 CookieExceptions.xul
--- browser/components/cookieviewer/content/CookieExceptions.xul 11 Aug 2004 05:17:37 -0000 1.5.12.3
+++ browser/components/cookieviewer/content/CookieExceptions.xul 3 Nov 2004 13:22:19 -0000
@@ -47,12 +47,12 @@
<hbox align="start">
<textbox id="url" flex="1" oninput="gPermissionManager.onHostInput(event.target);"/>
</hbox>
- <hbox pack="end">
- <button id="btnBlock" disabled="true"
+ <hbox pack="end">
+ <button id="btnBlock" disabled="true" icon="no"
label="&block.label;" oncommand="gPermissionManager.addPermission(nsIPermissionManager.DENY_ACTION);"/>
- <button id="btnSession" disabled="true"
+ <button id="btnSession" disabled="true"
label="&session.label;" oncommand="gPermissionManager.addPermission(nsICookiePermission.ACCESS_SESSION);"/>
- <button id="btnAllow" disabled="true"
+ <button id="btnAllow" disabled="true" icon="yes"
label="&allow.label;" oncommand="gPermissionManager.addPermission(nsIPermissionManager.ALLOW_ACTION);"/>
</hbox>
<separator class="thin"/>
@@ -71,9 +71,9 @@
</tree>
<separator class="thin"/>
<hbox>
- <button id="removePermission" disabled="true" label="&removepermission.label;"
+ <button id="removePermission" disabled="true" icon="remove" label="&removepermission.label;"
oncommand="gPermissionManager.onPermissionDeleted();"/>
- <button id="removeAllPermissions" label="&removeallpermissions.label;"
+ <button id="removeAllPermissions" icon="clear" label="&removeallpermissions.label;"
oncommand="gPermissionManager.onAllPermissionsDeleted();"/>
</hbox>
</dialog>
Index: browser/components/cookieviewer/content/CookieViewer.xul
===================================================================
RCS file: /cvsroot/mozilla/browser/components/cookieviewer/content/CookieViewer.xul,v
retrieving revision 1.4.10.1
diff -u -r1.4.10.1 CookieViewer.xul
--- browser/components/cookieviewer/content/CookieViewer.xul 25 Apr 2004 20:11:57 -0000 1.4.10.1
+++ browser/components/cookieviewer/content/CookieViewer.xul 3 Nov 2004 13:22:19 -0000
@@ -112,10 +112,10 @@
</grid>
</groupbox>
<hbox>
- <button id="removeCookie" disabled="true"
+ <button id="removeCookie" disabled="true" icon="remove"
label="&button.removecookie.label;"
oncommand="DeleteCookie();"/>
- <button id="removeAllCookies"
+ <button id="removeAllCookies" icon="clear"
label="&button.removeallcookies.label;"
oncommand="DeleteAllCookies();"/>
</hbox>
Index: browser/components/prefwindow/content/pref-advanced.xul
===================================================================
RCS file: /cvsroot/mozilla/browser/components/prefwindow/content/pref-advanced.xul,v
retrieving revision 1.21.12.11
diff -u -r1.21.12.11 pref-advanced.xul
--- browser/components/prefwindow/content/pref-advanced.xul 30 Oct 2004 04:27:23 -0000 1.21.12.11
+++ browser/components/prefwindow/content/pref-advanced.xul 3 Nov 2004 13:22:37 -0000
@@ -112,7 +112,7 @@
<hbox align="center">
<button label="&managecerts.button;"
oncommand="openCertManager();"
- id="openCertManagerButton"
+ id="openCertManagerButton" icon="properties"
accesskey="&managecerts.accesskey;"
prefstring="security.disable_button.openCertManager"/>
</hbox>
@@ -125,7 +125,7 @@
<hbox align="center">
<button label="&managedevices.button;"
oncommand="openDeviceManager();"
- id="openDeviceManagerButton"
+ id="openDeviceManagerButton" icon="properties"
accesskey="&managedevices.accesskey;"
prefstring="security.disable_button.openDeviceManager"/>
</hbox>
@@ -139,7 +139,7 @@
<hbox align="center">
<button label="&validation.managecrls.button;"
oncommand="openCrlManager();"
- id="managecrlbutton"
+ id="managecrlbutton" icon="properties"
accesskey="&validation.managecrls.accesskey;"
prefstring="security.OCSP.disable_button.managecrl"/>
</hbox>
Index: browser/components/prefwindow/content/pref-features-images.xul
===================================================================
RCS file: /cvsroot/mozilla/browser/components/prefwindow/content/pref-features-images.xul,v
retrieving revision 1.3
diff -u -r1.3 pref-features-images.xul
--- browser/components/prefwindow/content/pref-features-images.xul 23 Aug 2003 19:03:28 -0000 1.3
+++ browser/components/prefwindow/content/pref-features-images.xul 3 Nov 2004 13:22:40 -0000
@@ -54,11 +54,11 @@
<treechildren/>
</tree>
<hbox>
- <button id="removePermission" disabled="true"
+ <button id="removePermission" disabled="true" icon="remove"
label="&removepermission.label;"
oncommand="DeletePermission();"/>
<button id="removeAllPermissions"
- label="&removeallpermissions.label;"
+ label="&removeallpermissions.label;" icon="clear"
oncommand="DeleteAllPermissions();"/>
</hbox>
</dialog>
Index: browser/components/prefwindow/content/pref-navigator.xul
===================================================================
RCS file: /cvsroot/mozilla/browser/components/prefwindow/content/pref-navigator.xul,v
retrieving revision 1.23.4.3
diff -u -r1.23.4.3 pref-navigator.xul
--- browser/components/prefwindow/content/pref-navigator.xul 31 Aug 2004 13:38:50 -0000 1.23.4.3
+++ browser/components/prefwindow/content/pref-navigator.xul 3 Nov 2004 13:22:43 -0000
@@ -86,7 +86,7 @@
<caption label="&fonts.caption;"/>
<hbox align="center">
<description flex="1">&fontsInfo.label;</description>
- <button label="&showFontsAndColors.label;"
+ <button label="&showFontsAndColors.label;" icon="select-font"
accesskey="&showFontsAndColors.accesskey;"
oncommand="showFontsAndColors();"/>
</hbox>
@@ -118,7 +118,7 @@
<hbox align="center">
<description flex="1">&proxiesInfo.label;</description>
<button id="catProxiesButton" label="&showConnections.label;"
- accesskey="&showConnections.accesskey;"
+ accesskey="&showConnections.accesskey;" icon="network"
oncommand="showConnections();"/>
</hbox>
</groupbox>
Index: extensions/cookie/resources/content/cookieAcceptDialog.js
===================================================================
RCS file: /cvsroot/mozilla/extensions/cookie/resources/content/cookieAcceptDialog.js,v
retrieving revision 1.15
diff -u -r1.15 cookieAcceptDialog.js
--- extensions/cookie/resources/content/cookieAcceptDialog.js 31 Mar 2004 00:38:16 -0000 1.15
+++ extensions/cookie/resources/content/cookieAcceptDialog.js 3 Nov 2004 13:23:16 -0000
@@ -62,6 +62,12 @@
document.getElementById("cancel").label = dialog.getAttribute("cancelLabel");
document.getElementById("cancel").accessKey = dialog.getAttribute("cancelKey");
+ // hook up GNOME stock icons where implemented
+ document.getElementById("ok").setAttribute("icon","accept");
+ document.getElementById("cancel").setAttribute("icon","cancel");
+ document.getElementById("Button2").setAttribute("icon","accept");
+ document.getElementById("disclosureButton").setAttribute("icon","properties");
+
if (!gDateService) {
const nsScriptableDateFormat_CONTRACTID = "@mozilla.org/intl/scriptabledateformat;1";
const nsIScriptableDateFormat = Components.interfaces.nsIScriptableDateFormat;

28
firefox-RC1-stock-icons-gnomestripe.patch
View File

@ -1,28 +0,0 @@
Index: browser/themes/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/browser/themes/Makefile.in,v
retrieving revision 1.1.2.2
diff -d -u -p -r1.1.2.2 Makefile.in
--- browser/themes/Makefile.in 17 Jun 2004 06:18:32 -0000 1.1.2.2
+++ browser/themes/Makefile.in 4 Nov 2004 17:46:36 -0000
@@ -45,14 +45,19 @@ include $(DEPTH)/config/autoconf.mk
#
# Theme Selection
#
-# Windows, GNOME/Linux Winstripe
+# Windows Winstripe
# MacOS X Pinstripe
+# GNOME/Linux Gnomestripe
#
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
DIRS = pinstripe
else
+ifneq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
DIRS = winstripe
+else
+DIRS = gnomestripe
+endif
endif
include $(topsrcdir)/config/rules.mk

27
firefox-gnomestripe-0.1-livemarks.patch
View File

@ -1,27 +0,0 @@
diff -ru mozilla-badicon/browser/themes/gnomestripe/browser/browser.css mozilla/browser/themes/gnomestripe/browser/browser.css
--- mozilla-badicon/browser/themes/gnomestripe/browser/browser.css 2004-11-02 09:05:54.000000000 -0500
+++ mozilla/browser/themes/gnomestripe/browser/browser.css 2004-11-13 09:08:43.531509488 -0500
@@ -138,6 +138,7 @@
/* only the folder icon has any effect for now, item icon is unused */
.bookmark-item[livemark="true"] {
list-style-image: url("chrome://browser/skin/livemark-item.png") !important;
+ -moz-image-region: rect(0px, 16px, 16px, 0px);
}
.bookmark-item[type="menu"][livemark="true"] {
@@ -148,6 +149,15 @@
-moz-image-region: rect(16px, 48px, 32px, 32px) !important;
}
+.bookmark-item[livemark="true"][container="true"] {
+ -moz-image-region: rect(0px, 32px, 16px, 16px) !important;
+}
+
+.bookmark-item[livemark="true"][open="true"],
+.bookmark-item[livemark="true"][container="true"][open="true"] {
+ -moz-image-region: rect(16px, 32px, 32px, 16px) !important;
+}
+
/* ::::: primary toolbar buttons ::::: */
.toolbarbutton-1 {

14
firefox.spec
View File

@ -36,19 +36,12 @@ Source101: add-gecko-provides.in
# build patches
Patch1: firefox-2.0-link-layout.patch
Patch3: firefox-1.1-nss-system-nspr.patch
Patch4: firefox-1.5-with-system-nss.patch
Patch5: firefox-2.0-visibility.patch
# customization patches
Patch20: firefox-redhat-homepage.patch
Patch21: firefox-0.7.3-psfonts.patch
Patch22: firefox-1.1-default-applications.patch
Patch23: firefox-1.1-software-update.patch
Patch24: firefox-RC1-stock-icons-be.patch
Patch25: firefox-RC1-stock-icons-fe.patch
Patch26: firefox-RC1-stock-icons-gnomestripe.patch
Patch27: firefox-gnomestripe-0.1-livemarks.patch
# local bugfixes
Patch40: firefox-1.5-bullet-bill.patch
@ -147,18 +140,11 @@ removed in favor of xulrunner-devel.
%prep
%setup -q -n mozilla
%patch1 -p1 -b .link-layout
#%patch3 -p1
#%patch4 -p1
#%patch5 -p1 -b .visibility
#%patch20 -p0
%patch21 -p1 -b .psfonts
%patch22 -p0 -b .default-applications
#%patch23 -p0
#%patch24 -p0
#%patch25 -p0
#%patch26 -p0
#%patch27 -p1
%patch40 -p1 -b .bullet-bill
%patch41 -p1 -b .undo-uriloader
%patch42 -p0 -b .uriloader