Merge lp:~rodrigo-moya/ubuntu/natty/webkit/fix-header into lp:~ubuntu-desktop/webkit/ubuntu

[Rodrigo Moya]

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-06 23:15:03 +0000
+++ debian/changelog	2011-04-19 21:12:33 +0000
@@ -1,3 +1,10 @@
+webkit (1.3.13-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/04_fix_header_for_strict.patch:
+    - Add upstream patch to fix headers for compilation with strict mode
+
+ -- Rodrigo Moya <[e-mail]>  Tue, 19 Apr 2011 16:09:20 +0200
+
 webkit (1.3.13-0ubuntu1) natty; urgency=low
 
   * New upstream release

=== added file 'debian/patches/04_fix_header_for_strict.patch'
--- debian/patches/04_fix_header_for_strict.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/04_fix_header_for_strict.patch	2011-04-19 21:12:33 +0000
@@ -0,0 +1,54 @@
+commit 8dd756f90c0140f620f02164da9e04354a6d0ec9
+Author: [e-mail] <[e-mail]@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date:   Tue Mar 22 14:57:25 2011 +0000
+
+    2011-03-22  Gustavo Noronha Silva  <[e-mail]>
+    
+            Rubber-stamped by Xan Lopez.
+    
+            Applications that include WebKit headers fail to build when using strict warnings
+            because the signature for webkit_application_cache_get_maximum_size is missing a
+            'void' to make it explicit it takes no arguments.
+    
+            * webkit/webkitapplicationcache.h:
+    
+    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@81668 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+diff --git a/Source/WebKit/gtk/ChangeLog b/Source/WebKit/gtk/ChangeLog
+index e6e7b9f..a891543 100644
+--- a/Source/WebKit/gtk/ChangeLog
++++ b/Source/WebKit/gtk/ChangeLog
+@@ -1,3 +1,13 @@
++2011-03-22  Gustavo Noronha Silva  <[e-mail]>
++
++        Rubber-stamped by Xan Lopez.
++
++        Applications that include WebKit headers fail to build when using strict warnings
++        because the signature for webkit_application_cache_get_maximum_size is missing a
++        'void' to make it explicit it takes no arguments.
++
++        * webkit/webkitapplicationcache.h:
++
+ 2011-03-21  Alejandro G. Castro  <[e-mail]>
+ 
+         Reviewed by Martin Robinson.
+diff --git a/Source/WebKit/gtk/webkit/webkitapplicationcache.h b/Source/WebKit/gtk/webkit/webkitapplicationcache.h
+index 93dde44..bb0f867 100644
+--- a/Source/WebKit/gtk/webkit/webkitapplicationcache.h
++++ b/Source/WebKit/gtk/webkit/webkitapplicationcache.h
+@@ -25,13 +25,13 @@
+ G_BEGIN_DECLS
+ 
+ WEBKIT_API unsigned long long
+-webkit_application_cache_get_maximum_size();
++webkit_application_cache_get_maximum_size(void);
+ 
+ WEBKIT_API void
+ webkit_application_cache_set_maximum_size(unsigned long long size);
+ 
+ WEBKIT_API G_CONST_RETURN gchar*
+-webkit_application_cache_get_database_directory_path  (void);
++webkit_application_cache_get_database_directory_path(void);
+ 
+ G_END_DECLS
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-04-06 23:15:03 +0000
+++ debian/patches/series	2011-04-19 21:12:33 +0000
@@ -1,4 +1,4 @@
 01_expose_less_symbols.patch
 02_no_amd64_overcommit.patch
 03_gtk_doc.patch 
-
+04_fix_header_for_strict.patch