Update to 6.0 - patch fix
This commit is contained in:
Martin Stransky
parent
7f40f3bcf8
commit
2272710ef8
1 changed files with 27 additions and 18 deletions
|
|
@ -1,6 +1,6 @@
|
|||
diff -up xulrunner-6.0/mozilla-release/xpcom/glue/nsGREGlue.cpp.xulstub xulrunner-6.0/mozilla-release/xpcom/glue/nsGREGlue.cpp
|
||||
--- xulrunner-6.0/mozilla-release/xpcom/glue/nsGREGlue.cpp.xulstub 2011-08-16 09:57:54.550206534 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xpcom/glue/nsGREGlue.cpp 2011-08-16 09:57:54.550206534 +0200
|
||||
--- xulrunner-6.0/mozilla-release/xpcom/glue/nsGREGlue.cpp.xulstub 2011-08-16 10:24:27.012660389 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xpcom/glue/nsGREGlue.cpp 2011-08-16 10:24:27.012660389 +0200
|
||||
@@ -0,0 +1,760 @@
|
||||
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
+/* ***** BEGIN LICENSE BLOCK *****
|
||||
|
|
@ -764,7 +764,7 @@ diff -up xulrunner-6.0/mozilla-release/xpcom/glue/nsGREGlue.cpp.xulstub xulrunne
|
|||
+#endif // XP_WIN
|
||||
diff -up xulrunner-6.0/mozilla-release/xpcom/glue/objs.mk.xulstub xulrunner-6.0/mozilla-release/xpcom/glue/objs.mk
|
||||
--- xulrunner-6.0/mozilla-release/xpcom/glue/objs.mk.xulstub 2011-08-11 23:41:32.000000000 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xpcom/glue/objs.mk 2011-08-16 09:57:54.551206436 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xpcom/glue/objs.mk 2011-08-16 10:24:27.013660277 +0200
|
||||
@@ -56,6 +56,7 @@ XPCOM_GLUE_SRC_LCPPSRCS = \
|
||||
nsISupportsImpl.cpp \
|
||||
nsMemory.cpp \
|
||||
|
|
@ -775,7 +775,7 @@ diff -up xulrunner-6.0/mozilla-release/xpcom/glue/objs.mk.xulstub xulrunner-6.0/
|
|||
nsQuickSort.cpp \
|
||||
diff -up xulrunner-6.0/mozilla-release/xpcom/glue/standalone/nsXPCOMGlue.h.xulstub xulrunner-6.0/mozilla-release/xpcom/glue/standalone/nsXPCOMGlue.h
|
||||
--- xulrunner-6.0/mozilla-release/xpcom/glue/standalone/nsXPCOMGlue.h.xulstub 2011-08-11 23:41:32.000000000 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xpcom/glue/standalone/nsXPCOMGlue.h 2011-08-16 09:57:54.553206240 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xpcom/glue/standalone/nsXPCOMGlue.h 2011-08-16 10:24:27.013660277 +0200
|
||||
@@ -41,6 +41,54 @@
|
||||
|
||||
#include "nscore.h"
|
||||
|
|
@ -833,7 +833,7 @@ diff -up xulrunner-6.0/mozilla-release/xpcom/glue/standalone/nsXPCOMGlue.h.xulst
|
|||
/**
|
||||
diff -up xulrunner-6.0/mozilla-release/xulrunner/app/Makefile.in.xulstub xulrunner-6.0/mozilla-release/xulrunner/app/Makefile.in
|
||||
--- xulrunner-6.0/mozilla-release/xulrunner/app/Makefile.in.xulstub 2011-08-11 23:41:33.000000000 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xulrunner/app/Makefile.in 2011-08-16 09:57:54.560205553 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xulrunner/app/Makefile.in 2011-08-16 10:24:27.014660167 +0200
|
||||
@@ -69,6 +69,20 @@ endif
|
||||
|
||||
CPPSRCS = nsXULRunnerApp.cpp
|
||||
|
|
@ -856,8 +856,8 @@ diff -up xulrunner-6.0/mozilla-release/xulrunner/app/Makefile.in.xulstub xulrunn
|
|||
-I$(topsrcdir)/toolkit/xre \
|
||||
-I$(topsrcdir)/toolkit/profile \
|
||||
diff -up xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGRE.h.xulstub xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGRE.h
|
||||
--- xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGRE.h.xulstub 2011-08-16 09:57:54.569204670 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGRE.h 2011-08-16 09:57:54.569204670 +0200
|
||||
--- xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGRE.h.xulstub 2011-08-16 10:24:27.015660057 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGRE.h 2011-08-16 10:24:27.015660057 +0200
|
||||
@@ -0,0 +1,58 @@
|
||||
+/* ***** BEGIN LICENSE BLOCK *****
|
||||
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
|
|
@ -918,8 +918,8 @@ diff -up xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGRE.h.xulstub xul
|
|||
+
|
||||
+#endif // nsRegisterGRE_h__
|
||||
diff -up xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREUnix.cpp.xulstub xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREUnix.cpp
|
||||
--- xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREUnix.cpp.xulstub 2011-08-16 09:57:54.577203884 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREUnix.cpp 2011-08-16 09:57:54.577203884 +0200
|
||||
--- xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREUnix.cpp.xulstub 2011-08-16 10:24:27.016659944 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREUnix.cpp 2011-08-16 10:24:27.016659944 +0200
|
||||
@@ -0,0 +1,272 @@
|
||||
+/* ***** BEGIN LICENSE BLOCK *****
|
||||
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
|
|
@ -1194,8 +1194,8 @@ diff -up xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREUnix.cpp.xulst
|
|||
+ PR_Delete(regFile);
|
||||
+}
|
||||
diff -up xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREVoid.cpp.xulstub xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREVoid.cpp
|
||||
--- xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREVoid.cpp.xulstub 2011-08-16 09:57:54.610200648 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREVoid.cpp 2011-08-16 09:57:54.611200550 +0200
|
||||
--- xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREVoid.cpp.xulstub 2011-08-16 10:24:27.017659831 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREVoid.cpp 2011-08-16 10:24:27.017659831 +0200
|
||||
@@ -0,0 +1,57 @@
|
||||
+/* ***** BEGIN LICENSE BLOCK *****
|
||||
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
|
|
@ -1255,8 +1255,8 @@ diff -up xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREVoid.cpp.xulst
|
|||
+ fprintf(stderr, "Registration not implemented on this platform!\n");
|
||||
+}
|
||||
diff -up xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREWin.cpp.xulstub xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREWin.cpp
|
||||
--- xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREWin.cpp.xulstub 2011-08-16 09:57:54.619199765 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREWin.cpp 2011-08-16 09:57:54.619199765 +0200
|
||||
--- xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREWin.cpp.xulstub 2011-08-16 10:24:27.018659716 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREWin.cpp 2011-08-16 10:24:27.018659716 +0200
|
||||
@@ -0,0 +1,288 @@
|
||||
+/* ***** BEGIN LICENSE BLOCK *****
|
||||
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
|
|
@ -1548,7 +1548,7 @@ diff -up xulrunner-6.0/mozilla-release/xulrunner/app/nsRegisterGREWin.cpp.xulstu
|
|||
+}
|
||||
diff -up xulrunner-6.0/mozilla-release/xulrunner/app/nsXULRunnerApp.cpp.xulstub xulrunner-6.0/mozilla-release/xulrunner/app/nsXULRunnerApp.cpp
|
||||
--- xulrunner-6.0/mozilla-release/xulrunner/app/nsXULRunnerApp.cpp.xulstub 2011-08-11 23:41:33.000000000 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xulrunner/app/nsXULRunnerApp.cpp 2011-08-16 09:57:54.627198981 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xulrunner/app/nsXULRunnerApp.cpp 2011-08-16 10:24:27.019659601 +0200
|
||||
@@ -43,6 +43,7 @@
|
||||
|
||||
#include "nsXULAppAPI.h"
|
||||
|
|
@ -1643,8 +1643,8 @@ diff -up xulrunner-6.0/mozilla-release/xulrunner/app/nsXULRunnerApp.cpp.xulstub
|
|||
if (argc != 2) {
|
||||
Usage(argv[0]);
|
||||
diff -up xulrunner-6.0/mozilla-release/xulrunner/installer/Makefile.in.xulstub xulrunner-6.0/mozilla-release/xulrunner/installer/Makefile.in
|
||||
--- xulrunner-6.0/mozilla-release/xulrunner/installer/Makefile.in.xulstub 2011-08-16 09:57:54.406220659 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xulrunner/installer/Makefile.in 2011-08-16 09:57:54.636198098 +0200
|
||||
--- xulrunner-6.0/mozilla-release/xulrunner/installer/Makefile.in.xulstub 2011-08-16 10:24:26.996662200 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xulrunner/installer/Makefile.in 2011-08-16 10:24:27.034657911 +0200
|
||||
@@ -70,6 +70,19 @@ INSTALL_SDK = 1
|
||||
|
||||
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
|
||||
|
|
@ -1665,10 +1665,18 @@ diff -up xulrunner-6.0/mozilla-release/xulrunner/installer/Makefile.in.xulstub x
|
|||
# Add pkg-config files to the install:: target
|
||||
|
||||
pkg_config_files = \
|
||||
@@ -111,6 +124,7 @@ endif
|
||||
-e "s|%includedir%|$(includedir)|" \
|
||||
-e "s|%idldir%|$(idldir)|" \
|
||||
-e "s|%sdkdir%|$(sdkdir)|" \
|
||||
+ -e "s|%libdir%|$(installdir)|" \
|
||||
-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
|
||||
-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
|
||||
-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
|
||||
diff -up xulrunner-6.0/mozilla-release/xulrunner/stub/nsXULStub.cpp.xulstub xulrunner-6.0/mozilla-release/xulrunner/stub/nsXULStub.cpp
|
||||
--- xulrunner-6.0/mozilla-release/xulrunner/stub/nsXULStub.cpp.xulstub 2011-08-11 23:41:33.000000000 +0200
|
||||
+++ xulrunner-6.0/mozilla-release/xulrunner/stub/nsXULStub.cpp 2011-08-16 10:01:16.319912869 +0200
|
||||
@@ -409,9 +409,54 @@ main(int argc, char **argv)
|
||||
+++ xulrunner-6.0/mozilla-release/xulrunner/stub/nsXULStub.cpp 2011-08-16 11:10:02.509742103 +0200
|
||||
@@ -409,9 +409,55 @@ main(int argc, char **argv)
|
||||
}
|
||||
#endif
|
||||
if (!greFound) {
|
||||
|
|
@ -1723,6 +1731,7 @@ diff -up xulrunner-6.0/mozilla-release/xulrunner/stub/nsXULStub.cpp.xulstub xulr
|
|||
+ strncpy(greDir, resolved_greDir, MAXPATHLEN);
|
||||
+ }
|
||||
+#endif
|
||||
+ }
|
||||
}
|
||||
|
||||
#ifdef XP_OS2
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue