gfx/cairo/cairo-version-fixes.patch@deefc01c0e14
gfx/cairo/cairo-version-fixes.patch
Thu, 15 Jan 2015 21:03:48 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 15 Jan 2015 21:03:48 +0100
- branch
- TOR_BUG_9701
- changeset 11
- deefc01c0e14
- permissions
- -rw-r--r--
Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)
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
