[PR PATCH] SFML: update to 2.6.1

[PR PATCH] SFML: update to 2.6.1

[ChrisMalnick]

[-- Attachment #1: Type: text/plain, Size: 1185 bytes --]

There is a new pull request by ChrisMalnick against master on the void-packages repository

https://github.com/ChrisMalnick/void-packages master
https://github.com/void-linux/void-packages/pull/47454

SFML: update to 2.6.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):


A patch file from https://github.com/void-linux/void-packages/pull/47454.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-47454.patch --]
[-- Type: text/x-diff, Size: 7008 bytes --]

From 57f8fba9973dd9f31a5f60d3e8119b30a1e4544c Mon Sep 17 00:00:00 2001
From: Chris Malnick <chrismalnick@yahoo.com>
Date: Mon, 27 Nov 2023 19:12:03 -0500
Subject: [PATCH 1/7] SFML: update to 2.6.1

---
 srcpkgs/SFML/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/SFML/template b/srcpkgs/SFML/template
index 66009b130482f..75f43b1bacdd5 100644
--- a/srcpkgs/SFML/template
+++ b/srcpkgs/SFML/template
@@ -1,19 +1,19 @@
 # Template file for 'SFML'
 pkgname=SFML
-version=2.5.1
-revision=3
+version=2.6.1
+revision=1
 build_style=cmake
 configure_args="-DSFML_BUILD_EXAMPLES=0 -DSFML_BUILD_DOC=1 -DSFML_INSTALL_PKGCONFIG_FILES=1"
 hostmakedepends="doxygen"
 makedepends="libsndfile-devel libXrandr-devel libjpeg-turbo-devel
  libopenal-devel glew-devel freetype-devel MesaLib-devel glu-devel
- xcb-util-image-devel"
+ xcb-util-image-devel libXcursor-devel"
 short_desc="Simple and Fast Multimedia Library"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Zlib"
 homepage="http://www.sfml-dev.org/"
 distfiles="https://github.com/SFML/SFML/archive/${version}.tar.gz"
-checksum=438c91a917cc8aa19e82c6f59f8714da353c488584a007d401efac8368e1c785
+checksum=82535db9e57105d4f3a8aedabd138631defaedc593cab589c924b7d7a11ffb9d
 
 post_install() {
 	rm -f ${DESTDIR}/usr/sfml-*.pc
@@ -26,7 +26,7 @@ SFML-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/share/SFML
+		vmove usr/share/doc/SFML
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 	}

From daafbd978df40b635018b4468db3a093b105a818 Mon Sep 17 00:00:00 2001
From: Chris Malnick <chrismalnick@yahoo.com>
Date: Mon, 27 Nov 2023 19:14:01 -0500
Subject: [PATCH 2/7] SFML: update to 2.6.1

---
 ...95ac20866fcecc93e33cda457b3fe54b1b0c.patch | 26 -------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 srcpkgs/SFML/patches/119195ac20866fcecc93e33cda457b3fe54b1b0c.patch

