cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patching an autogenerated file that is different on different archs doesn't

Browse Source 
really work.  Fix it up with a perl -i substitution instead.
This commit is contained in:
naddy 2010-03-30 18:07:28 +00:00
parent 05f21f5670
commit 39ba528e97
2 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/firefox36/patches/patch-js_src_xpconnect_src_Makefile_in
View File

@ -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<nsIVariant> arg1)\(/$$1 = nsCOMPtr<nsIVariant>(/' dom_quickstubs.cpp
GARBAGE += \
dom_quickstubs.h \

24
www/firefox36/patches/patch-js_src_xpconnect_src_dom_quickstubs_cpp_diff
View File

@ -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<nsIVariant> arg1(already_AddRefed<nsIVariant>(XPCVariant::newVariant(ccx, argv[1])));
++ nsCOMPtr<nsIVariant> arg1 = nsCOMPtr<nsIVariant>(already_AddRefed<nsIVariant>(XPCVariant::newVariant(ccx, argv[1])));
+ if (!arg1)
+ return JS_FALSE;
+ nsresult rv;
+@@ -5305,7 +5305,7 @@
+ return JSVAL_VOID;
+ }
+ XPCReadableJSStringWrapper arg0(_arg0);
+- nsCOMPtr<nsIVariant> arg1(already_AddRefed<nsIVariant>(XPCVariant::newVariant(ccx, _arg1)));
++ nsCOMPtr<nsIVariant> arg1 = nsCOMPtr<nsIVariant>(already_AddRefed<nsIVariant>(XPCVariant::newVariant(ccx, _arg1)));
+ if (!arg1) {
+ js_SetTraceableNativeFailed(cx);
+ return JSVAL_VOID;