Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tclxml/, dev-tcltk/tclxml/files/
Date: Thu, 24 Dec 2020 16:08:27
Message-Id: 1608826091.250380cdb85131d3aa4d4961c594ba78b5af9be4.tupone@gentoo
1 commit: 250380cdb85131d3aa4d4961c594ba78b5af9be4
2 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 24 16:07:27 2020 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 24 16:08:11 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=250380cd
7
8 dev-tcltk/tclxml: undefine bool
9
10 Closes: https://bugs.gentoo.org/760159
11 Package-Manager: Portage-3.0.9, Repoman-3.0.2
12 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
13
14 dev-tcltk/tclxml/files/tclxml-3.2.7-bool.patch | 26 ++++++++++++++++++++++++++
15 dev-tcltk/tclxml/tclxml-3.2.7.ebuild | 1 +
16 2 files changed, 27 insertions(+)
17
18 diff --git a/dev-tcltk/tclxml/files/tclxml-3.2.7-bool.patch b/dev-tcltk/tclxml/files/tclxml-3.2.7-bool.patch
19 new file mode 100644
20 index 00000000000..8d29180f082
21 --- /dev/null
22 +++ b/dev-tcltk/tclxml/files/tclxml-3.2.7-bool.patch
23 @@ -0,0 +1,26 @@
24 +--- a/tclxml.c 2020-12-24 16:58:20.051675497 +0100
25 ++++ b/tclxml.c 2020-12-24 16:58:49.586185021 +0100
26 +@@ -20,6 +20,10 @@
27 + #include <tclxslt/tclxslt.h>
28 + #include <string.h>
29 +
30 ++#ifdef bool
31 ++#undef bool
32 ++#endif
33 ++
34 + int Tcldom_libxml2_Init ( Tcl_Interp *interp );
35 +
36 + #define TCL_DOES_STUBS \
37 +--- a/tclxslt-libxslt.c 2020-12-24 16:59:07.004895777 +0100
38 ++++ b/tclxslt-libxslt.c 2020-12-24 16:59:46.280243657 +0100
39 +@@ -20,6 +20,10 @@
40 + #include <libxslt/imports.h>
41 + #include <libxslt/security.h>
42 +
43 ++#ifdef bool
44 ++#undef bool
45 ++#endif
46 ++
47 + #undef TCL_STORAGE_CLASS
48 + #define TCL_STORAGE_CLASS DLLEXPORT
49 +
50
51 diff --git a/dev-tcltk/tclxml/tclxml-3.2.7.ebuild b/dev-tcltk/tclxml/tclxml-3.2.7.ebuild
52 index af6d475303e..454695c0e26 100644
53 --- a/dev-tcltk/tclxml/tclxml-3.2.7.ebuild
54 +++ b/dev-tcltk/tclxml/tclxml-3.2.7.ebuild
55 @@ -28,6 +28,7 @@ RESTRICT="test"
56
57 PATCHES=(
58 "${FILESDIR}"/${PN}-3.2-fix-implicit-declarations.patch
59 + "${FILESDIR}"/${P}-bool.patch
60 )
61
62 src_configure() {