summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/gd/files/fix-gcc-unused-functions.patch
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2017-08-18 14:55:11 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-28 11:06:02 +0200
commita7f02b1fe59e1c35e0abfe5f716df0fcd8b9d204 (patch)
tree5924ee10d0af275e07e3b5a01baf0180416b6236 /meta-oe/recipes-support/gd/files/fix-gcc-unused-functions.patch
parent2ee20c389a3db6e1bb633e06ffd2ade43a70e14d (diff)
downloadmeta-openembedded-a7f02b1fe59e1c35e0abfe5f716df0fcd8b9d204.tar.gz
gd: update to 2.2.4
* Remove the following patches which already merged in upstream: fix-gcc-unused-functions.patch .gitignore-the-new-test-case.patch CVE-2016-10166.patch CVE-2016-10167.patch CVE-2016-10168.patch CVE-2016-6906-1.patch CVE-2016-6906-2.patch Fix-290-TGA-RLE-decoding-is-broken.patch * Update LICENSE's MD5 check sum. The COPYING file has been update with the following commits in upstream: commit f863b3c2d300ff5344f6752e5813b0d6985e79c4 Resolve #282: COPYING vs. docs/naturaldocs/license.txt commit 9ccdaedbd9a2cfd1c8a9a258c09af161e796bd41 Sync COPYING and docs/naturaldocs/license.txt These two commits updated the copyright statement regarding the authorship of gd and adjust the format. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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.patch43
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 @@
1gdft.c: remove functions that cause warnings about being unused
2
3Upstream-Status: Backport (Fixed in master branch)
4
5Signed-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 {