[oe-commits] Jackie Huang : ghostscript: Don' t build-depend on libgcrypt for the local cups

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: f3e8914ea675217b3c86806522407ea19963d14f
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f3e8914ea675217b3c86806522407ea19963d14f

Author: Jackie Huang <jackie.huang at windriver.com>
Date:   Mon Sep  1 04:59:56 2014 -0400

ghostscript: Don't build-depend on libgcrypt for the local cups

Backported for the ghostscript supplied cups code from
http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch

This addresses the cryto dependency seen during build.

Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../ghostscript/ghostscript/cups-no-gcrypt.patch   | 28 ++++++++++++++++++++++
 .../ghostscript/ghostscript_9.14.bb                |  1 +
 2 files changed, 29 insertions(+)

diff --git a/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch b/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch
new file mode 100644
index 0000000..1c0a6d5
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch
@@ -0,0 +1,28 @@
+Subject: [PATCH] Don't build-depend on libgcrypt, as nothing is used from it
+
+Backported from http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch
+
+This addresses the cryto dependency seen during build.
+
+Upstream-Status: Backport
+
+Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
+---
+ cups/libs/cups/http-private.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/cups/libs/cups/http-private.h b/cups/libs/cups/http-private.h
+index 9c88281..94a9817 100644
+--- a/cups/libs/cups/http-private.h
++++ b/cups/libs/cups/http-private.h
+@@ -98,7 +98,6 @@ extern BIO_METHOD *_httpBIOMethods(void);
+  * The GNU TLS library is more of a "bare metal" SSL/TLS library...
+  */
+ #    include <gnutls/gnutls.h>
+-#    include <gcrypt.h>
+ 
+ typedef struct
+ {
+-- 
+2.0.0
+
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.14.bb b/meta/recipes-extended/ghostscript/ghostscript_9.14.bb
index 2e892f3..130dc1c 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.14.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.14.bb
@@ -23,6 +23,7 @@ SRC_URI = "${SRC_URI_BASE} \
            file://ghostscript-9.02-genarch.patch \
            file://objarch.h \
            file://ghostscript-9.02-parallel-make.patch \
+           file://cups-no-gcrypt.patch \
            "
 
 SRC_URI_class-native = "${SRC_URI_BASE} \