From 1ca50ad0de8eaf682d6b213d08ec2e5d1480d841 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 16 Jan 2018 15:27:25 +0100 Subject: [PATCH] gdash: update to 20180104. --- srcpkgs/gdash/patches/fix-includes.patch | 24 ++++++++++++++++++++++++ srcpkgs/gdash/template | 15 ++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 srcpkgs/gdash/patches/fix-includes.patch diff --git a/srcpkgs/gdash/patches/fix-includes.patch b/srcpkgs/gdash/patches/fix-includes.patch new file mode 100644 index 00000000000..f88821e54f9 --- /dev/null +++ b/srcpkgs/gdash/patches/fix-includes.patch @@ -0,0 +1,24 @@ +--- src/main.cpp.orig 2018-01-16 15:16:49.734345298 +0100 ++++ src/main.cpp 2018-01-16 15:16:53.344330897 +0100 +@@ -35,7 +35,7 @@ + /* on windows, sdl does some hack on the main function. + * therefore we need to include this file, even if it seems + * to do nothing. */ +-#include ++#include + #endif + + #include "cave/caveset.hpp" +--- src/sound/sound.cpp.orig 2018-01-04 08:29:26.000000000 +0100 ++++ src/sound/sound.cpp 2018-01-16 15:19:51.462620349 +0100 +@@ -23,8 +23,8 @@ + #include "config.h" + + #ifdef HAVE_SDL +- #include +- #include ++ #include ++ #include + #endif + + #include diff --git a/srcpkgs/gdash/template b/srcpkgs/gdash/template index 710d6089808..d9d70795da8 100644 --- a/srcpkgs/gdash/template +++ b/srcpkgs/gdash/template @@ -1,11 +1,11 @@ # Template file for 'gdash' pkgname=gdash -version=20130427 +version=20180104 revision=1 wrksrc=${pkgname}-${version}unstable build_style=gnu-configure -hostmakedepends="automake libtool gettext-devel glib-devel gtk+-devel SDL-devel pkg-config" -makedepends="glu-devel gtk+-devel SDL_image-devel SDL_mixer-devel" +hostmakedepends="gettext-devel glib-devel gtk+-devel SDL2-devel pkg-config" +makedepends="glu-devel gtk+-devel SDL2_image-devel SDL2_mixer-devel" depends="gdash-data>=${version}_${revision}" configure_args="--with-sdl-prefix=${XBPS_CROSS_BASE}/usr" @@ -14,20 +14,13 @@ maintainer="Jürgen Buchmüller " license="MIT" homepage="https://bitbucket.org/czirkoszoltan/gdash" distfiles="https://bitbucket.org/czirkoszoltan/${pkgname}/downloads/${pkgname}-${version}unstable.tar.gz" -checksum="e50d18bcd0d08fcfd07a6a213f7e93be5e56154214de83623f6247ca6e98ac21" +checksum=a4cfa99b74253837b9dc9d7a6f759e59f96f8e976031b557182cd160498482a1 if [ -n "$CROSS_BUILD" ]; then # Make sure SDL_opengl.h finds GL/gl.h CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include" fi -pre_configure() { - mv configure.{in,ac} - sed -i Makefile.am -e "/ACLOCAL_AMFLAGS = -Im4/a AUTOMAKE_OPTIONS = subdir-objects" - sed -i src/Makefile.am -e "1a AUTOMAKE_OPTIONS = subdir-objects" - autoreconf -if -} - pre_build() { if [ "$CROSS_BUILD" ]; then cd ${wrksrc}/include