Date: Fri, 23 Mar 2007 11:01:46 -0700 (PDT) From: "Eric P. Scott" <eps+pbug0703@ana.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/110726: www/firefox15: make patches apply cleanly to 1.5.0.11 Message-ID: <200703231801.l2NI1kbx026226@anna.ana.com> Resent-Message-ID: <200703231810.l2NIA4px083708@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 110726
>Category: ports
>Synopsis: www/firefox15: make patches apply cleanly to 1.5.0.11
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 23 18:10:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Eric P. Scott
>Release: FreeBSD 6.2-RELEASE-p2 i386
>Organization:
ana-systems, Inc.
>Environment:
System: FreeBSD sixofone 6.2-RELEASE-p2 FreeBSD 6.2-RELEASE-p2 #0: Tue Feb 27 22:41:06 UTC 2007 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
files/patch-* had not been updated to account for "drift" in the
source tree over multiple version bumps.
There are no functional changes; no attempt is made to fix
numerous compilation warnings.
>How-To-Repeat:
cd /usr/ports/www/firefox15 && make PATCH_DEBUG=yes patch
>Fix:
diff -ruN /usr/ports/www/firefox15/files/patch-Double.cpp www/firefox15/files/patch-Double.cpp
--- /usr/ports/www/firefox15/files/patch-Double.cpp Thu Feb 2 05:16:54 2006
+++ www/firefox15/files/patch-Double.cpp
@@ -1,6 +1,6 @@
---- 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
-@@ -51,10 +51,10 @@
+--- extensions/transformiix/source/base/Double.cpp.orig Fri Jun 23 00:56:19 2006
++++ extensions/transformiix/source/base/Double.cpp
+@@ -52,10 +52,10 @@
//A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
#ifdef __FreeBSD__
#include <ieeefp.h>
@@ -14,7 +14,7 @@
#endif
fp_except_t oldmask = fpsetmask(~allmask);
#endif
-@@ -75,22 +75,31 @@
+@@ -115,22 +115,31 @@
#define TX_DOUBLE_HI32_EXPMASK 0x7ff00000
#define TX_DOUBLE_HI32_MANTMASK 0x000fffff
diff -ruN /usr/ports/www/firefox15/files/patch-build_unix_run-mozilla.sh www/firefox15/files/patch-build_unix_run-mozilla.sh
--- /usr/ports/www/firefox15/files/patch-build_unix_run-mozilla.sh Thu Feb 2 05:16:54 2006
+++ www/firefox15/files/patch-build_unix_run-mozilla.sh
@@ -1,6 +1,6 @@
---- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003
-+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004
-@@ -355,7 +355,7 @@
+--- build/unix/run-mozilla.sh.orig Fri Sep 30 22:36:47 2005
++++ build/unix/run-mozilla.sh
+@@ -328,7 +328,7 @@
fi
##
## Set LD_LIBRARY_PATH
@@ -9,7 +9,7 @@
if [ -n "$LD_LIBRARYN32_PATH" ]
then
LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
-@@ -442,6 +442,9 @@
+@@ -415,6 +415,9 @@
#
export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
diff -ruN /usr/ports/www/firefox15/files/patch-config-mkdepend-imakemdep.h www/firefox15/files/patch-config-mkdepend-imakemdep.h
--- /usr/ports/www/firefox15/files/patch-config-mkdepend-imakemdep.h Thu Feb 2 05:16:54 2006
+++ www/firefox15/files/patch-config-mkdepend-imakemdep.h
@@ -1,6 +1,7 @@
---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998
-+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003
-@@ -278,4 +278,7 @@
+--- config/mkdepend/imakemdep.h.orig Tue Apr 20 14:38:14 2004
++++ config/mkdepend/imakemdep.h
+@@ -440,6 +440,9 @@
+ # ifdef __i386__
"-D__i386__",
# endif
+# if defined(__amd64__) || defined(__x86_64__)
@@ -8,3 +9,4 @@
+# endif
# ifdef __GNUC__
"-traditional",
+ # endif
diff -ruN /usr/ports/www/firefox15/files/patch-config-rules.mk www/firefox15/files/patch-config-rules.mk
--- /usr/ports/www/firefox15/files/patch-config-rules.mk Wed Nov 1 12:57:32 2006
+++ www/firefox15/files/patch-config-rules.mk
@@ -1,6 +1,6 @@
---- config/rules.mk.orig Tue Aug 26 13:28:47 2003
-+++ config/rules.mk Sun Feb 1 15:11:41 2004
-@@ -444,7 +444,11 @@
+--- config/rules.mk.orig Fri Apr 28 12:25:51 2006
++++ config/rules.mk
+@@ -443,7 +443,11 @@
ifeq ($(OS_ARCH),FreeBSD)
ifdef IS_COMPONENT
diff -ruN /usr/ports/www/firefox15/files/patch-config_autoconf.mk.in www/firefox15/files/patch-config_autoconf.mk.in
--- /usr/ports/www/firefox15/files/patch-config_autoconf.mk.in Tue Nov 29 13:12:28 2005
+++ www/firefox15/files/patch-config_autoconf.mk.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- config/autoconf.mk.in.orig Fri Apr 21 13:50:30 2006
++++ config/autoconf.mk.in
+@@ -56,13 +56,13 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
diff -ruN /usr/ports/www/firefox15/files/patch-config_mkdepend_Makefile.in www/firefox15/files/patch-config_mkdepend_Makefile.in
--- /usr/ports/www/firefox15/files/patch-config_mkdepend_Makefile.in Tue Nov 29 13:12:28 2005
+++ www/firefox15/files/patch-config_mkdepend_Makefile.in
@@ -1,6 +1,6 @@
---- config/mkdepend/Makefile.in.orig Sun Dec 12 07:36:57 2004
-+++ config/mkdepend/Makefile.in Sun Dec 12 07:37:55 2004
-@@ -57,6 +57,7 @@
+--- config/mkdepend/Makefile.in.orig Sun Apr 18 07:17:26 2004
++++ config/mkdepend/Makefile.in
+@@ -73,6 +73,7 @@
include $(topsrcdir)/config/rules.mk
HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
diff -ruN /usr/ports/www/firefox15/files/patch-configure www/firefox15/files/patch-configure
--- /usr/ports/www/firefox15/files/patch-configure Wed Nov 1 12:57:32 2006
+++ www/firefox15/files/patch-configure
@@ -1,15 +1,15 @@
---- configure.orig Tue Oct 4 02:01:48 2005
-+++ configure Wed Nov 23 11:07:17 2005
-@@ -10016,7 +10016,7 @@
+--- configure.orig Wed Aug 23 09:40:33 2006
++++ configure
+@@ -10115,7 +10115,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 10022 "configure"
+ #line 10121 "configure"
#include "confdefs.h"
-@@ -10047,7 +10047,7 @@
+@@ -10146,7 +10146,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
-@@ -10057,7 +10057,7 @@
+@@ -10156,7 +10156,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 10063 "configure"
+ #line 10162 "configure"
#include "confdefs.h"
-@@ -10088,7 +10088,7 @@
+@@ -10187,7 +10187,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
diff -ruN /usr/ports/www/firefox15/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp www/firefox15/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
--- /usr/ports/www/firefox15/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp Thu Feb 2 05:16:54 2006
+++ www/firefox15/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
@@ -1,6 +1,6 @@
---- 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
-@@ -323,11 +323,11 @@
+--- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig Tue Jun 28 19:03:59 2005
++++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp
+@@ -318,11 +318,11 @@
prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly",
&mStartLinksOnlyPref);
@@ -15,7 +15,7 @@
prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL",
getter_Copies(soundStr));
}
-@@ -758,7 +758,7 @@
+@@ -757,7 +757,7 @@
}
else {
// No find string to backspace in!
@@ -24,7 +24,7 @@
// This flag should be on only if the last key was a backspace.
// It keeps us from accidentally hitting backspace too many times and
// going back in history when we really just wanted to clear
-@@ -1012,7 +1012,9 @@
+@@ -1022,7 +1022,9 @@
// Error sound (don't fire when backspace is pressed, they're
// trying to correct the mistake!)
@@ -35,7 +35,7 @@
// Remove bad character from buffer, so we can continue typing from
// last matched character
-@@ -1059,7 +1061,7 @@
+@@ -1069,7 +1071,7 @@
void
nsTypeAheadFind::PlayNotFoundSound()
{
diff -ruN /usr/ports/www/firefox15/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h www/firefox15/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
--- /usr/ports/www/firefox15/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h Thu Feb 2 05:16:54 2006
+++ www/firefox15/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
@@ -1,6 +1,6 @@
---- 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
-@@ -194,6 +194,9 @@
+--- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig Mon Jun 27 18:02:03 2005
++++ extensions/typeaheadfind/src/nsTypeAheadFind.h
+@@ -197,6 +197,9 @@
nsCString mNotFoundSoundURL;
diff -ruN /usr/ports/www/firefox15/files/patch-libm www/firefox15/files/patch-libm
--- /usr/ports/www/firefox15/files/patch-libm Wed Nov 1 12:57:32 2006
+++ www/firefox15/files/patch-libm
@@ -1,12 +1,15 @@
---- js/src/Makefile.in Thu Aug 4 22:26:52 2005
-+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005
-@@ -148,5 +148,4 @@
+--- js/src/Makefile.in.orig Mon Jun 12 14:36:07 2006
++++ js/src/Makefile.in
+@@ -149,7 +149,6 @@
+ EXPORTS += jscpucfg.h
endif
-FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
JSMATH_PRELINK = jsmathtemp.o
JS_SAFE_ARENA = 1
-@@ -320,7 +319,4 @@
+
+@@ -325,9 +324,6 @@
+ $(LD) $(DASH_R) -o $@ $(JSMATH_PRELINK) $(FDLIBM_LIBRARY)
endif
@$(RM) -f $(JSMATH_PRELINK)
-else
@@ -14,9 +17,11 @@
-jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
endif
---- js/Makefile.in Sun Mar 23 14:36:00 2003
-+++ js/Makefile.in Thu Aug 4 23:08:06 2005
-@@ -46,5 +46,5 @@
+ # An AIX Optimization bug causes PR_dtoa() & JS_dtoa to produce wrong result.
+--- js/Makefile.in.orig Sun Apr 18 14:57:30 2004
++++ js/Makefile.in
+@@ -61,6 +61,6 @@
+ # See top-level makefile for details
#
-DIRS = src/fdlibm src
diff -ruN /usr/ports/www/firefox15/files/patch-modules_libpref_src_init_all.js www/firefox15/files/patch-modules_libpref_src_init_all.js
--- /usr/ports/www/firefox15/files/patch-modules_libpref_src_init_all.js Mon May 1 15:47:05 2006
+++ www/firefox15/files/patch-modules_libpref_src_init_all.js
@@ -1,6 +1,6 @@
---- modules/libpref/src/init/all.js.orig Mon Feb 13 22:58:15 2006
-+++ modules/libpref/src/init/all.js Tue May 2 00:32:55 2006
-@@ -1883,33 +1883,33 @@
+--- modules/libpref/src/init/all.js.orig Fri Aug 18 15:12:03 2006
++++ modules/libpref/src/init/all.js
+@@ -1885,33 +1885,33 @@
// th
diff -ruN /usr/ports/www/firefox15/files/patch-security-coreconf-FreeBSD.mk www/firefox15/files/patch-security-coreconf-FreeBSD.mk
--- /usr/ports/www/firefox15/files/patch-security-coreconf-FreeBSD.mk Wed Nov 1 12:57:32 2006
+++ www/firefox15/files/patch-security-coreconf-FreeBSD.mk
@@ -1,6 +1,6 @@
---- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003
-+++ security/coreconf/FreeBSD.mk Sun Nov 21 22:59:49 2004
-@@ -43,8 +43,12 @@
+--- security/coreconf/FreeBSD.mk.orig Fri Jan 20 18:36:11 2006
++++ security/coreconf/FreeBSD.mk
+@@ -45,8 +45,12 @@
ifeq ($(OS_TEST),alpha)
CPU_ARCH = alpha
else
@@ -13,7 +13,7 @@
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-@@ -71,7 +75,11 @@
+@@ -73,7 +77,11 @@
DLL_SUFFIX = so.1.0
endif
@@ -24,5 +24,5 @@
+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@
+endif
ifdef MAPFILE
- # Add LD options to restrict exported symbols to those in the map file
+ MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
diff -ruN /usr/ports/www/firefox15/files/patch-sysnss www/firefox15/files/patch-sysnss
--- /usr/ports/www/firefox15/files/patch-sysnss Sat Feb 24 16:13:05 2007
+++ www/firefox15/files/patch-sysnss
@@ -1,30 +1,37 @@
---- Makefile.in Tue Sep 14 16:59:40 2004
-+++ Makefile.in Tue Aug 2 08:26:55 2005
-@@ -102,6 +102,4 @@
+--- Makefile.in.orig Tue Dec 19 14:07:36 2006
++++ Makefile.in
+@@ -110,8 +110,6 @@
+ #
# tier 1 - 3rd party individual libraries
#
-tier_1_dirs += dbm
-
ifndef MOZ_NATIVE_JPEG
tier_1_dirs += jpeg
---- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004
-+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005
-@@ -117,5 +117,5 @@
+ endif
+--- security/manager/ssl/src/Makefile.in.orig Tue Aug 2 22:24:18 2005
++++ security/manager/ssl/src/Makefile.in
+@@ -123,7 +123,7 @@
+
# Use local includes because they are inserted before INCLUDES
# so that Mozilla's nss.h is used, not glibc's
-LOCAL_INCLUDES += -I$(DIST)/public/nss \
+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
$(NULL)
---- config/config.mk Tue Oct 12 00:11:11 2004
-+++ config/config.mk Tue Aug 2 09:19:18 2005
-@@ -170,5 +170,4 @@
+ EXTRA_DSO_LDOPTS += \
+--- config/config.mk.orig Thu Apr 6 09:28:13 2006
++++ config/config.mk
+@@ -144,7 +144,6 @@
+
NSS_LIBS = \
$(LIBS_DIR) \
- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-lsmime3 \
-lssl3 \
-@@ -189,11 +188,5 @@
+ -lnss3 \
+@@ -163,13 +162,7 @@
+ endif
endif
-NSS_DEP_LIBS = \
@@ -37,9 +44,11 @@
+NSS_DEP_LIBS =
MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
---- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004
-+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005
-@@ -88,4 +88,8 @@
+ MOZ_REGISTRY_LIBS = $(DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)
+--- security/manager/ssl/src/nsNSSComponent.cpp.orig Thu Aug 25 23:41:50 2005
++++ security/manager/ssl/src/nsNSSComponent.cpp
+@@ -119,6 +119,10 @@
+ #include "p12plcy.h"
}
+#include <sys/types.h>
@@ -48,20 +57,26 @@
+
#ifdef PR_LOGGING
PRLogModuleInfo* gPIPNSSLog = nsnull;
-@@ -406,4 +410,5 @@
+ #endif
+@@ -689,6 +693,7 @@
+
const char *possible_ckbi_locations[] = {
NS_GRE_DIR,
+ NS_UNIX_LIB_DIR,
NS_XPCOM_CURRENT_PROCESS_DIR
};
-@@ -419,5 +424,5 @@
+
+@@ -702,7 +707,7 @@
+ continue;
}
- char *fullModuleName = nsnull;
+ char *fullModuleName;
#ifdef XP_MAC
nsCAutoString nativePath;
-@@ -431,4 +436,12 @@
+ mozFile->AppendNative(NS_LITERAL_CSTRING("Essential Files"));
+@@ -714,6 +719,14 @@
+ mozFile->GetNativePath(processDir);
fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
#endif
+ if (fullModuleName == nsnull)
@@ -74,9 +89,10 @@
+ }
/* If a module exists with the same name, delete it. */
NS_ConvertUCS2toUTF8 modNameUTF8(modName);
---- security/manager/Makefile.in.orig Tue Dec 19 17:07:37 2006
-+++ security/manager/Makefile.in Sat Feb 24 17:28:01 2007
-@@ -52,21 +52,12 @@ PACKAGE_VARS += \
+ int modType;
+--- security/manager/Makefile.in.orig Tue Dec 19 14:07:37 2006
++++ security/manager/Makefile.in
+@@ -52,21 +52,12 @@
SSL3_LIB \
SOFTOKEN3_LIB \
SOFTOKEN3_CHK \
@@ -98,7 +114,7 @@
# Default
HAVE_FREEBL_LIBS = 1
-@@ -190,11 +181,6 @@ export:: .nss.cleaned
+@@ -190,11 +181,6 @@
.nss.cleaned: .nss.checkout
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
@@ -110,7 +126,7 @@
touch $@
.nss.checkout:
-@@ -212,89 +198,6 @@ libs::
+@@ -212,89 +198,6 @@
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
ifeq ($(OS_ARCH),WINNT)
cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
@@ -200,7 +216,7 @@
endif
$(MAKE) -C boot $@
$(MAKE) -C ssl $@
-@@ -304,42 +207,6 @@ ifdef MOZ_XUL
+@@ -304,42 +207,6 @@
endif
install::
@@ -243,7 +259,7 @@
$(MAKE) -C boot $@
$(MAKE) -C ssl $@
$(MAKE) -C locales $@
-@@ -355,11 +222,6 @@ ifdef MOZ_XUL
+@@ -355,11 +222,6 @@
$(MAKE) -C pki $@
endif
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
diff -ruN /usr/ports/www/firefox15/files/patch-toolkit_xre_nsXREDirProvider.cpp www/firefox15/files/patch-toolkit_xre_nsXREDirProvider.cpp
--- /usr/ports/www/firefox15/files/patch-toolkit_xre_nsXREDirProvider.cpp Sun Feb 19 14:23:03 2006
+++ www/firefox15/files/patch-toolkit_xre_nsXREDirProvider.cpp
@@ -1,6 +1,6 @@
---- toolkit/xre/nsXREDirProvider.cpp.orig Tue Oct 4 11:46:26 2005
-+++ toolkit/xre/nsXREDirProvider.cpp Sun Feb 5 23:54:31 2006
-@@ -820,6 +820,7 @@
+--- toolkit/xre/nsXREDirProvider.cpp.orig Sat Jan 27 15:13:33 2007
++++ toolkit/xre/nsXREDirProvider.cpp
+@@ -836,6 +836,7 @@
char* appNameFolder = nsnull;
char profileFolderName[MAXPATHLEN] = ".";
@@ -8,7 +8,7 @@
// Offset 1 for the outermost folder to make it hidden (i.e. using the ".")
char* writing = profileFolderName + 1;
-@@ -829,7 +830,6 @@
+@@ -845,7 +846,6 @@
rv = localDir->AppendNative(nsDependentCString(profileFolderName));
NS_ENSURE_SUCCESS(rv, rv);
@@ -16,4 +16,3 @@
GetProfileFolderName(temp, gAppData->name);
appNameFolder = temp;
}
-
diff -ruN /usr/ports/www/firefox15/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in www/firefox15/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
--- /usr/ports/www/firefox15/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in Thu Feb 2 05:16:54 2006
+++ www/firefox15/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
@@ -1,6 +1,6 @@
---- 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
-@@ -49,6 +49,9 @@
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Tue Nov 14 13:10:24 2006
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
+@@ -66,6 +66,9 @@
ifeq (86,$(findstring 86,$(OS_TEST)))
CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
endif
@@ -10,7 +10,7 @@
endif
#
# New code for Linux, et. al., with gcc
-@@ -60,7 +63,7 @@
+@@ -82,7 +85,7 @@
endif
endif
# IA64 Linux
@@ -19,7 +19,7 @@
ifneq (,$(findstring ia64,$(OS_TEST)))
CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
-@@ -106,9 +109,15 @@
+@@ -129,9 +132,15 @@
ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
endif
#
@@ -36,7 +36,7 @@
CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
endif
#
-@@ -294,6 +303,15 @@
+@@ -322,6 +331,15 @@
ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703231801.l2NI1kbx026226>