Externals/netsurf/patches/UNIFIED.patch

   1 diff -ru .orig/netsurf-full-3.0//src/libcss-0.2.0/src/parse/language.c netsurf-full-3.0//src/libcss-0.2.0/src/parse/language.c
   2 --- .orig/netsurf-full-3.0//src/libcss-0.2.0/src/parse/language.c       2013-04-20 02:40:31.000000000 +0800
   3 +++ netsurf-full-3.0//src/libcss-0.2.0/src/parse/language.c     2013-07-01 22:22:45.238691285 +0800
   4 @@ -357,7 +357,7 @@
   5         context_entry entry = { CSS_PARSER_START_ATRULE, NULL };
   6         const css_token *token = NULL;
   7         const css_token *atkeyword = NULL;
   8 -       int32_t ctx = 0;
   9 +       int ctx = 0;
  10         bool match = false;
  11         css_rule *rule;
  12         css_error error;
  13 diff -ru .orig/netsurf-full-3.0//src/libcss-0.2.0/src/parse/parse.c netsurf-full-3.0//src/libcss-0.2.0/src/parse/parse.c
  14 --- .orig/netsurf-full-3.0//src/libcss-0.2.0/src/parse/parse.c  2013-04-20 02:40:31.000000000 +0800
  15 +++ netsurf-full-3.0//src/libcss-0.2.0/src/parse/parse.c        2013-07-01 22:22:45.238691285 +0800
  16 @@ -2597,7 +2597,7 @@
  17   */
  18  void unref_interned_strings_in_tokens(css_parser *parser)
  19  {
  20 -        int32_t ctx = 0;
  21 +        int ctx = 0;
  22          const css_token *tok;
  23
  24          while ((tok = parserutils_vector_iterate(
  25 diff -ru .orig/netsurf-full-3.0//src/libcss-0.2.0/src/parse/properties/utils.c netsurf-full-3.0//src/libcss-0.2.0/src/parse/properties/utils.c
  26 --- .orig/netsurf-full-3.0//src/libcss-0.2.0/src/parse/properties/utils.c       2013-04-20 02:40:31.000000000 +0800
  27 +++ netsurf-full-3.0//src/libcss-0.2.0/src/parse/properties/utils.c     2013-07-01 22:22:45.242699089 +0800
  28 @@ -993,7 +993,7 @@
  29   * \return CSS_OK      on success,
  30   *         CSS_INVALID on encountering an unknown keyword
  31   */
  32 -css_error css__parse_unit_keyword(const char *ptr, size_t len, uint32_t *unit)
  33 +css_error css__parse_unit_keyword(const char *ptr, size_t len, css_unit *unit)
  34  {
  35         if (len == 4) {
  36                 if (strncasecmp(ptr, "grad", 4) == 0)
  37 diff -ru .orig/netsurf-full-3.0//src/libcss-0.2.0/src/parse/properties/utils.h netsurf-full-3.0//src/libcss-0.2.0/src/parse/properties/utils.h
  38 --- .orig/netsurf-full-3.0//src/libcss-0.2.0/src/parse/properties/utils.h       2013-04-20 02:40:31.000000000 +0800
  39 +++ netsurf-full-3.0//src/libcss-0.2.0/src/parse/properties/utils.h     2013-07-01 22:22:45.242699089 +0800
  40 @@ -179,7 +179,7 @@
  41                 css_fixed *length, uint32_t *unit);
  42
  43  css_error css__parse_unit_keyword(const char *ptr, size_t len,
  44 -               uint32_t *unit);
  45 +               css_unit *unit);
  46
  47  css_error css__ident_list_or_string_to_string(css_language *c,
  48                 const parserutils_vector *vector, int *ctx,
  49 diff -ru .orig/netsurf-full-3.0//src/libdom-0.0.1/Makefile netsurf-full-3.0//src/libdom-0.0.1/Makefile
  50 --- .orig/netsurf-full-3.0//src/libdom-0.0.1/Makefile   2013-04-19 00:18:13.000000000 +0800
  51 +++ netsurf-full-3.0//src/libdom-0.0.1/Makefile 2013-07-01 22:22:45.242699089 +0800
  52 @@ -15,10 +15,6 @@
  53  WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
  54         -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
  55         -Wmissing-declarations -Wnested-externs
  56 -# BeOS/Haiku standard library headers generate warnings
  57 -ifneq ($(TARGET),beos)
  58 -  WARNFLAGS := $(WARNFLAGS) -Werror
  59 -endif
  60  # AmigaOS needs this to avoid warnings
  61  ifeq ($(TARGET),amiga)
  62    CFLAGS := -U__STRICT_ANSI__ $(CFLAGS)
  63 diff -ru .orig/netsurf-full-3.0//src/libdom-0.0.1/Makefile.config netsurf-full-3.0//src/libdom-0.0.1/Makefile.config
  64 --- .orig/netsurf-full-3.0//src/libdom-0.0.1/Makefile.config    2013-04-19 00:18:13.000000000 +0800
  65 +++ netsurf-full-3.0//src/libdom-0.0.1/Makefile.config  2013-07-01 22:25:00.398701310 +0800
  66 @@ -3,7 +3,7 @@
  67  # Build the libxml2 binding?
  68  # yes | no
  69  WITH_LIBXML_BINDING := no
  70 -WITH_EXPAT_BINDING := yes
  71 +WITH_EXPAT_BINDING := no
  72
  73  # Build the hubbub binding?
  74  # yes | no
  75 diff -ru .orig/netsurf-full-3.0//src/libparserutils-0.1.2/include/parserutils/utils/vector.h netsurf-full-3.0//src/libparserutils-0.1.2/include/parserutils/utils/vector.h
  76 --- .orig/netsurf-full-3.0//src/libparserutils-0.1.2/include/parserutils/utils/vector.h 2013-04-20 02:06:57.000000000 +0800
  77 +++ netsurf-full-3.0//src/libparserutils-0.1.2/include/parserutils/utils/vector.h       2013-07-01 22:22:45.242699089 +0800
  78 @@ -33,9 +33,9 @@
  79  parserutils_error parserutils_vector_get_length(parserutils_vector *vector, size_t *length);
  80
  81  const void *parserutils_vector_iterate(const parserutils_vector *vector,
  82 -               int32_t *ctx);
  83 +               int *ctx);
  84  const void *parserutils_vector_peek(const parserutils_vector *vector,
  85 -               int32_t ctx);
  86 +               int ctx);
  87
  88  #ifdef __cplusplus
  89  }
  90 diff -ru .orig/netsurf-full-3.0//src/libparserutils-0.1.2/src/utils/vector.c netsurf-full-3.0//src/libparserutils-0.1.2/src/utils/vector.c
  91 --- .orig/netsurf-full-3.0//src/libparserutils-0.1.2/src/utils/vector.c 2013-04-20 02:06:57.000000000 +0800
  92 +++ netsurf-full-3.0//src/libparserutils-0.1.2/src/utils/vector.c       2013-07-01 22:22:45.246689992 +0800
  93 @@ -195,7 +195,7 @@
  94   * \note The value pointed to by \a ctx must be zero to begin the iteration.
  95   */
  96  const void *parserutils_vector_iterate(const parserutils_vector *vector,
  97 -               int32_t *ctx)
  98 +               int *ctx)
  99  {
 100         void *item;
 101
 102 @@ -220,7 +220,7 @@
 103   * \return Pointer to item, or NULL if no more
 104   */
 105  const void *parserutils_vector_peek(const parserutils_vector *vector,
 106 -               int32_t ctx)
 107 +               int ctx)
 108  {
 109         if (vector == NULL || vector->current_item < 0)
 110                 return NULL;
 111 diff -ru .orig/netsurf-full-3.0//src/libnsfb-0.1.2/Makefile netsurf-full-3.0//src/libnsfb-0.1.0/Makefile
 112 --- .orig/netsurf-full-3.0//src/libnsfb-0.1.0/Makefile  2013-04-20 02:06:57.000000000 +0800
 113 +++ netsurf-full-3.0//src/libnsfb-0.1.0/Makefile        2013-07-01 22:22:45.246689992 +0800
 114 @@ -31,5 +31,5 @@
 115  # surfaces not detectable via pkg-config
 116  NSFB_ABLE_AVAILABLE := no
 117 -NSFB_LINUX_AVAILABLE := yes
 118 +NSFB_LINUX_AVAILABLE := no
 119
 120  # Flags and setup for each support library
 121  NSFB_ABLE_AVAILABLE := no
 122