diff options
| author |   Robert Piasek <dagger@gentoo.org> | 2009-07-06 15:57:40 +0000 |
|---|---|---|
| committer | Robert Piasek <dagger@gentoo.org> | 2009-07-06 15:57:40 +0000 |
| commit | a5bea63b9d3ddd135fb511c675a3e73339c4918f (patch) | |
| tree | 0761e2694a91283104d45b014f3e1cf019965d16 /dev-libs | |
| parent | Correct Manifest for fso-gpsd. (diff) | |
| download | embedded-cross-a5bea63b9d3ddd135fb511c675a3e73339c4918f.tar.gz embedded-cross-a5bea63b9d3ddd135fb511c675a3e73339c4918f.tar.bz2 embedded-cross-a5bea63b9d3ddd135fb511c675a3e73339c4918f.zip | |
That fixes bug #231
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/eet/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/eet/Manifest | 5 | ||||
| -rw-r--r-- | dev-libs/eet/eet-1.2.1.ebuild | 19 | ||||
| -rw-r--r-- | dev-libs/eet/files/eet-1.2.1-fix.cipher.patch | 34 |
4 files changed, 56 insertions, 7 deletions
diff --git a/dev-libs/eet/ChangeLog b/dev-libs/eet/ChangeLog index 2bee959..8ccb3ed 100644 --- a/dev-libs/eet/ChangeLog +++ b/dev-libs/eet/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 06 Jul 2009; Robert Piasek <dagger@gentoo.org> eet-1.2.1.ebuild, + +files/eet-1.2.1-fix.cipher.patch: + Backported upstream patch which fixes compilation with gnutls + + *eet-1.2.1 (15 Jun 2009) 15 Jun 2009; Robert Piasek <dagger@gentoo.org> +eet-1.2.1.ebuild: diff --git a/dev-libs/eet/Manifest b/dev-libs/eet/Manifest index c3c66fc..9997a03 100644 --- a/dev-libs/eet/Manifest +++ b/dev-libs/eet/Manifest @@ -1,6 +1,7 @@ +AUX eet-1.2.1-fix.cipher.patch 889 RMD160 b8e6fdc142612010b14e7a1f264612408a6b7cf2 SHA1 b67f7fc199fa44fe787641c26051767514bd7385 SHA256 779d1751a4aa9cdd7a0e3b6c0a333d2889e186f3b1643b4f52d68d2ae7e4349d DIST eet-1.2.0.tar.bz2 1570159 RMD160 e872da22a03dda918f5f80671d0ac6aa5eab3d99 SHA1 7b030ef33bdb0933146f4811325a90a9605afddc SHA256 7613d85602a185325615ee6f8811c2938fb523eee83984dc887546eaf8943d45 DIST eet-1.2.1.tar.bz2 1570851 RMD160 2584fa72654b6a4595ee63fffcbe5a5a97619008 SHA1 85e6064813d7f6da86dc6d27b4adc32e2cde1833 SHA256 632e257792fbe4832ac778debb064d5a347ab3c47796380f4c69d8a6fe94bbfe EBUILD eet-1.2.0.ebuild 744 RMD160 db44629497106af883be88047aac56e1b2c00372 SHA1 52ef89289ab44fd4eab997dd3f60f32e53e47c4f SHA256 4b4ee6b72cd8fcbbda566524befe832c38d19058257f209d7b6f7e564e34d631 -EBUILD eet-1.2.1.ebuild 744 RMD160 fbd2b50e087f16ad93eba6d23194b9aaf2078c36 SHA1 bab8236ebb1de4a389d4bc7b2c214759f5b06620 SHA256 9a052c847417a2051a2d4865ce08ae899a08f0332769809f431672f66d8c98c6 -MISC ChangeLog 415 RMD160 f04f201ea15ab95532ab1f56ad9145b4e9e4076c SHA1 a05b8d48d7772627463c81b59eb6bf7a83903850 SHA256 212438437bea89a4f7fa81f933c8ccd5940351dddba2bd62a0a2d17065ff20e8 +EBUILD eet-1.2.1.ebuild 908 RMD160 f3add435cbfee476e3a213b1dbdfe7c67c08b26f SHA1 c9d16b461cc5f22ed05fe18a25539a80a4e0edf7 SHA256 0b75a16c4b7b9a8e75d340f3df7f217ce035f0c33c84c492b725e32e39ff5962 +MISC ChangeLog 585 RMD160 89f7593de185d8592f77afa3dc2c8e0d1a851548 SHA1 58ac86b8272b69aad4ecf9120efcf734b42cd155 SHA256 9de09d5db6f83bd19423ebdc6d33ba13dfc83ac50d595db6d1265d0a8bc43c96 MISC metadata.xml 296 RMD160 d8f057fffd0d6d3c84b2d5481481f8848cc7f5aa SHA1 d3e950b1ca7636e89f44d3182753cb2384dcd11c SHA256 996385c7eb65b2fe398df26ebb0da85233a4f6c135a1256da9c53bd96ad450f4 diff --git a/dev-libs/eet/eet-1.2.1.ebuild b/dev-libs/eet/eet-1.2.1.ebuild index 21852a9..4612321 100644 --- a/dev-libs/eet/eet-1.2.1.ebuild +++ b/dev-libs/eet/eet-1.2.1.ebuild @@ -20,8 +20,17 @@ RDEPEND="=dev-libs/eina-0.0.2.061 DEPEND=">=dev-util/pkgconfig-0.9.0" -MY_ECONF="$(use_enable ssl openssl) \ - $(use_enable ssl cipher) \ - $(use_enable ssl signature) \ - $(use_enable gnutls gnutls) \ - --disable-old-eet-file-format" +src_compile() { + + epatch "${FILESDIR}"/${P}-fix.cipher.patch + + MY_ECONF="$(use_enable ssl openssl) \ + $(use_enable ssl cipher) \ + $(use_enable ssl signature) \ + $(use_enable gnutls gnutls) \ + $(use_enable gnutls cipher) \ + $(use_enable gnutls signature) \ + --disable-old-eet-file-format" + + enlightenment_src_compile +}
\ No newline at end of file diff --git a/dev-libs/eet/files/eet-1.2.1-fix.cipher.patch b/dev-libs/eet/files/eet-1.2.1-fix.cipher.patch new file mode 100644 index 0000000..09d7b33 --- /dev/null +++ b/dev-libs/eet/files/eet-1.2.1-fix.cipher.patch @@ -0,0 +1,34 @@ +Index: trunk/eet/src/lib/eet_cipher.c +=================================================================== +--- a/trunk/eet/src/lib/eet_cipher.c ++++ b/trunk/eet/src/lib/eet_cipher.c +@@ -349,5 +349,6 @@ + void *result; + +-#ifdef HAVE_GNUTLS ++#ifdef HAVE_SIGNATURE ++# ifdef HAVE_GNUTLS + result = malloc(gcry_md_get_algo_dlen(GCRY_MD_SHA1)); + if (!result) return NULL; +@@ -355,6 +356,6 @@ + gcry_md_hash_buffer(GCRY_MD_SHA1, result, data_base, data_length); + if (sha1_length) *sha1_length = gcry_md_get_algo_dlen(GCRY_MD_SHA1); +-#else +-# ifdef HAVE_OPENSSL ++# else ++# ifdef HAVE_OPENSSL + result = malloc(SHA_DIGEST_LENGTH); + if (!result) return NULL; +@@ -362,7 +363,10 @@ + SHA1(data_base, data_length, result); + if (sha1_length) *sha1_length = SHA_DIGEST_LENGTH; +-# else ++# else + result = NULL; +-# endif ++# endif ++# endif ++#else ++ result = NULL; + #endif +
\ No newline at end of file |