diff --git a/srcpkgs/SFML/patches/119195ac20866fcecc93e33cda457b3fe54b1b0c.patch b/srcpkgs/SFML/patches/119195ac20866fcecc93e33cda457b3fe54b1b0c.patch
deleted file mode 100644
index 606280379a884..0000000000000
--- a/srcpkgs/SFML/patches/119195ac20866fcecc93e33cda457b3fe54b1b0c.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Upstream: yes
-Src: https://github.com/SFML/SFML/commit/119195ac20866fcecc93e33cda457b3fe54b1b0c.patch
-Reason: error: invalid cast from type 'std::nullptr_t' to type 'void*
-
-From 119195ac20866fcecc93e33cda457b3fe54b1b0c Mon Sep 17 00:00:00 2001
-From: Dmitry Marakasov <amdmi3@amdmi3.ru>
-Date: Tue, 16 Oct 2018 18:08:13 +0300
-Subject: [PATCH] Remove unneeded cast
-
----
- src/SFML/Window/Unix/WindowImplX11.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/SFML/Window/Unix/WindowImplX11.cpp b/src/SFML/Window/Unix/WindowImplX11.cpp
-index da69750525..5f538f46d6 100644
---- a/src/SFML/Window/Unix/WindowImplX11.cpp
-+++ b/src/SFML/Window/Unix/WindowImplX11.cpp
-@@ -1556,7 +1556,7 @@ void WindowImplX11::initialize()
-                                    m_window,
-                                    XNInputStyle,
-                                    XIMPreeditNothing | XIMStatusNothing,
--                                   reinterpret_cast<void*>(NULL));
-+                                   NULL);
-     }
-     else
-     {

From 58481476deef17f3ba4e91d6c005e123711c0118 Mon Sep 17 00:00:00 2001
From: Chris Malnick <chrismalnick@yahoo.com>
Date: Mon, 27 Nov 2023 19:19:14 -0500
Subject: [PATCH 3/7] SFML: update to 2.6.1

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 90018a5616f86..29571fd408cd9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2223,7 +2223,7 @@ libwebsockets.so.19 libwebsockets-4.3.2_1
 libnfc.so.6 libnfc-1.8.0_1
 libfuzzy.so.2 libfuzzy-2.12_1
 libSDL_gfx.so.15 SDL_gfx-2.0.25_2
-libsfml-network.so.2.5 SFML-2.5.0_1
+libsfml-network.so.2.6 SFML-2.6.1_1
 libsfml-system.so.2.5 SFML-2.5.0_1
 libsfml-window.so.2.5 SFML-2.5.0_1
 libsfml-audio.so.2.5 SFML-2.5.0_1

From a4d98f2f0d09019f25b21774fd4e2681c0ef648a Mon Sep 17 00:00:00 2001
From: Chris Malnick <chrismalnick@yahoo.com>
Date: Mon, 27 Nov 2023 19:19:50 -0500
Subject: [PATCH 4/7] SFML: update to 2.6.1

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 29571fd408cd9..4ad09e9b474da 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2224,7 +2224,7 @@ libnfc.so.6 libnfc-1.8.0_1
 libfuzzy.so.2 libfuzzy-2.12_1
 libSDL_gfx.so.15 SDL_gfx-2.0.25_2
 libsfml-network.so.2.6 SFML-2.6.1_1
-libsfml-system.so.2.5 SFML-2.5.0_1
+libsfml-system.so.2.6 SFML-2.6.1_1
 libsfml-window.so.2.5 SFML-2.5.0_1
 libsfml-audio.so.2.5 SFML-2.5.0_1
 libsfml-graphics.so.2.5 SFML-2.5.0_1

From ed920e4e30ab933804fa6117c68133cbff780116 Mon Sep 17 00:00:00 2001
From: Chris Malnick <chrismalnick@yahoo.com>
Date: Mon, 27 Nov 2023 19:20:36 -0500
Subject: [PATCH 5/7] SFML: update to 2.6.1

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 4ad09e9b474da..9f1242dc589da 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2225,7 +2225,7 @@ libfuzzy.so.2 libfuzzy-2.12_1
 libSDL_gfx.so.15 SDL_gfx-2.0.25_2
 libsfml-network.so.2.6 SFML-2.6.1_1
 libsfml-system.so.2.6 SFML-2.6.1_1
-libsfml-window.so.2.5 SFML-2.5.0_1
+libsfml-window.so.2.6 SFML-2.6.1_1
 libsfml-audio.so.2.5 SFML-2.5.0_1
 libsfml-graphics.so.2.5 SFML-2.5.0_1
 libclamav.so.9 clamav-0.103.1_2

From 8e8872b15dab850b7ef2381ae02c83ca3d9b159e Mon Sep 17 00:00:00 2001
From: Chris Malnick <chrismalnick@yahoo.com>
Date: Mon, 27 Nov 2023 19:21:00 -0500
Subject: [PATCH 6/7] SFML: update to 2.6.1

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 9f1242dc589da..cfa6744d8eac5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2226,7 +2226,7 @@ libSDL_gfx.so.15 SDL_gfx-2.0.25_2
 libsfml-network.so.2.6 SFML-2.6.1_1
 libsfml-system.so.2.6 SFML-2.6.1_1
 libsfml-window.so.2.6 SFML-2.6.1_1
-libsfml-audio.so.2.5 SFML-2.5.0_1
+libsfml-audio.so.2.6 SFML-2.6.1_1
 libsfml-graphics.so.2.5 SFML-2.5.0_1
 libclamav.so.9 clamav-0.103.1_2
 libclamunrar.so.9 clamav-0.103.1_2

From 4f55dc516af5994f29ee5f28288cbd2c77bddc61 Mon Sep 17 00:00:00 2001
From: Chris Malnick <chrismalnick@yahoo.com>
Date: Mon, 27 Nov 2023 19:21:27 -0500
Subject: [PATCH 7/7] SFML: update to 2.6.1

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index cfa6744d8eac5..b4f0f03b88237 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2227,7 +2227,7 @@ libsfml-network.so.2.6 SFML-2.6.1_1
 libsfml-system.so.2.6 SFML-2.6.1_1
 libsfml-window.so.2.6 SFML-2.6.1_1
 libsfml-audio.so.2.6 SFML-2.6.1_1
-libsfml-graphics.so.2.5 SFML-2.5.0_1
+libsfml-graphics.so.2.6 SFML-2.6.1_1
 libclamav.so.9 clamav-0.103.1_2
 libclamunrar.so.9 clamav-0.103.1_2
 libclamunrar_iface.so.9 clamav-0.103.1_2

Re: SFML: update to 2.6.1

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 862 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/47454#issuecomment-1829646322

Comment:
Please squash all the `SFML: update to 2.6.1` commits into a single one.

Furthermore if a pacakge update bumps a so versions, all the packages that using this library have to be recompiled. (`xrevshlib` in the `xtools` pacakge is a handy tool to list all reverse dependencies that link against a package)

You can also use the `xrevbump` script in the same pacakge to increase the revison of multiple templates at the same time.

E.g. for this update you would run the following command to increase the revision of all the templates linking against any of the `libsfml-*.so.*` libraries

`xrevbump "rebuild against SFML-2.6.1" CSFML Cendric EmptyEpsilon SLADE TSC attract deerportal dolphin-emu etr vba-m`

Re: [PR PATCH] [Closed]: SFML: update to 2.6.1

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 944 bytes --]

There's a closed pull request on the void-packages repository

SFML: update to 2.6.1
https://github.com/void-linux/void-packages/pull/47454

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc

Re: [PR PATCH] [Closed]: SFML: update to 2.6.1

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 893 bytes --]

There's a closed pull request on the void-packages repository

SFML: update to 2.6.1
https://github.com/void-linux/void-packages/pull/47595

Description:
First-time contribution attempt. Previous version 2.5.1 in `void-packages` is over 5 years old. This one is very recent from 30th October.

#### Removed 1 patch:

No longer needed, the fix is already in the 2.6.1 sources.

#### Testing the changes
I tested the changes in this PR: **briefly**.

- Compiled / built,
- installed,
- did pre-install hooks,
- ~~then `pkg_install` step complains: `cannot stat '/destdir//SFML-2.6.1/usr/share/SFML': No such file or directory`~~
  - resolved now, the whole `./xbps-src pkg SFML` run succeeds. Also tried `i686` and `armv6l` out of curiosity, same.

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc, plus also `-a armv6l` and `-a i686`.