diff --git a/srcpkgs/cdogs-sdl/patches/use-system-yajl.patch b/srcpkgs/cdogs-sdl/patches/use-system-yajl.patch deleted file mode 100644 index 93dde5f204e..00000000000 --- a/srcpkgs/cdogs-sdl/patches/use-system-yajl.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/cdogs/yajl_utils.h.orig 2016-03-15 08:17:24.508938965 +0100 -+++ src/cdogs/yajl_utils.h 2016-03-15 08:18:21.256934718 +0100 -@@ -28,7 +28,7 @@ - #include - - #include "vector.h" --#include "yajl/api/yajl_tree.h" -+#include - - - yajl_val YAJLReadFile(const char *filename); ---- src/cdogs/CMakeLists.txt 2016-03-15 08:35:00.996859895 +0100 -+++ src/cdogs/CMakeLists.txt.orig 2016-03-15 08:34:55.824860282 +0100 -@@ -210,7 +210,7 @@ add_library(cdogs STATIC - target_link_libraries(cdogs - json - SDL_joystickbuttonnames -- yajl_s -+ yajl - ${SDL2_LIBRARY} - ${SDL2_IMAGE_LIBRARIES} - ${SDL2_MIXER_LIBRARIES} diff --git a/srcpkgs/cdogs-sdl/template b/srcpkgs/cdogs-sdl/template index f699d14be5b..0142408a598 100644 --- a/srcpkgs/cdogs-sdl/template +++ b/srcpkgs/cdogs-sdl/template @@ -1,26 +1,14 @@ # Template file for 'cdogs' pkgname=cdogs-sdl -version=0.6.3 +version=0.6.4 revision=1 build_style=cmake -makedepends="physfs-devel SDL2-devel SDL2_mixer-devel SDL2_image-devel SDL2_net-devel yajl-devel" +hostmakedepends="pkg-config" +makedepends="physfs-devel SDL2-devel SDL2_mixer-devel SDL2_image-devel SDL2_net-devel" short_desc="A classic overhead run-and-gun game" maintainer="Enno Boland " homepage="http://cxong.github.io/cdogs-sdl/" license="GPL2" distfiles="https://github.com/cxong/cdogs-sdl/archive/$version.tar.gz" -checksum=4497e88be7ef462e1839b4396fccdf880b612074c4091956e39cd86ea15fdd03 +checksum=b65fc1f436098016c1163885a226a66e594dc95f0aa4fac0ada6d72823f28321 configure_args="-DCDOGS_DATA_DIR=/usr/share/cdogs/" - -CFLAGS="-Wno-error=deprecated-declarations" - -pre_configure() { - # Install data to /usr/share/cdogs/ instead of cwd. - sed -i '/^set(INSTALL_PREFIX/ s#.*#set(INSTALL_PREFIX "/usr/share/cdogs/")#' CMakeLists.txt - # Do not build shipped yajl. - sed -i '/add_subdirectory(yajl)/d' src/cdogs/CMakeLists.txt -} - -post_install() { - mv $DESTDIR/usr/share/cdogs/bin $DESTDIR/usr/bin -}