gfx/cairo/cairo-version-fixes.patch@97036ab72558 (annotated)
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.
| michael@0 | 1 | diff --git a/gfx/cairo/cairo/src/cairo-version.c b/gfx/cairo/cairo/src/cairo-version.c |
| michael@0 | 2 | --- a/gfx/cairo/cairo/src/cairo-version.c |
| michael@0 | 3 | +++ b/gfx/cairo/cairo/src/cairo-version.c |
| michael@0 | 4 | @@ -42,7 +42,7 @@ |
| michael@0 | 5 | |
| michael@0 | 6 | /* get the "real" version info instead of dummy cairo-version.h */ |
| michael@0 | 7 | #undef CAIRO_VERSION_H |
| michael@0 | 8 | -#include "../cairo-version.h" |
| michael@0 | 9 | +#include "cairo-features.h" |
| michael@0 | 10 | |
| michael@0 | 11 | /** |
| michael@0 | 12 | * cairo_version: |
| michael@0 | 13 | diff --git a/gfx/cairo/cairo/src/cairo-version.h b/gfx/cairo/cairo/src/cairo-version.h |
| michael@0 | 14 | --- a/gfx/cairo/cairo/src/cairo-version.h |
| michael@0 | 15 | +++ b/gfx/cairo/cairo/src/cairo-version.h |
| michael@0 | 16 | @@ -7,8 +7,10 @@ |
| michael@0 | 17 | #ifndef CAIRO_VERSION_H |
| michael@0 | 18 | #define CAIRO_VERSION_H |
| michael@0 | 19 | |
| michael@0 | 20 | +#if 0 |
| michael@0 | 21 | #define CAIRO_VERSION_MAJOR USE_cairo_version_OR_cairo_version_string_INSTEAD |
| michael@0 | 22 | #define CAIRO_VERSION_MINOR USE_cairo_version_OR_cairo_version_string_INSTEAD |
| michael@0 | 23 | #define CAIRO_VERSION_MICRO USE_cairo_version_OR_cairo_version_string_INSTEAD |
| michael@0 | 24 | +#endif |
| michael@0 | 25 | |
| michael@0 | 26 | #endif |
