From 95eb709c73c88908b6acc2a77bd27796f3636cd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 15 Aug 2015 23:55:56 +0200 Subject: [PATCH] supertuxkart: unbreak musl + Split data into noarch subpkackage --- srcpkgs/supertuxkart-data | 1 + .../patches/musl_no_sys_sysctl_h.patch | 14 ++++++++++++++ srcpkgs/supertuxkart/patches/musl_valist.patch | 15 +++++++++++++++ srcpkgs/supertuxkart/template | 12 ++++++++++-- 4 files changed, 40 insertions(+), 2 deletions(-) create mode 120000 srcpkgs/supertuxkart-data create mode 100644 srcpkgs/supertuxkart/patches/musl_no_sys_sysctl_h.patch create mode 100644 srcpkgs/supertuxkart/patches/musl_valist.patch diff --git a/srcpkgs/supertuxkart-data b/srcpkgs/supertuxkart-data new file mode 120000 index 0000000000..3737afc6ce --- /dev/null +++ b/srcpkgs/supertuxkart-data @@ -0,0 +1 @@ +supertuxkart \ No newline at end of file diff --git a/srcpkgs/supertuxkart/patches/musl_no_sys_sysctl_h.patch b/srcpkgs/supertuxkart/patches/musl_no_sys_sysctl_h.patch new file mode 100644 index 0000000000..4e926f496b --- /dev/null +++ b/srcpkgs/supertuxkart/patches/musl_no_sys_sysctl_h.patch @@ -0,0 +1,14 @@ +--- lib/irrlicht/source/Irrlicht/COSOperator.cpp 2015-04-21 13:32:20.604208642 +0200 ++++ lib/irrlicht/source/Irrlicht/COSOperator.cpp 2015-08-15 23:29:13.828953039 +0200 +@@ -13,9 +13,11 @@ + #include + #if !defined(_IRR_SOLARIS_PLATFORM_) && !defined(__CYGWIN__) + #include ++#if defined(__GLIBC__) + #include + #endif + #endif ++#endif + + #if defined(_IRR_COMPILE_WITH_X11_DEVICE_) + #include "CIrrDeviceLinux.h" diff --git a/srcpkgs/supertuxkart/patches/musl_valist.patch b/srcpkgs/supertuxkart/patches/musl_valist.patch new file mode 100644 index 0000000000..6bcb64e050 --- /dev/null +++ b/srcpkgs/supertuxkart/patches/musl_valist.patch @@ -0,0 +1,15 @@ +--- src/utils/log.hpp 2015-04-21 13:32:22.936220206 +0200 ++++ src/utils/log.hpp 2015-08-15 23:43:09.392887849 +0200 +@@ -26,10 +26,10 @@ + #include + #include + +-#ifdef __GNUC__ ++#if defined(__GLIBC__) + # define VALIST __gnuc_va_list + #else +-# define VALIST char* ++# define VALIST va_list + #endif + + #if defined(_WIN32) && defined(_MSC_VER) && _MSC_VER < 1800 diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template index 26bf7b1824..4fdc84750c 100644 --- a/srcpkgs/supertuxkart/template +++ b/srcpkgs/supertuxkart/template @@ -1,17 +1,25 @@ # Template file for 'supertuxkart' pkgname=supertuxkart version=0.9 -revision=1 +revision=2 only_for_archs="i686 i686-musl x86_64 x86_64-musl" build_style=cmake hostmakedepends="cmake pkg-config" makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel libopenal-devel fribidi-devel libcurl-devel" -depends="desktop-file-utils hicolor-icon-theme" +depends="desktop-file-utils hicolor-icon-theme supertuxkart-data" short_desc="Kart racing game featuring Tux and his friends" maintainer="Juan RP " license="GPL-2" homepage="http://supertuxkart.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-src.tar.xz" checksum=c0eb24eb49e23ed6d03f4864feb43573e14971c8420bf60c3c654d4e05ff9aa6 + +supertuxkart-data_package() { + short_desc+=" - data files" + noarch=yes + pkg_install() { + vmove usr/share/supertuxkart + } +}