diff options
| -rw-r--r-- | user/supertux/APKBUILD | 6 | ||||
| -rw-r--r-- | user/supertux/zip-header.patch | 30 |
2 files changed, 34 insertions, 2 deletions
diff --git a/user/supertux/APKBUILD b/user/supertux/APKBUILD index f1518855d..035119725 100644 --- a/user/supertux/APKBUILD +++ b/user/supertux/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=supertux pkgver=0.6.3 -pkgrel=0 +pkgrel=1 pkgdesc="Platform game featuring Tux the Penugin" url="https://www.supertux.org/" arch="all" @@ -15,6 +15,7 @@ subpackages="$pkgname-doc" source="https://github.com/SuperTux/supertux/releases/download/v$pkgver/SuperTux-v$pkgver-Source.tar.gz find-sdl2.patch cmake32.patch + zip-header.patch " builddir="$srcdir"/SuperTux-v$pkgver-Source @@ -43,4 +44,5 @@ package() { sha512sums="c6540bab1b3befbd975756031c4587e5569d9613d9539dc829c728b574d1a4da92816d6a7e68947b32963cc13d9b8b52312701c199138640e9f89e5885433798 SuperTux-v0.6.3-Source.tar.gz 9e229d837d8006d618320ef3f7465ef88f8903853ed1ef3e291373d25f8542010f7dad6c1c5859e857db48e1447337ddbed0619228f5eac6aba916b69567fd94 find-sdl2.patch -c0e6cdd52e07e04ef67edc8b7f3d3c37dd2ffd35381b704b43512a01bbd0a5a35fbeae7ec225be8e4643dbcaac3eae427d7ea5217dc1e676f2991ee46f5bf513 cmake32.patch" +c0e6cdd52e07e04ef67edc8b7f3d3c37dd2ffd35381b704b43512a01bbd0a5a35fbeae7ec225be8e4643dbcaac3eae427d7ea5217dc1e676f2991ee46f5bf513 cmake32.patch +038a00697db1533154d1664a58516827d1574c3b79712c72e3bbb92b23943a9ac3a198e20705a7ca470eb34be605d5765ef2a4ebc53694e28543b609a2f2444b zip-header.patch" diff --git a/user/supertux/zip-header.patch b/user/supertux/zip-header.patch new file mode 100644 index 000000000..b02e74d0e --- /dev/null +++ b/user/supertux/zip-header.patch @@ -0,0 +1,30 @@ +From 81809dd5e6f611b1d64d952f6d96310bcc9c5fca Mon Sep 17 00:00:00 2001 +From: Semphris <semphris@protonmail.com> +Date: Fri, 17 Jun 2022 12:36:26 -0400 +Subject: [PATCH] Fix problem with GCC 11 and Partio's ZIP manager (missing + #include <memory>) + +Closes #2219 on GitHub. Same fix, but puts the include closer to the copyright header. +--- + external/partio_zip/zip_manager.hpp | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/external/partio_zip/zip_manager.hpp b/external/partio_zip/zip_manager.hpp +index 666884dda53..245303c76be 100644 +--- a/external/partio_zip/zip_manager.hpp ++++ b/external/partio_zip/zip_manager.hpp +@@ -1,8 +1,12 @@ + // SOURCE: https://github.com/wdas/partio/blob/main/src/lib/io/ZIP.h ++// NOTE: This file was edited for purposes of compatibility with SuperTux. + +-/* ++// This include has been added to fix a problem with GCC 11+ (and maybe 10) ++#include <memory> ++ ++// ============================================================================= + +-NOTE: This file was edited for purposes of compatibility with SuperTux. ++/* + + PARTIO SOFTWARE + Copyright 2010 Disney Enterprises, Inc. All rights reserved |