diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
| commit | 752d6256e5204b958b0ef7905675a940b5e9172f (patch) | |
| tree | 330d16e6362a49cbed8875a777fe641a43376cd3 /media-libs/libsfml | |
| parent | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff) | |
gentoo resync : 12.05.2022
Diffstat (limited to 'media-libs/libsfml')
| -rw-r--r-- | media-libs/libsfml/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/libsfml/files/libsfml-2.5.1-musl-1.2.3-nullptr.patch | 14 | ||||
| -rw-r--r-- | media-libs/libsfml/libsfml-2.5.1.ebuild | 6 |
3 files changed, 21 insertions, 2 deletions
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest index 9dacd4a76da0..b2956db08d88 100644 --- a/media-libs/libsfml/Manifest +++ b/media-libs/libsfml/Manifest @@ -1,3 +1,4 @@ +AUX libsfml-2.5.1-musl-1.2.3-nullptr.patch 626 BLAKE2B dac65018937df6088b5f44f57678b6acde4f67a4f03180428374f26c7248181058185bce053bb79fdd4d4044c6369740daed5db95f803965d2b15a3250bedd1c SHA512 76535c8d01f21cc32df1c66ba1567356737a9c14b73be1c03606305f905d31a615759054b60fbf3347a57d3b24ab9b3978c96f898262000fe4c58af697b7dac7 DIST libsfml-2.5.1.tar.gz 22868556 BLAKE2B b6c70b75a778ffeb141438153fb1e5693c3e92e277919b8f8befe98f55dfd519a67c86504bb5656961b947fcf60758b16a18d5a4ae7585c7c5256f327529ae31 SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59 -EBUILD libsfml-2.5.1.ebuild 1508 BLAKE2B 328a493cfb7af830c186fc74c4a04f5b873608e21792bd6a5aa7f47efc0ef87461665c1866b5741a8018459efd236a22f5d97845e84256cab3dcbdf0f1681104 SHA512 6aed973829b0a14545900247993707489c76011f808a717f0b8411e9e33bf129f6f19c8d16ad6650340e718daf4a2b22af995c266f4268cdfee7832eae442d95 +EBUILD libsfml-2.5.1.ebuild 1566 BLAKE2B 19ca987a73fb2fedca0c7e8918a52c26b1c3ffff5992fade729b2474efd13b0c82d09e2b11fe3b9d81a05818b261b9c6feaca63704fefddf7469bee1c22f8185 SHA512 2d671cbe31f649d14ed1c37dacb924c6fe6e2b454d9d46ec386733f02a39fd2a4a8e4fed148679e7cced185c4bc3e9b1c8426298d7a1aacb5b59e81c1ea9dd23 MISC metadata.xml 733 BLAKE2B c5b2bf1cea8b01c89531f68544f8b82dc3f8b8e26327ec868cf2ce1beabd6b1b0e977ad4a5dd3cdcbe3ae0fd66930f0c411023d77f9c4a5f7464d90209fa6f6d SHA512 ffb4954d9d55f0ab147c8ef2d5e970ef728b0dd1ad78f04aac16346583a9b858d3861f6f3bfe0940ca4b41c23abf8904bf3e0160d347d9e007efa047e663ccda 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 |