From 529d5e300dfa7b08237f5d01c7d3cc4fea4968d8 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Wed, 25 Jul 2018 19:14:07 +0200 Subject: [PATCH] yquake2: update to 7.21, adopt package (#1189) --- srcpkgs/yquake2/patches/musl.patch | 32 +++++++----------------------- srcpkgs/yquake2/template | 8 ++++---- 2 files changed, 11 insertions(+), 29 deletions(-) diff --git a/srcpkgs/yquake2/patches/musl.patch b/srcpkgs/yquake2/patches/musl.patch index dce15350442..adf7ef6642f 100644 --- a/srcpkgs/yquake2/patches/musl.patch +++ b/srcpkgs/yquake2/patches/musl.patch @@ -1,29 +1,11 @@ ---- src/backends/unix/signalhandler.c.orig 2015-05-31 13:02:37.500133271 +0200 -+++ src/backends/unix/signalhandler.c 2015-05-31 13:02:54.932317118 +0200 -@@ -28,14 +28,13 @@ - - #include - --#ifdef __linux__ -+#if defined(__linux__) && defined(__GLIBC__) - #include - #endif +--- src/backends/unix/signalhandler.c 2018-07-25 17:01:58.664525692 +0200 ++++ src/backends/unix/signalhandler.c 2018-07-25 17:02:13.880526068 +0200 +@@ -34,7 +34,7 @@ #include "../../common/header/common.h" --#ifdef __linux__ -- -+#if defined(__linux__) && defined(__GLIBC__) - void - printBacktrace(int sig) - { ---- src/backends/unix/system.c -+++ src/backends/unix/system.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include +-#if defined(__linux__) || defined(__FreeBSD__) ++#if defined(__linux__) && defined(__GLIBC__) || defined(__FreeBSD__) + #include - #ifdef __APPLE__ - #include + void diff --git a/srcpkgs/yquake2/template b/srcpkgs/yquake2/template index 4d6cb020ae0..3d9f7490087 100644 --- a/srcpkgs/yquake2/template +++ b/srcpkgs/yquake2/template @@ -1,7 +1,7 @@ # Template file for 'yquake2' pkgname=yquake2 -version=7.20 -revision=2 +version=7.21 +revision=1 wrksrc="quake2-${version}" build_style=gnu-makefile make_build_args="WITH_SYSTEMWIDE=yes WITH_SYSTEMDIR=/usr/lib/${pkgname}" @@ -10,11 +10,11 @@ hostmakedepends="pkg-config" makedepends="SDL2-devel libjpeg-turbo-devel libopenal-devel zlib-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="An enhanced client for id Software's Quake II (Yamagi Quake II)" -maintainer="Juan RP " +maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://www.yamagi.org/quake2/" distfiles="https://deponie.yamagi.org/quake2/quake2-${version}.tar.xz" -checksum=64136239ba08747ddfe7c18c17f87a9cd3730cd4a867b6e438eee9f34415a0ad +checksum=3e7c428bb2aacbc3ada9950b9e14fc599d0a054f9eedcdac55a4bff4efef5ea5 case "$XBPS_TARGET_MACHINE" in armv*) makedepends+=" MesaLib-devel";;