diff options
| author |   Jakov Smolic <jakov.smolic@sartura.hr> | 2020-05-25 10:09:56 +0200 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2020-06-17 20:00:25 +0300 |
| commit | c7e9406d31735f3eebac889d3326fa96f690317f (patch) | |
| tree | 51b943587c67e88862beac0f5c47b72321d7f7e3 /media-gfx/mypaint | |
| parent | media-libs/opencollada: Version bump to 1.6.68 (diff) | |
| download | gentoo-c7e9406d31735f3eebac889d3326fa96f690317f.tar.gz gentoo-c7e9406d31735f3eebac889d3326fa96f690317f.tar.bz2 gentoo-c7e9406d31735f3eebac889d3326fa96f690317f.zip | |
media-gfx/mypaint: fix build failure
The added patch fixes build failure caused by missing boolean definition when building with new json-c versions.
Closes: https://bugs.gentoo.org/721388
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
Closes: https://github.com/gentoo/gentoo/pull/15959
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'media-gfx/mypaint')
| -rw-r--r-- | media-gfx/mypaint/files/mypaint-1.2.1-json-c-boolean-defs.patch | 34 | ||||
| -rw-r--r-- | media-gfx/mypaint/mypaint-1.2.1-r5.ebuild | 3 |
2 files changed, 37 insertions, 0 deletions
diff --git a/media-gfx/mypaint/files/mypaint-1.2.1-json-c-boolean-defs.patch b/media-gfx/mypaint/files/mypaint-1.2.1-json-c-boolean-defs.patch new file mode 100644 index 000000000000..caa2df4de6ee --- /dev/null +++ b/media-gfx/mypaint/files/mypaint-1.2.1-json-c-boolean-defs.patch @@ -0,0 +1,34 @@ +commit a2b3f56b347c1897454eac1b5bdfe9d228302b80 +Author: Jehan <jehan@girinstud.io> +Date: Sat Jan 26 12:50:31 2019 +0100 + + Boolean #define-s removed from json-c in 2017. + + We don't need to #undef TRUE and FALSE before including json.h as this + redefinition has been removed in upstream json-c. + See json-c commit 0992aac61f8b087efd7094e9ac2b84fa9c040fcd. + + Note that it still works even if using an older json-c since the + original code was alreadying #undef-ing these 2 values before redefining + them. So that was anyway useless code and this change should work both + with old or new json-c. + + Note: the previous code was still working fine when building on Linux, + but not when cross-compiling on Windows. But this is the correct fix + anyway. + + (cherry picked from commit f4fd97445d3b6843af57ff8ba5f02cbdeb3942e9) + +diff --git a/brushlib/mypaint-brush.c b/mypaint-brush.c +index 4759d11..7a1380c 100644 +--- a/brushlib/mypaint-brush.c ++++ b/brushlib/mypaint-brush.c +@@ -35,9 +35,6 @@ + #include "rng-double.h" + + #ifdef HAVE_JSON_C +-// Allow the C99 define from json.h +-#undef TRUE +-#undef FALSE + #include <json.h> + #endif // HAVE_JSON_C diff --git a/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild b/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild index ed192d39fbdb..4c5a1859342c 100644 --- a/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild +++ b/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild @@ -41,6 +41,9 @@ DEPEND="${RDEPEND} dev-lang/swig virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/${P}-json-c-boolean-defs.patch" +) pkg_setup() { python-single-r1_pkg_setup |