gfx/cairo/cairo-version-fixes.patch

Tue, 06 Jan 2015 21:39:09 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Tue, 06 Jan 2015 21:39:09 +0100
branch
TOR_BUG_9701
changeset 8
97036ab72558
permissions
-rw-r--r--

Conditionally force memory storage according to privacy.thirdparty.isolate;
This solves Tor bug #9701, complying with disk avoidance documented in
https://www.torproject.org/projects/torbrowser/design/#disk-avoidance.

     1 diff --git a/gfx/cairo/cairo/src/cairo-version.c b/gfx/cairo/cairo/src/cairo-version.c
     2 --- a/gfx/cairo/cairo/src/cairo-version.c
     3 +++ b/gfx/cairo/cairo/src/cairo-version.c
     4 @@ -42,7 +42,7 @@
     6  /* get the "real" version info instead of dummy cairo-version.h */
     7  #undef CAIRO_VERSION_H
     8 -#include "../cairo-version.h"
     9 +#include "cairo-features.h"
    11  /**
    12   * cairo_version:
    13 diff --git a/gfx/cairo/cairo/src/cairo-version.h b/gfx/cairo/cairo/src/cairo-version.h
    14 --- a/gfx/cairo/cairo/src/cairo-version.h
    15 +++ b/gfx/cairo/cairo/src/cairo-version.h
    16 @@ -7,8 +7,10 @@
    17  #ifndef CAIRO_VERSION_H
    18  #define CAIRO_VERSION_H
    20 +#if 0
    21  #define CAIRO_VERSION_MAJOR USE_cairo_version_OR_cairo_version_string_INSTEAD
    22  #define CAIRO_VERSION_MINOR USE_cairo_version_OR_cairo_version_string_INSTEAD
    23  #define CAIRO_VERSION_MICRO USE_cairo_version_OR_cairo_version_string_INSTEAD
    24 +#endif
    26  #endif

mercurial