Gentoo Archives: gentoo-commits

From: Maciej Mrozowski <reavertm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libgadu/files/, net-libs/libgadu/
Date: Sun, 09 Feb 2020 02:28:49
Message-Id: 1581215303.c399566a3b87b5e8cb2341e3d3c0c0368ce01f13.reavertm@gentoo
1 commit: c399566a3b87b5e8cb2341e3d3c0c0368ce01f13
2 Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 9 02:25:58 2020 +0000
4 Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 9 02:28:23 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c399566a
7
8 net-libs/libgadu: Fix building with -fno-common
9
10 Closes: https://bugs.gentoo.org/708686
11 Package-Manager: Portage-2.3.84, Repoman-2.3.20
12 Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
13
14 .../libgadu/files/libgadu-1.12.2-fno-common.patch | 30 ++++++++++++++++++++++
15 net-libs/libgadu/libgadu-1.12.2-r1.ebuild | 4 +++
16 2 files changed, 34 insertions(+)
17
18 diff --git a/net-libs/libgadu/files/libgadu-1.12.2-fno-common.patch b/net-libs/libgadu/files/libgadu-1.12.2-fno-common.patch
19 new file mode 100644
20 index 00000000000..2eafd3748ee
21 --- /dev/null
22 +++ b/net-libs/libgadu/files/libgadu-1.12.2-fno-common.patch
23 @@ -0,0 +1,30 @@
24 +diff -ruN libgadu-1.12.2/test/manual/userconfig.h my-libgadu/test/manual/userconfig.h
25 +--- libgadu-1.12.2/test/manual/userconfig.h 2017-01-21 18:57:03.000000000 +0100
26 ++++ my-libgadu/test/manual/userconfig.h 2020-02-09 03:18:29.040560145 +0100
27 +@@ -19,16 +19,16 @@
28 + #ifndef USERCONFIG_H
29 + #define USERCONFIG_H
30 +
31 +-unsigned int config_uin;
32 +-char *config_password;
33 +-unsigned int config_peer;
34 +-char *config_file;
35 +-char *config_dir;
36 +-unsigned int config_size;
37 +-unsigned long config_ip;
38 +-unsigned int config_port;
39 +-char *config_server;
40 +-char *config_proxy;
41 ++extern unsigned int config_uin;
42 ++extern char *config_password;
43 ++extern unsigned int config_peer;
44 ++extern char *config_file;
45 ++extern char *config_dir;
46 ++extern unsigned int config_size;
47 ++extern unsigned long config_ip;
48 ++extern unsigned int config_port;
49 ++extern char *config_server;
50 ++extern char *config_proxy;
51 +
52 + int config_read(void);
53 + void config_free(void);
54
55 diff --git a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
56 index f48750979fe..87d39897c0d 100644
57 --- a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
58 +++ b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
59 @@ -33,6 +33,10 @@ RDEPEND="${DEPEND}"
60
61 BUILD_DIR="${S}"
62
63 +PATCHES=(
64 + "${FILESDIR}/${P}-fno-common.patch"
65 +)
66 +
67 DOCS=( AUTHORS ChangeLog NEWS README )
68
69 src_prepare() {