From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 10BD315808D for ; Thu, 21 Apr 2022 23:21:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D788E0928; Thu, 21 Apr 2022 23:21:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 683DEE092C for ; Thu, 21 Apr 2022 23:20:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F05D9341DF3 for ; Thu, 21 Apr 2022 23:20:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 270E13B3 for ; Thu, 21 Apr 2022 23:20:49 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1650583235.5a170689c47562cb74f84575d42bd542cfc78fa7.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libsfml/, media-libs/libsfml/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libsfml/files/libsfml-2.5.1-musl-1.2.3-nullptr.patch media-libs/libsfml/libsfml-2.5.1.ebuild X-VCS-Directories: media-libs/libsfml/files/ media-libs/libsfml/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5a170689c47562cb74f84575d42bd542cfc78fa7 X-VCS-Branch: master Date: Thu, 21 Apr 2022 23:20:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 14e56c78-e672-43cb-9bd1-bcd3fda12b87 X-Archives-Hash: 4c41fe76349cecd7a5b30475e129e90e commit: 5a170689c47562cb74f84575d42bd542cfc78fa7 Author: Sam James gentoo org> AuthorDate: Thu Apr 21 23:20:35 2022 +0000 Commit: Sam James gentoo 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 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(NULL)); ++ reinterpret_cast(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