Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages / blobwars
Commits: a6a14f64 by Antonio Rojas at 2024-09-07T15:35:47+02:00 upgpkg: 2.00-5: Rebuild for missing .SRCINFO - - - - - 3 changed files: - + .SRCINFO - PKGBUILD - + blobwars-2.00-dont-override-strlcat.patch Changes: ===================================== .SRCINFO ===================================== @@ -0,0 +1,23 @@ +pkgbase = blobwars + pkgdesc = Platform action game featuring a blob wih lot of weapons + pkgver = 2.00 + pkgrel = 5 + url = https://sourceforge.net/projects/blobwars + arch = x86_64 + license = GPL + makedepends = sdl2_image + makedepends = sdl2_mixer + makedepends = sdl2_ttf + makedepends = sdl2_net + source = https://downloads.sourceforge.net/project/blobwars/blobwars-2.00.tar.gz + source = blobwars-2.00-dont-override-strlcat.patch + sha256sums = c406279f6cdf2aed3c6edb8d8be16efeda0217494acd525f39ee2bd3e77e4a99 + sha256sums = a0763d23b1572a1a07e43f8b0f2fed4f2f6289cf0243ee1fef2e4eecf774e055 + +pkgname = blobwars + depends = hicolor-icon-theme + depends = sdl2_image + depends = sdl2_mixer + depends = sdl2_ttf + depends = sdl2_net + depends = blobwars-data>=2.0 ===================================== PKGBUILD ===================================== @@ -5,14 +5,16 @@ pkgname=blobwars pkgver=2.00 -pkgrel=4 +pkgrel=5 pkgdesc="Platform action game featuring a blob wih lot of weapons" arch=('x86_64') url="https://sourceforge.net/projects/blobwars"; license=('GPL') makedepends=('sdl2_image' 'sdl2_mixer' 'sdl2_ttf' 'sdl2_net') -source=(https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('c406279f6cdf2aed3c6edb8d8be16efeda0217494acd525f39ee2bd3e77e4a99') +source=(https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz + blobwars-2.00-dont-override-strlcat.patch) +sha256sums=('c406279f6cdf2aed3c6edb8d8be16efeda0217494acd525f39ee2bd3e77e4a99' + 'a0763d23b1572a1a07e43f8b0f2fed4f2f6289cf0243ee1fef2e4eecf774e055') prepare() { cd blobwars-${pkgver} @@ -23,6 +25,8 @@ prepare() { -e 's/cp -p /install -m644 /g' Makefile # Don't use -Werror sed -e 's|-Werror||' -i Makefile + # Fix build (Fedora) + patch -p1 -i ../blobwars-2.00-dont-override-strlcat.patch } build() { ===================================== blobwars-2.00-dont-override-strlcat.patch ===================================== @@ -0,0 +1,22 @@ +Stop providing / overriding strlcat and strlcpy to fix the following compile errors: + +src/headers.h:60:20: error: ambiguating new declaration of 'void strlcat(char*, const char*, size_t)' + 60 | static inline void strlcat(char *dest, const char *src, size_t n) { strncat(dest, src, n - 1); } + | ^~~~~~~ + +src/headers.h:61:20: error: ambiguating new declaration of 'void strlcpy(char*, const char*, size_t)' + 61 | static inline void strlcpy(char *dest, const char *src, size_t n) { strncpy(dest, src, n); dest[n - 1] = 0; } + | ^~~~~~~ + +diff -up blobwars-2.00/src/headers.h~ blobwars-2.00/src/headers.h +--- blobwars-2.00/src/headers.h 2015-11-21 23:18:19.000000000 +0100 ++++ blobwars-2.00/src/headers.h 2023-07-28 22:25:36.655085088 +0200 +@@ -56,7 +56,7 @@ extern DECLSPEC int SDLCALL SDL_GetGamma + #define textdomain(x) while(false) + #endif + +-#if !defined(OpenBSD) && !defined(FreeBSD) && !defined(__APPLE__) ++#if 0 && !defined(OpenBSD) && !defined(FreeBSD) && !defined(__APPLE__) + static inline void strlcat(char *dest, const char *src, size_t n) { strncat(dest, src, n - 1); } + static inline void strlcpy(char *dest, const char *src, size_t n) { strncpy(dest, src, n); dest[n - 1] = 0; } + #endif View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/blobwars/-/commit/a6a14f64c90ffa0e2cb9b11f324d5f6a2795bfc1 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/blobwars/-/commit/a6a14f64c90ffa0e2cb9b11f324d5f6a2795bfc1 You're receiving this email because of your account on gitlab.archlinux.org.
