Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/habak/, x11-misc/habak/files/
Date: Sun, 02 Feb 2020 09:40:47
Message-Id: 1580636439.fad59b3a7142b73175bfaaa6035b6d333da1cfa0.jer@gentoo
1 commit: fad59b3a7142b73175bfaaa6035b6d333da1cfa0
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 2 09:40:07 2020 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 2 09:40:39 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fad59b3a
7
8 x11-misc/habak: Fix CFLAGS=-fno-common
9
10 Package-Manager: Portage-2.3.86, Repoman-2.3.20
11 Closes: https://bugs.gentoo.org/show_bug.cgi?id=707774
12 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
13
14 x11-misc/habak/files/habak-0.2.5-fno-common.patch | 33 +++++++++++++++++++++++
15 x11-misc/habak/habak-0.2.5-r3.ebuild | 3 ++-
16 2 files changed, 35 insertions(+), 1 deletion(-)
17
18 diff --git a/x11-misc/habak/files/habak-0.2.5-fno-common.patch b/x11-misc/habak/files/habak-0.2.5-fno-common.patch
19 new file mode 100644
20 index 00000000000..0fad5f4df56
21 --- /dev/null
22 +++ b/x11-misc/habak/files/habak-0.2.5-fno-common.patch
23 @@ -0,0 +1,33 @@
24 +--- a/src/random.c
25 ++++ b/src/random.c
26 +@@ -8,12 +8,15 @@
27 + #include <regex.h>
28 +
29 + #include <errno.h>
30 ++
31 ++#include "i.h"
32 ++
33 + extern int errno;
34 + int syserr;
35 +
36 + #define ALLOC_STEP 1000
37 + regex_t regexp;
38 +-int size_files=0, used_files=0, i=0;
39 ++int size_files=0, used_files=0;
40 + char **files, *wyjscie;
41 + regmatch_t matchpos;
42 +
43 +--- a/src/habak.c
44 ++++ b/src/habak.c
45 +@@ -14,6 +14,7 @@
46 + #include <Imlib2.h>
47 + #include "types.h"
48 + #include "proto.h"
49 ++#include "i.h"
50 +
51 + habak_l *current_list_item=NULL, *first_list_item=NULL;
52 + habak_t *current_habak;
53 +--- /dev/null
54 ++++ b/src/i.h
55 +@@ -0,0 +1 @@
56 ++extern int i;
57
58 diff --git a/x11-misc/habak/habak-0.2.5-r3.ebuild b/x11-misc/habak/habak-0.2.5-r3.ebuild
59 index 1dcc37e3e71..4279398d92d 100644
60 --- a/x11-misc/habak/habak-0.2.5-r3.ebuild
61 +++ b/x11-misc/habak/habak-0.2.5-r3.ebuild
62 @@ -1,4 +1,4 @@
63 -# Copyright 1999-2019 Gentoo Authors
64 +# Copyright 1999-2020 Gentoo Authors
65 # Distributed under the terms of the GNU General Public License v2
66
67 EAPI=7
68 @@ -23,6 +23,7 @@ DEPEND="
69 "
70 DOCS=( ChangeLog README TODO "${FILESDIR}"/README.en )
71 PATCHES=(
72 + "${FILESDIR}"/${P}-fno-common.patch
73 "${FILESDIR}"/${P}-gentoo.patch
74 )