Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/graphlcd-base/files/, app-misc/graphlcd-base/
Date: Thu, 27 Aug 2020 21:00:00
Message-Id: 1598561953.032956f34b3775d3aa50e9d77139396c6a2138b7.conikost@gentoo
1 commit: 032956f34b3775d3aa50e9d77139396c6a2138b7
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 27 20:19:50 2020 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 27 20:59:13 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=032956f3
7
8 app-misc/graphlcd-base: fix compilation with musl
9
10 Closes: https://bugs.gentoo.org/716892
11 Package-Manager: Portage-3.0.4, Repoman-3.0.1
12 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
13
14 app-misc/graphlcd-base/files/graphlcd-base-2.0.0-musl.patch | 11 +++++++++++
15 app-misc/graphlcd-base/graphlcd-base-1.0.2-r1.ebuild | 2 ++
16 app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild | 2 ++
17 3 files changed, 15 insertions(+)
18
19 diff --git a/app-misc/graphlcd-base/files/graphlcd-base-2.0.0-musl.patch b/app-misc/graphlcd-base/files/graphlcd-base-2.0.0-musl.patch
20 new file mode 100644
21 index 00000000000..388d2f93f8f
22 --- /dev/null
23 +++ b/app-misc/graphlcd-base/files/graphlcd-base-2.0.0-musl.patch
24 @@ -0,0 +1,11 @@
25 +--- a/glcdgraphics/font.c
26 ++++ b/glcdgraphics/font.c
27 +@@ -176,7 +176,7 @@
28 +
29 + int y; int loop;
30 + int num = 0;
31 +- uint dot; uint b;
32 ++ unsigned int dot; unsigned int b;
33 + cBitmap * charBitmap = new cBitmap(charWidth, fontHeight);
34 + charBitmap->SetMonochrome(true);
35 + charBitmap->Clear();
36
37 diff --git a/app-misc/graphlcd-base/graphlcd-base-1.0.2-r1.ebuild b/app-misc/graphlcd-base/graphlcd-base-1.0.2-r1.ebuild
38 index d865aa64e51..03b878878ba 100644
39 --- a/app-misc/graphlcd-base/graphlcd-base-1.0.2-r1.ebuild
40 +++ b/app-misc/graphlcd-base/graphlcd-base-1.0.2-r1.ebuild
41 @@ -32,6 +32,8 @@ BDEPEND="virtual/pkgconfig"
42
43 DOCS=( "HISTORY" "README" "TODO" "docs/." )
44
45 +PATCHES=( "${FILESDIR}/${PN}-2.0.0-musl.patch" )
46 +
47 src_prepare() {
48 default
49
50
51 diff --git a/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild b/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild
52 index ddb8aac8b96..97b2f327bd9 100644
53 --- a/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild
54 +++ b/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild
55 @@ -32,6 +32,8 @@ BDEPEND="virtual/pkgconfig"
56
57 DOCS=( "HISTORY" "README" "TODO" "docs/." )
58
59 +PATCHES=( "${FILESDIR}/${P}-musl.patch" )
60 +
61 src_prepare() {
62 default