From: metaleap <metaleap@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] SFML: update to 2.6.1
Date: Tue, 05 Dec 2023 13:22:11 +0100 [thread overview]
Message-ID: <20231205122211.42fj_Ucf5vmLmyRJudbWxeQRGQAuE7VlG-lJ4wFiEKg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-47595@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1140 bytes --]
There is an updated pull request by metaleap against master on the void-packages repository
https://github.com/go-forks/void-packages master
https://github.com/void-linux/void-packages/pull/47595
SFML: update to 2.6.1
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` —
- looks like a borked path to me with the //
- the only `-- Installing: /destdir/SFML-2.6.1/usr/share/...` steps were for `doc/*`.
- **Could someone more-experienced in all this** teach me (verbally or in commit =) what's missing here?
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc.
A patch file from https://github.com/void-linux/void-packages/pull/47595.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-47595.patch --]
[-- Type: text/x-diff, Size: 4233 bytes --]
From ab2c26d24d1201143dd115361641e395c9df63d3 Mon Sep 17 00:00:00 2001
From: Phil Schumann <metaleap@users.noreply.github.com>
Date: Tue, 5 Dec 2023 11:24:38 +0100
Subject: [PATCH] SFML: update to 2.6.1
Previous version 2.5.1 in `void-packages` is over 5 years old. This one is very recent from 30th October.
---
common/shlibs | 10 +++----
...95ac20866fcecc93e33cda457b3fe54b1b0c.patch | 26 -------------------
srcpkgs/SFML/template | 12 ++++-----
3 files changed, 11 insertions(+), 37 deletions(-)
delete mode 100644 srcpkgs/SFML/patches/119195ac20866fcecc93e33cda457b3fe54b1b0c.patch
diff --git a/common/shlibs b/common/shlibs
index 1b25a12956eeb..b38c3c70ec5fd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2223,11 +2223,11 @@ 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-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
-libsfml-graphics.so.2.5 SFML-2.5.0_1
+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.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
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
- {
diff --git a/srcpkgs/SFML/template b/srcpkgs/SFML/template
index 66009b130482f..ee094c496cbc0 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 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
@@ -21,12 +21,12 @@ post_install() {
SFML-devel_package() {
depends="SFML>=${version}_${revision} libopenal-devel libsndfile-devel
- freetype-devel"
+ freetype-devel libXcursor-devel"
short_desc+=" - development files"
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"
}
next prev parent reply other threads:[~2023-12-05 12:22 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-05 11:07 [PR PATCH] " metaleap
2023-12-05 11:35 ` [PR PATCH] [Updated] " metaleap
2023-12-05 11:44 ` Johnnynator
2023-12-05 12:22 ` metaleap [this message]
2023-12-05 12:28 ` metaleap
2023-12-05 12:29 ` metaleap
2023-12-05 12:29 ` metaleap
2023-12-05 12:34 ` metaleap
2023-12-05 12:52 ` [PR PATCH] [Updated] " metaleap
2023-12-05 12:55 ` metaleap
2023-12-05 12:55 ` metaleap
2023-12-05 12:56 ` metaleap
2023-12-05 12:56 ` metaleap
2023-12-05 13:15 ` metaleap
2023-12-05 16:26 ` metaleap
2023-12-05 23:22 ` [PR PATCH] [Closed]: " Johnnynator
2023-12-05 23:24 ` Johnnynator
2023-12-06 7:27 ` metaleap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231205122211.42fj_Ucf5vmLmyRJudbWxeQRGQAuE7VlG-lJ4wFiEKg@z \
--to=metaleap@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).