diff options
Diffstat (limited to 'meta-oe/recipes-support/gd/files/fix-gcc-unused-functions.patch')
| -rw-r--r-- | meta-oe/recipes-support/gd/files/fix-gcc-unused-functions.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/meta-oe/recipes-support/gd/files/fix-gcc-unused-functions.patch b/meta-oe/recipes-support/gd/files/fix-gcc-unused-functions.patch deleted file mode 100644 index 02cb5ad758..0000000000 --- a/meta-oe/recipes-support/gd/files/fix-gcc-unused-functions.patch +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | gdft.c: remove functions that cause warnings about being unused | ||
| 2 | |||
| 3 | Upstream-Status: Backport (Fixed in master branch) | ||
| 4 | |||
| 5 | Signed-off-by: Derek Straka <derek@asterius.io> | ||
| 6 | --- git/src/gdft.c.orig 2016-08-12 10:20:41.418440091 -0400 | ||
| 7 | +++ git/src/gdft.c 2016-08-12 10:22:34.226442987 -0400 | ||
| 8 | @@ -139,16 +139,6 @@ | ||
| 9 | } | ||
| 10 | #else | ||
| 11 | |||
| 12 | -#ifndef HAVE_LIBFONTCONFIG | ||
| 13 | -static char * font_pattern(char **fontpath, char *fontpattern) | ||
| 14 | -{ | ||
| 15 | - (void)fontpath; | ||
| 16 | - (void)fontpattern; | ||
| 17 | - | ||
| 18 | - return "libgd was not built with FontConfig support\n"; | ||
| 19 | -} | ||
| 20 | -#endif /* HAVE_LIBFONTCONFIG */ | ||
| 21 | - | ||
| 22 | #include "gdcache.h" | ||
| 23 | /* 2.0.16 Christophe Thomas: starting with FreeType 2.1.6, this is | ||
| 24 | mandatory, and it has been supported for a long while. */ | ||
| 25 | @@ -446,16 +436,15 @@ | ||
| 26 | return (strcmp (a->fontlist, b->fontlist) == 0 && a->flags == b->flags); | ||
| 27 | } | ||
| 28 | |||
| 29 | +#ifdef HAVE_LIBFONTCONFIG | ||
| 30 | static int useFontConfig(int flag) | ||
| 31 | { | ||
| 32 | -#ifdef HAVE_LIBFONTCONFIG | ||
| 33 | if (fontConfigFlag) { | ||
| 34 | return (!(flag & gdFTEX_FONTPATHNAME)); | ||
| 35 | } | ||
| 36 | -#endif | ||
| 37 | return flag & gdFTEX_FONTCONFIG; | ||
| 38 | } | ||
| 39 | - | ||
| 40 | +#endif | ||
| 41 | static void * | ||
| 42 | fontFetch (char **error, void *key) | ||
| 43 | { | ||
