Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/weston/files/, dev-libs/weston/
Date: Sun, 29 Apr 2018 22:07:11
Message-Id: 1525039620.0a594acda7bfbae3c55c54c9d0c521f362c2843d.dilfridge@gentoo
1 commit: 0a594acda7bfbae3c55c54c9d0c521f362c2843d
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 29 22:06:51 2018 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 29 22:07:00 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a594acd
7
8 dev-libs/weston: Add build fix for glibc-2.26, bug 610652
9
10 Oh well, this one was really easy.
11
12 Closes: https://bugs.gentoo.org/610652
13 Package-Manager: Portage-2.3.31, Repoman-2.3.9
14
15 dev-libs/weston/files/weston-1.11.0-sysmacros.patch | 11 +++++++++++
16 dev-libs/weston/weston-1.11.0.ebuild | 5 +++--
17 2 files changed, 14 insertions(+), 2 deletions(-)
18
19 diff --git a/dev-libs/weston/files/weston-1.11.0-sysmacros.patch b/dev-libs/weston/files/weston-1.11.0-sysmacros.patch
20 new file mode 100644
21 index 00000000000..6f54bfc11cd
22 --- /dev/null
23 +++ b/dev-libs/weston/files/weston-1.11.0-sysmacros.patch
24 @@ -0,0 +1,11 @@
25 +diff -ruN weston-1.11.0.orig/src/weston-launch.c weston-1.11.0/src/weston-launch.c
26 +--- weston-1.11.0.orig/src/weston-launch.c 2015-10-24 02:02:43.000000000 +0200
27 ++++ weston-1.11.0/src/weston-launch.c 2018-04-30 00:02:42.528120347 +0200
28 +@@ -37,6 +37,7 @@
29 + #include <getopt.h>
30 +
31 + #include <sys/types.h>
32 ++#include <sys/sysmacros.h>
33 + #include <sys/ioctl.h>
34 + #include <sys/stat.h>
35 + #include <sys/wait.h>
36
37 diff --git a/dev-libs/weston/weston-1.11.0.ebuild b/dev-libs/weston/weston-1.11.0.ebuild
38 index 9574ec16fc7..81098bc0289 100644
39 --- a/dev-libs/weston/weston-1.11.0.ebuild
40 +++ b/dev-libs/weston/weston-1.11.0.ebuild
41 @@ -1,4 +1,4 @@
42 -# Copyright 1999-2017 Gentoo Foundation
43 +# Copyright 1999-2018 Gentoo Foundation
44 # Distributed under the terms of the GNU General Public License v2
45
46 EAPI=5
47 @@ -11,7 +11,7 @@ fi
48 VIRTUALX_REQUIRED="test"
49 RESTRICT="test"
50
51 -inherit autotools readme.gentoo-r1 toolchain-funcs virtualx $GIT_ECLASS
52 +inherit autotools readme.gentoo-r1 toolchain-funcs virtualx epatch $GIT_ECLASS
53
54 DESCRIPTION="Wayland reference compositor"
55 HOMEPAGE="https://wayland.freedesktop.org/"
56 @@ -95,6 +95,7 @@ DEPEND="${RDEPEND}
57 "
58
59 src_prepare() {
60 + epatch "${FILESDIR}/${P}-sysmacros.patch"
61 if [[ ${PV} = 9999* ]]; then
62 eautoreconf
63 fi