gfx/cairo/cairo-version-fixes.patch@b8a032363ba2 (annotated)
gfx/cairo/cairo-version-fixes.patch
Thu, 22 Jan 2015 13:21:57 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 22 Jan 2015 13:21:57 +0100
- branch
- TOR_BUG_9701
- changeset 15
- b8a032363ba2
- permissions
- -rw-r--r--
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
| 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 |
