[oe-commits] org.oe.dev libgcrypt (all) add pkgconfig support to it. patch unmergable since upstream doesn't like pkgconfig *sigh*

[mickeyl commit]

libgcrypt (all) add pkgconfig support to it. patch unmergable since upstream doesn't like pkgconfig *sigh*

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: cf8f6325b692b73a8f4787281ea4887feb25db9a
ViewMTN: http://monotone.openembedded.org/revision/info/cf8f6325b692b73a8f4787281ea4887feb25db9a
Files:
1
packages/libgcrypt/libgcrypt_1.2.3.bb
packages/libgcrypt/libgcrypt_1.2.4.bb
packages/libgcrypt/files
packages/libgcrypt/libgcrypt-1.4.0
packages/libgcrypt/files/add-pkgconfig-support.patch
packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch
packages/libgcrypt/libgcrypt.inc
Diffs:

#
# mt diff -rbc7411872a80933a319ac02a73b10fff61e313ca -rcf8f6325b692b73a8f4787281ea4887feb25db9a
#
# 
# 
# rename "packages/libgcrypt/libgcrypt_1.2.3.bb"
#     to "packages/libgcrypt/libgcrypt_1.2.4.bb"
# 
# add_dir "packages/libgcrypt/files"
# 
# add_dir "packages/libgcrypt/libgcrypt-1.4.0"
# 
# add_file "packages/libgcrypt/files/add-pkgconfig-support.patch"
#  content [0c9bcfe5f66668cc2d120c1a7fa2da40e5b2942c]
# 
# add_file "packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch"
#  content [5232a01eaab0ce7ff907ea44b68a6b042cc66cf5]
# 
# patch "packages/libgcrypt/libgcrypt.inc"
#  from [c88a833e7d314cd9db43d7e7e4d46393b4902a48]
#    to [8e21adfdd89aea4f3065efcdd7086b8a9e5e455e]
# 
============================================================
--- packages/libgcrypt/files/add-pkgconfig-support.patch	0c9bcfe5f66668cc2d120c1a7fa2da40e5b2942c
+++ packages/libgcrypt/files/add-pkgconfig-support.patch	0c9bcfe5f66668cc2d120c1a7fa2da40e5b2942c
@@ -0,0 +1,62 @@
+diff -Nur libgcrypt-1.2.4/configure.ac libgcrypt11-1.2.4/configure.ac
+--- libgcrypt-1.2.4/configure.ac 2007-02-01 19:41:06.000000000 +0100
++++ libgcrypt11-1.2.4/configure.ac 2007-02-11 13:05:36.000000000 +0100
+@@ -808,6 +808,7 @@
+ src/Makefile
+ src/gcrypt.h
+ src/libgcrypt-config
++src/libgcrypt.pc
+ tests/Makefile
+ w32-dll/Makefile
+ ])
+diff -Nur libgcrypt-1.2.4/src/libgcrypt.pc.in libgcrypt11-1.2.4/src/libgcrypt.pc.in
+--- libgcrypt-1.2.4/src/libgcrypt.pc.in 1970-01-01 01:00:00.000000000 +0100
++++ libgcrypt11-1.2.4/src/libgcrypt.pc.in 2007-02-11 13:03:30.000000000 +0100
+@@ -0,0 +1,32 @@
++# Process this file with autoconf to produce a pkg-config metadata file.
++# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation
++# Author: Simon Josefsson
++#
++# This file is free software; as a special exception the author gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
++#
++# This file is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++# API info
++api_version=@LIBGCRYPT_CONFIG_API_VERSION@
++
++# Misc information.
++symmetric_ciphers=@LIBGCRYPT_CIPHERS@
++asymmetric_ciphers=@LIBGCRYPT_PUBKEY_CIPHERS@
++digests=@LIBGCRYPT_DIGESTS@
++
++Name: libgcrypt
++Description: GNU crypto library
++URL: http://www.gnupg.org
++Version: @VERSION@
++Libs: -L${libdir} @LIBGCRYPT_CONFIG_LIBS@
++Libs.private: @GPG_ERROR_LIBS@
++Cflags: -I${includedir} @LIBGCRYPT_CONFIG_CFLAGS@ @GPG_ERROR_CFLAGS@
+diff -Nur libgcrypt-1.2.4/src/Makefile.am libgcrypt11-1.2.4/src/Makefile.am
+--- libgcrypt-1.2.4/src/Makefile.am 2006-11-30 16:38:18.000000000 +0100
++++ libgcrypt11-1.2.4/src/Makefile.am 2007-02-11 13:10:03.000000000 +0100
+@@ -27,6 +27,11 @@
+ 
+ lib_LTLIBRARIES = libgcrypt.la
+ 
++# Pkg-config script.
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = libgcrypt.pc
++DISTCLEANFILES = $(pkgconfig_DATA)
++
+ if HAVE_LD_VERSION_SCRIPT
+   libgcrypt_version_script_cmd = -Wl,--version-script=$(srcdir)/libgcrypt.vers
+ else 
============================================================
--- packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch	5232a01eaab0ce7ff907ea44b68a6b042cc66cf5
+++ packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch	5232a01eaab0ce7ff907ea44b68a6b042cc66cf5
@@ -0,0 +1,49 @@
+Index: libgcrypt-1.4.0/configure.ac
+===================================================================
+--- libgcrypt-1.4.0.orig/configure.ac
++++ libgcrypt-1.4.0/configure.ac
+@@ -1072,6 +1072,7 @@ cipher/Makefile
+ doc/Makefile
+ src/Makefile
+ src/gcrypt.h
++src/libgcrypt.pc
+ src/libgcrypt-config
+ src/versioninfo.rc
+ tests/Makefile
+Index: libgcrypt-1.4.0/src/libgcrypt.pc.in
+===================================================================
+--- /dev/null
++++ libgcrypt-1.4.0/src/libgcrypt.pc.in
+@@ -0,0 +1,32 @@
++# Process this file with autoconf to produce a pkg-config metadata file.
++# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation
++# Author: Simon Josefsson
++#
++# This file is free software; as a special exception the author gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
++#
++# This file is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++# API info
++api_version=@LIBGCRYPT_CONFIG_API_VERSION@
++
++# Misc information.
++symmetric_ciphers=@LIBGCRYPT_CIPHERS@
++asymmetric_ciphers=@LIBGCRYPT_PUBKEY_CIPHERS@
++digests=@LIBGCRYPT_DIGESTS@
++
++Name: libgcrypt
++Description: GNU crypto library
++URL: http://www.gnupg.org
++Version: @VERSION@
++Libs: -L${libdir} @LIBGCRYPT_CONFIG_LIBS@
++Libs.private: @GPG_ERROR_LIBS@
++Cflags: -I${includedir} @LIBGCRYPT_CONFIG_CFLAGS@ @GPG_ERROR_CFLAGS@
============================================================
--- packages/libgcrypt/libgcrypt.inc	c88a833e7d314cd9db43d7e7e4d46393b4902a48
+++ packages/libgcrypt/libgcrypt.inc	8e21adfdd89aea4f3065efcdd7086b8a9e5e455e
@@ -1,10 +1,11 @@ DEPENDS = "libgpg-error"
 DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL LGPL FDL"
 DEPENDS = "libgpg-error"
 
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz"
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \
+           file://add-pkgconfig-support.patch;patch=1"
 
 inherit autotools binconfig pkgconfig