# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1312544285 -7200
# Node ID 8adc6a9b5141d5f0f41a38ca592127d483cf2039
# Parent  64d05874b6f2f2ac551291f549dfa530b8c267fb
bmo#673072 - remove deprecated curl header curl/types.h from Breakpad includes.

diff -r 64d05874b6f2 -r 8adc6a9b5141 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Fri Aug 05 09:08:10 2011 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Fri Aug 05 13:38:05 2011 +0200
@@ -74,6 +74,7 @@
 Patch13:        mozilla-dump_syms-static.patch
 Patch14:        mozilla-sle11.patch
 Patch15:        mozilla-linux3.patch
+Patch16:        mozilla-curl.patch
 # Firefox/browser
 Patch31:        firefox-browser-css.patch
 Patch32:        firefox-cross-desktop.patch
@@ -205,6 +206,7 @@
 %patch14 -p1
 %endif
 %patch15 -p1
+%patch16 -p1
 #
 %patch31 -p1
 %patch32 -p1
diff -r 64d05874b6f2 -r 8adc6a9b5141 MozillaFirefox/mozilla-curl.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-curl.patch	Fri Aug 05 13:38:05 2011 +0200
@@ -0,0 +1,1 @@
+../mozilla-curl.patch
\ No newline at end of file
diff -r 64d05874b6f2 -r 8adc6a9b5141 mozilla-curl.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-curl.patch	Fri Aug 05 13:38:05 2011 +0200
@@ -0,0 +1,89 @@
+# HG changeset patch
+# User Evan Shaw <edsrzf@gmail.com>
+# Parent 891179411e19ab39f95bd7769c0e58db6f22f9e4
+bug 673072 - remove deprecated curl header curl/types.h from Breakpad includes. r=ted
+
+diff --git a/config/system-headers b/config/system-headers
+--- a/config/system-headers
++++ b/config/system-headers
+@@ -199,17 +199,16 @@ crypt.h
+ cstddef
+ cstdio
+ cstdlib
+ cstring
+ ctime
+ ctype.h
+ curl/curl.h
+ curl/easy.h
+-curl/types.h
+ curses.h
+ cxxabi.h
+ DateTimeUtils.h
+ dbus/dbus.h
+ dbus/dbus-glib.h
+ dbus/dbus-glib-lowlevel.h
+ ddeml.h
+ Debug.h
+diff --git a/js/src/config/system-headers b/js/src/config/system-headers
+--- a/js/src/config/system-headers
++++ b/js/src/config/system-headers
+@@ -199,17 +199,16 @@ crypt.h
+ cstddef
+ cstdio
+ cstdlib
+ cstring
+ ctime
+ ctype.h
+ curl/curl.h
+ curl/easy.h
+-curl/types.h
+ curses.h
+ cxxabi.h
+ DateTimeUtils.h
+ dbus/dbus.h
+ dbus/dbus-glib.h
+ dbus/dbus-glib-lowlevel.h
+ ddeml.h
+ Debug.h
+diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
+--- a/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
++++ b/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
+@@ -28,17 +28,16 @@
+ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+ #include "common/linux/http_upload.h"
+ 
+ #include <assert.h>
+ #include <dlfcn.h>
+ #include <curl/curl.h>
+ #include <curl/easy.h>
+-#include <curl/types.h>
+ 
+ namespace {
+ 
+ // Callback to get the response data from server.
+ static size_t WriteCallback(void *ptr, size_t size,
+                             size_t nmemb, void *userp) {
+   if (!userp)
+     return 0;
+diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
+--- a/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
++++ b/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
+@@ -24,17 +24,16 @@
+ // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+ #include <curl/curl.h>
+ #include <curl/easy.h>
+-#include <curl/types.h>
+ #include <dlfcn.h>
+ 
+ #include <iostream>
+ #include <string>
+ 
+ #include "common/linux/libcurl_wrapper.h"
+ 
+ using std::string;
diff -r 64d05874b6f2 -r 8adc6a9b5141 series
--- a/series	Fri Aug 05 09:08:10 2011 +0200
+++ b/series	Fri Aug 05 13:38:05 2011 +0200
@@ -17,6 +17,7 @@
 mozilla-dump_syms-static.patch
 mozilla-sle11.patch
 mozilla-linux3.patch
+mozilla-curl.patch
 
 # Firefox patches
 firefox-browser-css.patch