commit: 5a170689c47562cb74f84575d42bd542cfc78fa7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Apr 21 23:20:35 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Apr 21 23:20:35 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a170689
media-libs/libsfml: fix build with musl 1.2.3 Closes: https://bugs.gentoo.org/839639 Signed-off-by: Sam James <sam <AT> gentoo.org> .../libsfml/files/libsfml-2.5.1-musl-1.2.3-nullptr.patch | 14 ++++++++++++++ media-libs/libsfml/libsfml-2.5.1.ebuild | 6 +++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/media-libs/libsfml/files/libsfml-2.5.1-musl-1.2.3-nullptr.patch b/media-libs/libsfml/files/libsfml-2.5.1-musl-1.2.3-nullptr.patch new file mode 100644 index 000000000000..dc26ba285e17 --- /dev/null +++ b/media-libs/libsfml/files/libsfml-2.5.1-musl-1.2.3-nullptr.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/839639 +https://github.com/SFML/SFML/commit/c9f7cb3d525a995912fc62507802f3f265de2728.patch +https://git.alpinelinux.org/aports/plain/community/sfml/musl-1.2.3.patch +--- a/src/SFML/Window/Unix/WindowImplX11.cpp ++++ b/src/SFML/Window/Unix/WindowImplX11.cpp +@@ -1556,7 +1556,7 @@ + m_window, + XNInputStyle, + XIMPreeditNothing | XIMStatusNothing, +- reinterpret_cast<void*>(NULL)); ++ reinterpret_cast<void*>(0)); + } + else + { diff --git a/media-libs/libsfml/libsfml-2.5.1.ebuild b/media-libs/libsfml/libsfml-2.5.1.ebuild index d7a9017536bd..8131a7a919d6 100644 --- a/media-libs/libsfml/libsfml-2.5.1.ebuild +++ b/media-libs/libsfml/libsfml-2.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -41,6 +41,10 @@ DOCS=( changelog.md readme.md ) S="${WORKDIR}/SFML-${PV}" +PATCHES=( + "${FILESDIR}"/${P}-musl-1.2.3-nullptr.patch +) + src_prepare() { sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \ doc/CMakeLists.txt || die
