Bug#1060388: sponsor for endless-sky

Hi!

On Wed, Jan 17, 2024 at 12:21 PM P. J. McDermott <[email protected]> wrote:
>
> On 2024-01-17 at 10:22, Bo YU wrote:
> > Hi,
> >
> > First sorry without contacting here before NMU.
>
> Welcome!
>
> > I am looking for a sponsor for my package "endless-sky":
>
> I'm not a DD, but I gave this a look and have a couple comments.
>
> >  * Vcs              : https://salsa.debian.org/games-team/endless-sky
>
> Do you have an account on Salsa?  You could fork the repository and
> submit an MR so that the changes are ready to merge and upload.  If not,
> that's OK; I think the changes are small enough for one of us to just
> commit in one shot.

Thanks.

I have salsa account also and I think I will wait this for one or two
days to see how happened. If there is no DD have time to upload it and
then I will send MR to here.

BR,
Bo
>
> >  endless-sky (0.10.4-0.1) UNRELEASED; urgency=medium
> >  .
> >    * Non-maintainer upload.
> >    * New upstream version 0.10.4. (Closes: #1059987)
> >    * rebase debian/patches
>
> I see out/troff.patch and out/spelling.patch were applied upstream and
> removed from debian/patches/series, but the patch files are still under
> debian/patches/.  They should be removed.
>
> >    * Change Build-Depends on 'cmake' to'cmake (>= 3.21)'.
> >      (Closes: #1054624).
>
> (Coincidentally, seeing this bug on Friday reminded me to do a similar
> cmake B-D version bump in another package.)
>
> Other than the suggestions of Git and removing patch files, this looks
> OK to me for an NMU.  But of course it needs a DD's review (ideally
> Damyan).
>
> Since the changes are apparently not in Git, here's the diff I
> reviewed:
>
>  changelog             |   10 ++++++++++
>  control               |    2 +-
>  patches/atomics.patch |   29 ++++++++++++++++++-----------
>  patches/series        |    2 --
>  4 files changed, 29 insertions(+), 14 deletions(-)
> ---
> diff -Naur endless-sky-0.10.2/debian/changelog endless-sky-0.10.4/debian/changelog
> --- endless-sky-0.10.2/debian/changelog 2023-10-10 10:57:15.000000000 -0400
> +++ endless-sky-0.10.4/debian/changelog 2024-01-07 20:42:17.000000000 -0500
> @@ -1,3 +1,13 @@
> +endless-sky (0.10.4-0.1) UNRELEASED; urgency=medium
> +
> +  * Non-maintainer upload.
> +  * New upstream version 0.10.4. (Closes: #1059987)
> +  * rebase debian/patches
> +  * Change Build-Depends on 'cmake' to'cmake (>= 3.21)'.
> +    (Closes: #1054624).
> +
> + -- Bo YU <[email protected]>  Mon, 08 Jan 2024 09:42:17 +0800
> +
>  endless-sky (0.10.2-6) unstable; urgency=medium
>
>    [ Adrian Bunk ]
> diff -Naur endless-sky-0.10.2/debian/control endless-sky-0.10.4/debian/control
> --- endless-sky-0.10.2/debian/control   2023-10-06 09:23:26.000000000 -0400
> +++ endless-sky-0.10.4/debian/control   2024-01-07 20:42:17.000000000 -0500
> @@ -8,7 +8,7 @@
>  Vcs-Git: https://salsa.debian.org/games-team/endless-sky.git
>  Homepage: https://endless-sky.github.io
>  Build-Depends:
> - cmake,
> + cmake (>= 3.21),
>   debhelper-compat (= 13),
>   g++ (>=4.6),
>   libgl-dev,
> diff -Naur endless-sky-0.10.2/debian/patches/atomics.patch endless-sky-0.10.4/debian/patches/atomics.patch
> --- endless-sky-0.10.2/debian/patches/atomics.patch     2023-10-05 06:08:09.000000000 -0400
> +++ endless-sky-0.10.4/debian/patches/atomics.patch     2024-01-07 20:42:17.000000000 -0500
> @@ -1,17 +1,24 @@
> -Description: link with libatomic
> - On armel and mipsel, there are a bunch of missing __atomic_load_8 symbols
> - during linking
> - .
> - These are provided by libatomic and that is even in the build-dependencies,
> - but is missing on the linker command line.
> - .
> - The right spot to add it is a bit tricky, appending it to SConstrict near
> - 'pthread' doesn't seem to have any effect, but adding to CMakeLists.txt works.
> -Author: Damyan Ivanov <[email protected]>
> +From: Damyan Ivanov <[email protected]>
> +Date: Mon, 8 Jan 2024 07:21:47 +0800
> +Subject: link with libatomic
>
> +On armel and mipsel, there are a bunch of missing __atomic_load_8 symbols
> +during linking
> +
> +These are provided by libatomic and that is even in the build-dependencies,
> +but is missing on the linker command line.
> +
> +The right spot to add it is a bit tricky, appending it to SConstrict near
> +'pthread' doesn't seem to have any effect, but adding to CMakeLists.txt works.
> +---
> + CMakeLists.txt | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index fa0903a..d7807e9 100644
>  --- a/CMakeLists.txt
>  +++ b/CMakeLists.txt
> -@@ -123,7 +123,7 @@ target_link_libraries(ExternalLibraries
> +@@ -125,7 +125,7 @@ target_link_libraries(ExternalLibraries INTERFACE SDL2::SDL2 PNG::PNG JPEG::JPEG
>   if(WIN32)
>         target_link_libraries(ExternalLibraries INTERFACE rpcrt4 Winmm)
>   else()
> diff -Naur endless-sky-0.10.2/debian/patches/series endless-sky-0.10.4/debian/patches/series
> --- endless-sky-0.10.2/debian/patches/series    2023-10-05 02:53:48.000000000 -0400
> +++ endless-sky-0.10.4/debian/patches/series    2024-01-07 20:42:17.000000000 -0500
> @@ -1,3 +1 @@
> -out/troff.patch
> -out/spelling.patch
>  atomics.patch
> --
> Patrick "P. J." McDermott:  http://www.pehjota.net/
> Lead Developer, ProteanOS:  http://www.proteanos.com/
> Founder and CEO, Libiquity: http://www.libiquity.com/
>