Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/slop/files/, x11-misc/slop/
Date: Thu, 25 Nov 2021 12:42:49
Message-Id: 1637844015.198dccc8c2791fac9b7c287d1b350b42ba707695.ionen@gentoo
1 commit: 198dccc8c2791fac9b7c287d1b350b42ba707695
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 25 12:38:16 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 25 12:40:15 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=198dccc8
7
8 x11-misc/slop: backport missing header fix
9
10 Closes: https://bugs.gentoo.org/810349
11 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
12
13 x11-misc/slop/files/slop-7.5-missing-header.patch | 16 ++++++++++++++++
14 x11-misc/slop/slop-7.5.ebuild | 4 ++++
15 2 files changed, 20 insertions(+)
16
17 diff --git a/x11-misc/slop/files/slop-7.5-missing-header.patch b/x11-misc/slop/files/slop-7.5-missing-header.patch
18 new file mode 100644
19 index 000000000000..f77fe8f9cf88
20 --- /dev/null
21 +++ b/x11-misc/slop/files/slop-7.5-missing-header.patch
22 @@ -0,0 +1,16 @@
23 +https://bugs.gentoo.org/810349
24 +
25 +https://github.com/naelstrof/slop/commit/5cbcb9e
26 +From: Drunkard Zhang <gongfan193@×××××.com>
27 +Date: Tue, 28 Sep 2021 12:20:25 +0800
28 +Subject: [PATCH] bugfix: add missed header
29 +
30 +XDestroyImage is included in <X11/Xutil.h> which belongs to libX11.
31 +Build fails without include this header on Gentoo.
32 +--- a/src/framebuffer.cpp
33 ++++ b/src/framebuffer.cpp
34 +@@ -1,3 +1,4 @@
35 ++#include <X11/Xutil.h>
36 + #include "framebuffer.hpp"
37 +
38 + slop::Framebuffer::Framebuffer( int w, int h ) {
39
40 diff --git a/x11-misc/slop/slop-7.5.ebuild b/x11-misc/slop/slop-7.5.ebuild
41 index e3d08d39be3c..2a2d4fd07ad8 100644
42 --- a/x11-misc/slop/slop-7.5.ebuild
43 +++ b/x11-misc/slop/slop-7.5.ebuild
44 @@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
45 media-libs/glm
46 "
47
48 +PATCHES=(
49 + "${FILESDIR}"/${P}-missing-header.patch
50 +)
51 +
52 src_configure() {
53 local mycmakeargs=(
54 -DSLOP_OPENGL=$(usex opengl)