summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2015-10-07 23:21:22 +0000
committerjoerg <joerg@pkgsrc.org>2015-10-07 23:21:22 +0000
commite5857b22ea8e7b24ab7175f50eeb1a9d8eb90bf6 (patch)
tree36f772378321e32c6033032470c7d23da53305d4 /www
parent649e461fa537dce9f8d75ec07d44aad1486d384a (diff)
downloadpkgsrc-e5857b22ea8e7b24ab7175f50eeb1a9d8eb90bf6.tar.gz
Drop using that conflicts with the declaration itself.
Diffstat (limited to 'www')
-rw-r--r--www/firefox/distinfo3
-rw-r--r--www/firefox/patches/patch-dom_base_DOMRequest.cpp12
2 files changed, 14 insertions, 1 deletions
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index affb647b912..32c25b5d95c 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.217 2015/10/05 15:53:23 ryoon Exp $
+$NetBSD: distinfo,v 1.218 2015/10/07 23:21:22 joerg Exp $
SHA1 (firefox-41.0.1.source.tar.xz) = 4f6bf34b7b286e033f401d7d4112ec6310577aae
RMD160 (firefox-41.0.1.source.tar.xz) = 527ab5c4f55f654b2570163a0b4dcc620e77bee8
@@ -23,6 +23,7 @@ SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
SHA1 (patch-config_system-headers) = da0f1754eebac0d4a8234345b8d201e0e8fe774f
SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
+SHA1 (patch-dom_base_DOMRequest.cpp) = b934991e8ad03c3785e4c7d197b42f697571ec09
SHA1 (patch-dom_base_moz.build) = 8b59c33958b7037c4c051742c64f1455096ced46
SHA1 (patch-dom_media_AudioStream.h) = 96b5a1a2b1c930cfcfa77a125d47b6eb93fac1c6
SHA1 (patch-dom_media_gstreamer_GStreamerAllocator.cpp) = 4685a646a76282619d7c42fac43500e0065f067d
diff --git a/www/firefox/patches/patch-dom_base_DOMRequest.cpp b/www/firefox/patches/patch-dom_base_DOMRequest.cpp
new file mode 100644
index 00000000000..717bf185626
--- /dev/null
+++ b/www/firefox/patches/patch-dom_base_DOMRequest.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-dom_base_DOMRequest.cpp,v 1.1 2015/10/07 23:21:22 joerg Exp $
+
+--- dom/base/DOMRequest.cpp.orig 2015-09-17 22:13:30.000000000 +0000
++++ dom/base/DOMRequest.cpp
+@@ -19,7 +19,6 @@ using mozilla::dom::DOMError;
+ using mozilla::dom::DOMRequest;
+ using mozilla::dom::DOMRequestService;
+ using mozilla::dom::DOMCursor;
+-using mozilla::dom::Promise;
+ using mozilla::dom::AutoJSAPI;
+
+ DOMRequest::DOMRequest(nsPIDOMWindow* aWindow)