Changeset 6315


Ignore:
Timestamp:
Jan 13, 2012, 12:25:04 PM (7 years ago)
Author:
pedroabranches
Message:

Update webkit

Location:
packages/cm17/webkit
Files:
4 added
3 edited

Legend:

Unmodified
Added
Removed
  • packages/cm17/webkit/cmiffy/cmiffy

    r6314 r6315  
    5454
    5555# debdiff old.dsc new.dsc > cmiffy/debdiff.patch
    56 debdiff_file="webkitgtk_cookies.patch"
     56debdiff_file="debdiff.patch"
    5757
    5858#Changelog stuff
  • packages/cm17/webkit/cmiffy/debdiff.patch

    r6314 r6315  
    1 diff -Naur webkit-1.3.13.orig/Source/WebKit/gtk/webkit/webkitnetworkresponse.cpp webkit-1.3.13.change2/Source/WebKit/gtk/webkit/webkitnetworkresponse.cpp
    2 --- webkit-1.3.13.orig/Source/WebKit/gtk/webkit/webkitnetworkresponse.cpp       2011-03-21 18:42:08.000000000 +0000
    3 +++ webkit-1.3.13.change2/Source/WebKit/gtk/webkit/webkitnetworkresponse.cpp    2011-11-11 16:37:22.172703657 +0000
    4 @@ -44,6 +44,7 @@
    5  struct _WebKitNetworkResponsePrivate {
    6      gchar* uri;
    7      SoupMessage* message;
    8 +    gchar* cookie;
    9  };
    10  
    11  #define WEBKIT_NETWORK_RESPONSE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_NETWORK_RESPONSE, WebKitNetworkResponsePrivate))
    12 @@ -53,6 +54,7 @@
    13  
    14      PROP_URI,
    15      PROP_MESSAGE,
    16 +    PROP_COOKIE,
    17  };
    18  
    19  static void webkit_network_response_dispose(GObject* object)
    20 @@ -89,6 +91,9 @@
    21      case PROP_MESSAGE:
    22          g_value_set_object(value, webkit_network_response_get_message(response));
    23          break;
    24 +    case PROP_COOKIE:
    25 +        g_value_set_string(value, webkit_network_response_get_cookie(response));
    26 +        break;
    27      default:
    28          G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyID, pspec);
    29      }
    30 @@ -150,6 +155,21 @@
    31                                                          SOUP_TYPE_MESSAGE,
    32                                                          (GParamFlags)(WEBKIT_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY)));
    33  
    34 +    /**
    35 +     * WebKitNetworkResponse:cookie:
    36 +     *
    37 +     * The "Set-Cookie" header value from SoupMessage response.
    38 +     *
    39 +     * Author: Pedro Abranches <pedro.abranches@caixamagica.pt>
    40 +     */
    41 +    g_object_class_install_property(objectClass, PROP_COOKIE,
    42 +                                    g_param_spec_string("cookie",
    43 +                                                        _("Cookie"),
    44 +                                                        _("The Set-Cookie header value from the response."),
    45 +                                                        NULL,
    46 +                                                        (GParamFlags)(WEBKIT_PARAM_READWRITE)));
    47 +
    48 +
    49      g_type_class_add_private(responseClass, sizeof(WebKitNetworkResponsePrivate));
    50  }
    51  
    52 @@ -230,6 +250,16 @@
    53      return priv->uri;
    54  }
    55  
    56 +const gchar* webkit_network_response_get_cookie(WebKitNetworkResponse* response)
    57 +{
    58 +        SoupMessage *msg = webkit_network_response_get_message(response);
    59 +       if (msg == NULL)
    60 +               return NULL;
    61 +       SoupMessageHeaders *headers = msg->response_headers;
    62 +        const gchar *cookie = (const gchar*) soup_message_headers_get(headers, "Set-Cookie" );
    63 +       return cookie;
    64 +}
    65 +
    66  /**
    67   * webkit_network_response_get_message:
    68   * @response: a #WebKitNetworkResponse
    69 diff -Naur webkit-1.3.13.orig/Source/WebKit/gtk/webkit/webkitnetworkresponse.h webkit-1.3.13.change2/Source/WebKit/gtk/webkit/webkitnetworkresponse.h
    70 --- webkit-1.3.13.orig/Source/WebKit/gtk/webkit/webkitnetworkresponse.h 2011-03-21 18:42:08.000000000 +0000
    71 +++ webkit-1.3.13.change2/Source/WebKit/gtk/webkit/webkitnetworkresponse.h      2011-11-11 16:31:06.904717149 +0000
    72 @@ -69,6 +69,9 @@
    73  WEBKIT_API SoupMessage *
    74  webkit_network_response_get_message(WebKitNetworkResponse* response);
    75  
    76 +WEBKIT_API G_CONST_RETURN gchar *
    77 +webkit_network_response_get_cookie  (WebKitNetworkResponse *response);
    78 +
    79  G_END_DECLS
    80  
    81  #endif
    82 diff -Naur webkit-1.4.3_ubuntu/debian/libwebkitgtk-1.0-0.symbols webkit-1.4.3_cm//debian/libwebkitgtk-1.0-0.symbols
    83 --- webkit-1.4.3_ubuntu/debian/libwebkitgtk-1.0-0.symbols 19:11:29.000000000 +0000
    84 +++ webkit-1.4.3_cm/debian/libwebkitgtk-1.0-0.symbols 11:45:56.000000000 +0000
     1diff -Naur webkit-1.4.3.orig//debian/libwebkitgtk-1.0-0.symbols webkit-1.4.3/debian/libwebkitgtk-1.0-0.symbols
     2--- webkit-1.4.3.orig//debian/libwebkitgtk-1.0-0.symbols        2011-12-14 19:11:29.000000000 +0000
     3+++ webkit-1.4.3/debian/libwebkitgtk-1.0-0.symbols      2012-01-13 12:16:59.925320305 +0000
    854@@ -2006,3 +2006,4 @@
    865  webkit_web_window_features_equal@Base 1.3.10
     
    887  webkit_web_window_features_new@Base 1.3.10
    898+ webkit_network_response_get_cookie@Base 1.4.3-0xcm3
    90 diff -Naur webkit-1.4.3_ubuntu/debian/libwebkitgtk-3.0-0.symbols webkit-1.4.3_cm//debian/libwebkitgtk-3.0-0.symbols
    91 --- webkit-1.4.3_ubuntu/debian/libwebkitgtk-3.0-0.symbols 19:11:29.000000000 +0000
    92 +++ webkit-1.4.3_cm/debian/libwebkitgtk-3.0-0.symbols 11:45:56.000000000 +0000
     9diff -Naur webkit-1.4.3.orig//debian/libwebkitgtk-3.0-0.symbols webkit-1.4.3/debian/libwebkitgtk-3.0-0.symbols
     10--- webkit-1.4.3.orig//debian/libwebkitgtk-3.0-0.symbols        2011-12-14 19:11:29.000000000 +0000
     11+++ webkit-1.4.3/debian/libwebkitgtk-3.0-0.symbols      2012-01-13 12:17:08.275320301 +0000
    9312@@ -2006,3 +2006,4 @@
    9413  webkit_web_window_features_equal@Base 1.3.10
     
    9615  webkit_web_window_features_new@Base 1.3.10
    9716+ webkit_network_response_get_cookie@Base 1.4.3-0xcm3
    98 
     17diff -Naur webkit-1.4.3.orig//debian/patches/12_get_cookies.patch webkit-1.4.3/debian/patches/12_get_cookies.patch
     18--- webkit-1.4.3.orig//debian/patches/12_get_cookies.patch      1970-01-01 01:00:00.000000000 +0100
     19+++ webkit-1.4.3/debian/patches/12_get_cookies.patch    2012-01-13 12:15:47.735320338 +0000
     20@@ -0,0 +1,86 @@
     21+## Description: add some description
     22+## Origin/Author: add some origin or author
     23+## Bug: bug URL
     24+Index: webkit-1.4.3/Source/WebKit/gtk/webkit/webkitnetworkresponse.cpp
     25+===================================================================
     26+--- webkit-1.4.3.orig/Source/WebKit/gtk/webkit/webkitnetworkresponse.cpp       2012-01-13 12:15:41.215320340 +0000
     27++++ webkit-1.4.3/Source/WebKit/gtk/webkit/webkitnetworkresponse.cpp    2012-01-13 12:15:37.475320341 +0000
     28+@@ -44,6 +44,7 @@
     29+ struct _WebKitNetworkResponsePrivate {
     30+     gchar* uri;
     31+     SoupMessage* message;
     32++    gchar* cookie;
     33+ };
     34+
     35+ #define WEBKIT_NETWORK_RESPONSE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_NETWORK_RESPONSE, WebKitNetworkResponsePrivate))
     36+@@ -53,6 +54,7 @@
     37+
     38+     PROP_URI,
     39+     PROP_MESSAGE,
     40++    PROP_COOKIE,
     41+ };
     42+
     43+ static void webkit_network_response_dispose(GObject* object)
     44+@@ -89,6 +91,9 @@
     45+     case PROP_MESSAGE:
     46+         g_value_set_object(value, webkit_network_response_get_message(response));
     47+         break;
     48++    case PROP_COOKIE:
     49++        g_value_set_string(value, webkit_network_response_get_cookie(response));
     50++        break;
     51+     default:
     52+         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyID, pspec);
     53+     }
     54+@@ -150,6 +155,21 @@
     55+                                                         SOUP_TYPE_MESSAGE,
     56+                                                         (GParamFlags)(WEBKIT_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY)));
     57+
     58++    /**
     59++     * WebKitNetworkResponse:cookie:
     60++     *
     61++     * The "Set-Cookie" header value from SoupMessage response.
     62++     *
     63++     * Author: Pedro Abranches <pedro.abranches@caixamagica.pt>
     64++     */
     65++    g_object_class_install_property(objectClass, PROP_COOKIE,
     66++                                    g_param_spec_string("cookie",
     67++                                                        _("Cookie"),
     68++                                                        _("The Set-Cookie header value from the response."),
     69++                                                        NULL,
     70++                                                        (GParamFlags)(WEBKIT_PARAM_READWRITE)));
     71++
     72++
     73+     g_type_class_add_private(responseClass, sizeof(WebKitNetworkResponsePrivate));
     74+ }
     75+
     76+@@ -230,6 +250,16 @@
     77+     return priv->uri;
     78+ }
     79+
     80++const gchar* webkit_network_response_get_cookie(WebKitNetworkResponse* response)
     81++{
     82++        SoupMessage *msg = webkit_network_response_get_message(response);
     83++      if (msg == NULL)
     84++              return NULL;
     85++      SoupMessageHeaders *headers = msg->response_headers;
     86++        const gchar *cookie = (const gchar*) soup_message_headers_get(headers, "Set-Cookie" );
     87++      return cookie;
     88++}
     89++
     90+ /**
     91+  * webkit_network_response_get_message:
     92+  * @response: a #WebKitNetworkResponse
     93+Index: webkit-1.4.3/Source/WebKit/gtk/webkit/webkitnetworkresponse.h
     94+===================================================================
     95+--- webkit-1.4.3.orig/Source/WebKit/gtk/webkit/webkitnetworkresponse.h 2012-01-13 12:15:41.295320340 +0000
     96++++ webkit-1.4.3/Source/WebKit/gtk/webkit/webkitnetworkresponse.h      2012-01-13 12:15:37.475320341 +0000
     97+@@ -69,6 +69,9 @@
     98+ WEBKIT_API SoupMessage *
     99+ webkit_network_response_get_message(WebKitNetworkResponse* response);
     100+
     101++WEBKIT_API G_CONST_RETURN gchar *
     102++webkit_network_response_get_cookie  (WebKitNetworkResponse *response);
     103++
     104+ G_END_DECLS
     105+
     106+ #endif
     107diff -Naur webkit-1.4.3.orig//debian/patches/series webkit-1.4.3/debian/patches/series
     108--- webkit-1.4.3.orig//debian/patches/series    2011-12-14 19:13:40.000000000 +0000
     109+++ webkit-1.4.3/debian/patches/series  2012-01-13 12:14:47.925320364 +0000
     110@@ -1,3 +1,4 @@
     111 03_g_const_return.patch
     112 10_cherrypick_r95940.patch
     113 11_fix_doc_path.patch
     114+12_get_cookies.patch
  • packages/cm17/webkit/repo

    r6314 r6315  
     1src-main-finisterra_updates_testing
     2manual
Note: See TracChangeset for help on using the changeset viewer.