summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-11-12 17:08:55 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-20 14:08:10 +0000
commit587b28b551308c8b772d088788452f6ca7420909 (patch)
tree63203af8b8674351fe08d99eae45a2a45b33a487 /meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch
parent58bee16296da7d6a6a95e89121ac9ffdf07ca202 (diff)
downloadpoky-587b28b551308c8b772d088788452f6ca7420909.tar.gz
ghostscript: upgrade to 9.15
Rebase cups-no-gcrypt.patch and ghostscript-9.02-parallel-make.patch to 9.15 (From OE-Core rev: b93ef60acf8128cf44d4407fdb65a0ac016791d3) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch')
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch19
1 files changed, 11 insertions, 8 deletions
diff --git a/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch b/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch
index 1c0a6d5da5..a1c9368cc9 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch
@@ -7,22 +7,25 @@ This addresses the cryto dependency seen during build.
7Upstream-Status: Backport 7Upstream-Status: Backport
8 8
9Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 9Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
10
11Rebase the patch to ghostscript-9.15
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
10--- 13---
11 cups/libs/cups/http-private.h | 1 - 14 cups/libs/cups/http-private.h | 1 -
12 1 file changed, 1 deletion(-) 15 1 file changed, 1 deletion(-)
13 16
14diff --git a/cups/libs/cups/http-private.h b/cups/libs/cups/http-private.h 17diff --git a/cups/libs/cups/http-private.h b/cups/libs/cups/http-private.h
15index 9c88281..94a9817 100644 18index 99a85c3..a674852 100644
16--- a/cups/libs/cups/http-private.h 19--- a/cups/libs/cups/http-private.h
17+++ b/cups/libs/cups/http-private.h 20+++ b/cups/libs/cups/http-private.h
18@@ -98,7 +98,6 @@ extern BIO_METHOD *_httpBIOMethods(void); 21@@ -80,7 +80,6 @@ typedef int socklen_t;
19 * The GNU TLS library is more of a "bare metal" SSL/TLS library... 22 # elif defined HAVE_GNUTLS
20 */
21 # include <gnutls/gnutls.h> 23 # include <gnutls/gnutls.h>
24 # include <gnutls/x509.h>
22-# include <gcrypt.h> 25-# include <gcrypt.h>
23 26 # elif defined(HAVE_CDSASSL)
24 typedef struct 27 # include <CoreFoundation/CoreFoundation.h>
25 { 28 # include <Security/Security.h>
26-- 29--
272.0.0 301.9.1
28 31