From 39ba528e97bb61bb2bbdaa2f81ca07de6510e440 Mon Sep 17 00:00:00 2001 From: naddy Date: Tue, 30 Mar 2010 18:07:28 +0000 Subject: [PATCH] Patching an autogenerated file that is different on different archs doesn't really work. Fix it up with a perl -i substitution instead. --- .../patch-js_src_xpconnect_src_Makefile_in | 8 +++---- ..._src_xpconnect_src_dom_quickstubs_cpp_diff | 24 ------------------- 2 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 www/firefox36/patches/patch-js_src_xpconnect_src_dom_quickstubs_cpp_diff diff --git a/www/firefox36/patches/patch-js_src_xpconnect_src_Makefile_in b/www/firefox36/patches/patch-js_src_xpconnect_src_Makefile_in index 9702d6438d3..90c8eb4a416 100644 --- a/www/firefox36/patches/patch-js_src_xpconnect_src_Makefile_in +++ b/www/firefox36/patches/patch-js_src_xpconnect_src_Makefile_in @@ -1,11 +1,11 @@ -$OpenBSD: patch-js_src_xpconnect_src_Makefile_in,v 1.1.1.1 2010/03/29 20:44:10 naddy Exp $ ---- js/src/xpconnect/src/Makefile.in.orig Wed Jan 6 05:35:19 2010 -+++ js/src/xpconnect/src/Makefile.in Sun Jan 10 17:47:27 2010 +$OpenBSD: patch-js_src_xpconnect_src_Makefile_in,v 1.2 2010/03/30 18:07:28 naddy Exp $ +--- js/src/xpconnect/src/Makefile.in.orig Tue Mar 16 10:55:57 2010 ++++ js/src/xpconnect/src/Makefile.in Tue Mar 30 18:17:58 2010 @@ -223,6 +223,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \ --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \ $(ENABLE_TRACEABLE_FLAGS) \ $(srcdir)/dom_quickstubs.qsconf -+ patch -p0 -d $(srcdir) -i $(srcdir)/dom_quickstubs.cpp.diff ++ perl -pi.bak -e 's/(nsCOMPtr arg1)\(/$$1 = nsCOMPtr(/' dom_quickstubs.cpp GARBAGE += \ dom_quickstubs.h \ diff --git a/www/firefox36/patches/patch-js_src_xpconnect_src_dom_quickstubs_cpp_diff b/www/firefox36/patches/patch-js_src_xpconnect_src_dom_quickstubs_cpp_diff deleted file mode 100644 index c03c92c273a..00000000000 --- a/www/firefox36/patches/patch-js_src_xpconnect_src_dom_quickstubs_cpp_diff +++ /dev/null @@ -1,24 +0,0 @@ -$OpenBSD: patch-js_src_xpconnect_src_dom_quickstubs_cpp_diff,v 1.1.1.1 2010/03/29 20:44:10 naddy Exp $ ---- js/src/xpconnect/src/dom_quickstubs.cpp.diff.orig Thu Jan 21 19:20:07 2010 -+++ js/src/xpconnect/src/dom_quickstubs.cpp.diff Thu Jan 21 19:23:46 2010 -@@ -0,0 +1,20 @@ -+--- dom_quickstubs.cpp.orig Thu Jan 21 17:16:42 2010 -++++ dom_quickstubs.cpp Thu Jan 21 17:21:17 2010 -+@@ -5273,7 +5273,7 @@ -+ xpc_qsDOMString arg0(cx, &argv[0]); -+ if (!arg0.IsValid()) -+ return JS_FALSE; -+- nsCOMPtr arg1(already_AddRefed(XPCVariant::newVariant(ccx, argv[1]))); -++ nsCOMPtr arg1 = nsCOMPtr(already_AddRefed(XPCVariant::newVariant(ccx, argv[1]))); -+ if (!arg1) -+ return JS_FALSE; -+ nsresult rv; -+@@ -5305,7 +5305,7 @@ -+ return JSVAL_VOID; -+ } -+ XPCReadableJSStringWrapper arg0(_arg0); -+- nsCOMPtr arg1(already_AddRefed(XPCVariant::newVariant(ccx, _arg1))); -++ nsCOMPtr arg1 = nsCOMPtr(already_AddRefed(XPCVariant::newVariant(ccx, _arg1))); -+ if (!arg1) { -+ js_SetTraceableNativeFailed(cx); -+ return JSVAL_VOID;