GNU bug report logs -
#53035
[PATCH] gnu: supertux: Update to 0.6.3.
Previous Next
Reported by: Felix Gruber <felgru <at> posteo.net>
Date: Wed, 5 Jan 2022 19:17:02 UTC
Severity: normal
Tags: patch
Done: Leo Famulari <leo <at> famulari.name>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 53035 in the body.
You can then email your comments to 53035 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org
:
bug#53035
; Package
guix-patches
.
(Wed, 05 Jan 2022 19:17:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Felix Gruber <felgru <at> posteo.net>
:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org
.
(Wed, 05 Jan 2022 19:17:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/games.scm (supertux): Update to 0.6.3.
[inputs] Sort list and add glm.
* gnu/packages/patches/supertux-unbundle-squirrel.patch: Update patch.
---
gnu/packages/games.scm | 23 ++++++++++---------
.../patches/supertux-unbundle-squirrel.patch | 17 ++++++++------
2 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index d884df588a..0dbc444aba 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5442,7 +5442,7 @@ with the \"Stamp\" tool within Tux Paint.")
(define-public supertux
(package
(name "supertux")
- (version "0.6.2")
+ (version "0.6.3")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/SuperTux/supertux/"
@@ -5451,7 +5451,7 @@ with the \"Stamp\" tool within Tux Paint.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "167m3z4m8n76dvbv42m1fnvabpbpsxvr28zk9641916jl9pfba96"))
+ "1xkr3ka2sxp5s0spp84iv294i29s1vxqzazb6kmjc0n415h0x57p"))
(patches
(search-patches "supertux-unbundle-squirrel.patch"))))
(arguments
@@ -5471,18 +5471,19 @@ with the \"Stamp\" tool within Tux Paint.")
(string-append "${SQUIRREL_PREFIX}/include/squirrel"))))
#t)))))
(build-system cmake-build-system)
- (inputs (list sdl2
- sdl2-image
- sdl2-mixer
- openal
- mesa
+ (inputs (list glm
+ boost
+ curl
+ freetype
glew
- libvorbis
libogg
+ libvorbis
+ mesa
+ openal
physfs
- curl
- boost
- freetype
+ sdl2
+ sdl2-image
+ sdl2-mixer
squirrel))
(native-inputs
(list pkg-config))
diff --git a/gnu/packages/patches/supertux-unbundle-squirrel.patch b/gnu/packages/patches/supertux-unbundle-squirrel.patch
index 054183b75f..f504aacfdd 100644
--- a/gnu/packages/patches/supertux-unbundle-squirrel.patch
+++ b/gnu/packages/patches/supertux-unbundle-squirrel.patch
@@ -1,9 +1,8 @@
-diff -ur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2019-05-24 17:58:19.693090158 -0400
-+++ b/CMakeLists.txt 2019-05-24 17:57:43.349473252 -0400
-@@ -375,44 +375,15 @@
-
- include(ConfigureChecks)
+--- a/CMakeLists.txt 2022-01-05 18:51:17.828392874 +0100
++++ b/CMakeLists.txt 2022-01-05 18:54:50.826717830 +0100
+@@ -487,48 +487,15 @@
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/ppc)
+ endif()
-
-## Also build external/squirrel
@@ -15,6 +14,9 @@ diff -ur a/CMakeLists.txt b/CMakeLists.txt
set(SQUIRREL_PREFIX ${CMAKE_BINARY_DIR}/squirrel/ex)
-ExternalProject_Add(squirrel
- SOURCE_DIR "${CMAKE_SOURCE_DIR}/external/squirrel/"
+- BUILD_BYPRODUCTS
+- "${SQUIRREL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}sqstdlib_static${CMAKE_STATIC_LIBRARY_SUFFIX}"
+- "${SQUIRREL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}squirrel_static${CMAKE_STATIC_LIBRARY_SUFFIX}"
- CMAKE_ARGS
- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
@@ -22,7 +24,8 @@ diff -ur a/CMakeLists.txt b/CMakeLists.txt
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${SQUIRREL_PREFIX}
-- -DINSTALL_INC_DIR=include)
+- -DINSTALL_INC_DIR=include
+- -DCMAKE_POSITION_INDEPENDENT_CODE=ON)
-
-if(WIN32)
- add_library(squirrel_lib SHARED IMPORTED)
--
2.30.2
Information forwarded
to
guix-patches <at> gnu.org
:
bug#53035
; Package
guix-patches
.
(Wed, 05 Jan 2022 19:34:01 GMT)
Full text and
rfc822 format available.
Message #8 received at 53035 <at> debbugs.gnu.org (full text, mbox):
On Wed, Jan 05, 2022 at 07:16:11PM +0000, Felix Gruber wrote:
> * gnu/packages/games.scm (supertux): Update to 0.6.3.
> [inputs] Sort list and add glm.
> * gnu/packages/patches/supertux-unbundle-squirrel.patch: Update patch.
Can you clarify how the patch is updated? Do you mean that it's been
adjusted to changes in supertux 0.6.3.?
Information forwarded
to
guix-patches <at> gnu.org
:
bug#53035
; Package
guix-patches
.
(Wed, 05 Jan 2022 20:21:02 GMT)
Full text and
rfc822 format available.
Message #11 received at 53035 <at> debbugs.gnu.org (full text, mbox):
On 1/5/22 20:33, Leo Famulari wrote:
> On Wed, Jan 05, 2022 at 07:16:11PM +0000, Felix Gruber wrote:
>> * gnu/packages/games.scm (supertux): Update to 0.6.3.
>> [inputs] Sort list and add glm.
>> * gnu/packages/patches/supertux-unbundle-squirrel.patch: Update patch.
>
> Can you clarify how the patch is updated? Do you mean that it's been
> adjusted to changes in supertux 0.6.3.?
Yes, some of the removed lines in the patch were slightly changed in
supertux 0.6.3, so I had to make some small adjustments so that the
patch could cleanly apply to 0.6.3.
Reply sent
to
Leo Famulari <leo <at> famulari.name>
:
You have taken responsibility.
(Wed, 05 Jan 2022 20:53:02 GMT)
Full text and
rfc822 format available.
Notification sent
to
Felix Gruber <felgru <at> posteo.net>
:
bug acknowledged by developer.
(Wed, 05 Jan 2022 20:53:02 GMT)
Full text and
rfc822 format available.
Message #16 received at 53035-done <at> debbugs.gnu.org (full text, mbox):
On Wed, Jan 05, 2022 at 08:20:43PM +0000, Felix Gruber wrote:
> Yes, some of the removed lines in the patch were slightly changed in
> supertux 0.6.3, so I had to make some small adjustments so that the patch
> could cleanly apply to 0.6.3.
Thanks for the clarification.
I amended the commit message and re-sorted the inputs (glm was out of
order) and pushed as 707acc4cfb5e965fe471cd77220c16e25f986a5c
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org
.
(Thu, 03 Feb 2022 12:24:06 GMT)
Full text and
rfc822 format available.
This bug report was last modified 2 years and 74 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.