Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/imlib2/files/, media-libs/imlib2/
Date: Thu, 24 Dec 2015 20:18:40
Message-Id: 1450988200.3cc0db0c9bd107846e399865c55f5ae5c47031da.vapier@gentoo
1 commit: 3cc0db0c9bd107846e399865c55f5ae5c47031da
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 24 20:16:24 2015 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 24 20:16:40 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cc0db0c
7
8 media-libs/imlib2: add fix from upstream #563732
9
10 media-libs/imlib2/files/imlib2-1.4.7-headers.patch | 26 ++++++++++++++++++++++
11 media-libs/imlib2/imlib2-1.4.7.ebuild | 7 +++++-
12 2 files changed, 32 insertions(+), 1 deletion(-)
13
14 diff --git a/media-libs/imlib2/files/imlib2-1.4.7-headers.patch b/media-libs/imlib2/files/imlib2-1.4.7-headers.patch
15 new file mode 100644
16 index 0000000..d2fba06
17 --- /dev/null
18 +++ b/media-libs/imlib2/files/imlib2-1.4.7-headers.patch
19 @@ -0,0 +1,26 @@
20 +https://bugs.gentoo.org/563732
21 +
22 +From 521573be219f27c7bfebb57d5b0b994fdb316721 Mon Sep 17 00:00:00 2001
23 +From: Chloe Kudryavtsev <chloe.kudryavtsev@×××××.com>
24 +Date: Sat, 24 Oct 2015 23:38:53 -0400
25 +Subject: [PATCH] add time.h include to common.h for time_t
26 +
27 +---
28 + src/lib/common.h | 1 +
29 + 1 file changed, 1 insertion(+)
30 +
31 +diff --git a/src/lib/common.h b/src/lib/common.h
32 +index 798965f..9053826 100644
33 +--- a/src/lib/common.h
34 ++++ b/src/lib/common.h
35 +@@ -9,6 +9,7 @@
36 + #include <config.h>
37 + #include <string.h>
38 + #include <math.h>
39 ++#include <time.h>
40 + #ifdef WITH_DMALLOC
41 + #include <dmalloc.h>
42 + #endif
43 +--
44 +2.6.2
45 +
46
47 diff --git a/media-libs/imlib2/imlib2-1.4.7.ebuild b/media-libs/imlib2/imlib2-1.4.7.ebuild
48 index 4af1159..f2b3f29 100644
49 --- a/media-libs/imlib2/imlib2-1.4.7.ebuild
50 +++ b/media-libs/imlib2/imlib2-1.4.7.ebuild
51 @@ -11,7 +11,7 @@ if [[ ${PV} != "9999" ]] ; then
52 EKEY_STATE="snap"
53 fi
54
55 -inherit enlightenment toolchain-funcs multilib-minimal
56 +inherit enlightenment toolchain-funcs multilib-minimal eutils
57
58 DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
59 HOMEPAGE="https://www.enlightenment.org/"
60 @@ -37,6 +37,11 @@ DEPEND="${RDEPEND}
61 >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
62 )"
63
64 +src_prepare() {
65 + epatch "${FILESDIR}"/${P}-headers.patch #563732
66 + enlightenment_src_prepare
67 +}
68 +
69 multilib_src_configure() {
70 # imlib2 has diff configure options for x86/amd64 mmx
71 if [[ $(tc-arch) == amd64 ]]; then