<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/febd53ca2b881198c8a76f56322f293884b28906">https://github.com/macports/macports-ports/commit/febd53ca2b881198c8a76f56322f293884b28906</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new febd53c hedgewars: update to 0.9.23
</span>febd53c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit febd53ca2b881198c8a76f56322f293884b28906
</span>Author: kencu <ken.cunningham.webuse@gmail.com>
AuthorDate: Fri Dec 22 16:59:12 2017 -0800
<span style='display:block; white-space:pre;color:#404040;'> hedgewars: update to 0.9.23
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> rearrange patches for new version
</span><span style='display:block; white-space:pre;color:#404040;'> use Macports lua51 and phyfs
</span><span style='display:block; white-space:pre;color:#404040;'> disable server as our ghc won't build this version
</span><span style='display:block; white-space:pre;color:#404040;'> at the present time, at least
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/55335
</span>---
games/hedgewars/Portfile | 82 ++++++++++++----------
.../patch-0001-avwrapper-avframealloc-fix.diff | 29 --------
.../files/patch-0002-LibavInteraction-fix.diff | 13 ----
...0003-proj-hwc-CMakeLists-proper-link-flags.diff | 11 ---
.../patch-0005-remove-haskell-spec-constr.diff | 12 ----
...f => patch-CMakeLists-delete-clang-search.diff} | 14 ++--
... patch-remove-hardcoded-stdlib-QTfrontend.diff} | 8 ---
7 files changed, 51 insertions(+), 118 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/hedgewars/Portfile b/games/hedgewars/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ffacec3..450b3c4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/hedgewars/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/hedgewars/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup conflicts_build 1.0
</span>
name hedgewars
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.9.22
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.9.23
</span> categories games
platforms darwin
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,39 +15,48 @@ description Funny turn-based artillery game, featuring fighting Hedg
</span> long_description ${description}
homepage https://www.hedgewars.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://www.hedgewars.org/download/releases/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}/download/releases/
</span> use_bzip2 yes
distname ${name}-src-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 359fd026643e69446121b94ba301646812353c19 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b699c8971ff420c3edd6533527ae2e99040f1e79207c9140826945bcf0e62192
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 25919e6d8d170d2873e32ebacbe3811526edbd10 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 da2e4908042be56d1c0f3cb80a355bde7f0a49f675b050a03228cc3fb22aae89 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 173042171
</span>
depends_build-append port:pkgconfig \
port:ghc \
port:hs-vector \
port:hs-bytestring-show \
port:hs-network \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:hs-dataenc \
</span> port:hs-hslogger \
port:hs-utf8-string \
port:hs-sha \
port:hs-entropy \
port:hs-zlib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:hs-random
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hs-random \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hs-conduit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hs-regex-tdfa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hs-mtl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hs-sandi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hs-dataenc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append path:bin/ffmpeg:ffmpeg \
port:libogg \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl_image \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl_ttf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl_mixer \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl_net \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2_image \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2_ttf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2_mixer \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2_net \
</span> port:zlib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpng \
</span> port:glew \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qt4-mac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freeglut \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qt4-mac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lua51 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:physfs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# /opt/local/include/keybinder.h:27:10: fatal error: 'glib.h' file not found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts_build keybinder
</span>
# don't use the sparkle selfupdate mechanism; use macports update process instead
configure.args-append -DNOAUTOUPDATE=1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,34 +64,33 @@ configure.args-append -DNOAUTOUPDATE=1
</span> # don't add all of the macports support libraries into the app bundle
configure.args-append -DSKIPBUNDLE:BOOL=ON
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# use MacPorts lua51
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DLUA_SYSTEM:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DLUA_LIBRARY=${prefix}/lib/lua-5.1/liblua-5.1.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DLUA_INCLUDE_DIR=${prefix}/include/lua-5.1/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use MacPorts physfs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DPHYSFS_SYSTEM:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DPHYSFS_LIBRARY=${prefix}/lib/libphysfs.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DPHYSFS_INCLUDE_DIR=${prefix}/include/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append -DQT_QMAKE_EXECUTABLE:FILEPATH=${prefix}/libexec/qt4/bin/qmake
# use the pas2c converter to compile the pascal portions rather than fpc
configure.args-append -DBUILD_ENGINE_C:BOOL=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# update two source files to enable building against the current ffmpeg variable and procedure names
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-0001-avwrapper-avframealloc-fix.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-0002-LibavInteraction-fix.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the authours of this game have hardcoded the c++ library in several places and this needs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# to be deleted for proper linking to the supporting dependencies on macports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# replace the hard-coded link to libstdc++ in the hwc engine build script with proper link flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-0003-proj-hwc-CMakeLists-proper-link-flags.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# remove the hard-coded link to libstdc++ in QTfrontend build script with proper link flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-0004-remove-hardcoded-stdlib-and-iokit-QTfrontend.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# don't build server - it won't build in v 0.9.23 at present
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DNOSERVER:BOOL=ON
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# lan server build fails unless this haskell optimization flag is disabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# probably due to excessive recursion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-0005-remove-haskell-spec-constr.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# remove the hard-coded link to libstdc++ in QTfrontend build script
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-remove-hardcoded-stdlib-QTfrontend.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# remove clang search and compiler ID override which overrides cmake's compiler declarations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-0006-CMakeLists-delete-clang-search.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# remove clang search and compiler ID override which messes everything up during the build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-CMakeLists-delete-clang-search.diff
</span>
post-destroot {
move ${destroot}${workpath}/build/Hedgewars.app ${destroot}${applications_dir}/Hedgewars.app
move ${worksrcpath}/man/hedgewars.6 ${destroot}${prefix}/share/man/man6/hedgewars.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url https://www.hedgewars.org/download.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url ${homepage}/download.html
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/hedgewars/files/patch-0001-avwrapper-avframealloc-fix.diff b/games/hedgewars/files/patch-0001-avwrapper-avframealloc-fix.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 92249c3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/hedgewars/files/patch-0001-avwrapper-avframealloc-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./hedgewars/avwrapper/avwrapper.c.orig 2017-01-09 19:45:35.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./hedgewars/avwrapper/avwrapper.c 2017-01-09 19:53:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -158,7 +158,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_NumSamples = g_pAudio->frame_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_pSamples = (int16_t*)av_malloc(g_NumSamples*g_Channels*sizeof(int16_t));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- g_pAFrame = avcodec_alloc_frame();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_pAFrame = av_frame_alloc();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!g_pAFrame)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Log("Could not allocate frame\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -241,7 +241,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_pVideo->time_base.den = g_Framerate.num;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_pVideo->time_base.num = g_Framerate.den;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //g_pVideo->gop_size = 12; /* emit one intra frame every twelve frames at most */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- g_pVideo->pix_fmt = PIX_FMT_YUV420P;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_pVideo->pix_fmt = AV_PIX_FMT_YUV420P;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // set quality
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (g_VQuality > 100)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -299,7 +299,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return FatalError("Could not open video codec %s", g_pVCodec->long_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- g_pVFrame = avcodec_alloc_frame();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_pVFrame = av_frame_alloc();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!g_pVFrame)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return FatalError("Could not allocate frame");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/hedgewars/files/patch-0002-LibavInteraction-fix.diff b/games/hedgewars/files/patch-0002-LibavInteraction-fix.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index edf8e5c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/hedgewars/files/patch-0002-LibavInteraction-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./QTfrontend/util/LibavInteraction.cpp.orig 2015-10-31 13:36:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./QTfrontend/util/LibavInteraction.cpp 2017-01-09 19:54:54.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -106,8 +106,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!pCodec->pix_fmts)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool yuv420Supported = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (const PixelFormat* pfmt = pCodec->pix_fmts; *pfmt != -1; pfmt++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (*pfmt == PIX_FMT_YUV420P)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (const AVPixelFormat* pfmt = pCodec->pix_fmts; *pfmt != -1; pfmt++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (*pfmt == AV_PIX_FMT_YUV420P)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- yuv420Supported = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/hedgewars/files/patch-0003-proj-hwc-CMakeLists-proper-link-flags.diff b/games/hedgewars/files/patch-0003-proj-hwc-CMakeLists-proper-link-flags.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d29744c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/hedgewars/files/patch-0003-proj-hwc-CMakeLists-proper-link-flags.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./project_files/hwc/CMakeLists.txt.orig 2017-01-12 10:18:31.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./project_files/hwc/CMakeLists.txt 2017-01-12 10:18:39.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,7 +95,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #TODO: add other libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- target_link_libraries(hwengine IOKit SDLmain)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_link_libraries(hwengine ${CMAKE_CXX_FLAGS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/hwengine${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION ${target_binary_install_dir})
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/hedgewars/files/patch-0005-remove-haskell-spec-constr.diff b/games/hedgewars/files/patch-0005-remove-haskell-spec-constr.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ec5366f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/hedgewars/files/patch-0005-remove-haskell-spec-constr.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./gameServer/CMakeLists.txt.orig 2017-01-14 18:02:03.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./gameServer/CMakeLists.txt 2017-01-14 18:03:02.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -61,7 +61,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -o ${EXECUTABLE_OUTPUT_PATH}/hedgewars-server${CMAKE_EXECUTABLE_SUFFIX}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -odir ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -hidir ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${haskell_flags})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${haskell_flags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -fno-spec-constr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_custom_command(OUTPUT "${EXECUTABLE_OUTPUT_PATH}/hedgewars-server${CMAKE_EXECUTABLE_SUFFIX}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND "${GHC_EXECUTABLE}"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/hedgewars/files/patch-0006-CMakeLists-delete-clang-search.diff b/games/hedgewars/files/patch-CMakeLists-delete-clang-search.diff
</span>similarity index 63%
rename from games/hedgewars/files/patch-0006-CMakeLists-delete-clang-search.diff
rename to games/hedgewars/files/patch-CMakeLists-delete-clang-search.diff
<span style='display:block; white-space:pre;color:#808080;'>index ffda570..ed5d3db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/hedgewars/files/patch-0006-CMakeLists-delete-clang-search.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/hedgewars/files/patch-CMakeLists-delete-clang-search.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2017-06-20 19:46:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2017-06-20 19:47:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,19 +126,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2017-11-18 23:59:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2017-11-19 00:01:36.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -157,17 +157,6 @@
</span> endif()
-#build engine without freepascal
<span style='display:block; white-space:pre;background:#ffe0e0;'>--if(BUILD_ENGINE_C)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(BUILD_ENGINE_C AND NOT BUILD_ENGINE_JS)
</span> - find_package(Clang REQUIRED)
-
- if(${CLANG_VERSION} VERSION_LESS "3.0")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,8 +15,6 @@
</span> - set(CMAKE_C_COMPILER ${CLANG_EXECUTABLE})
- set(CMAKE_CXX_COMPILER ${CLANG_EXECUTABLE})
-endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #server
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT NOSERVER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(gameServer)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/hedgewars/files/patch-0004-remove-hardcoded-stdlib-and-iokit-QTfrontend.diff b/games/hedgewars/files/patch-remove-hardcoded-stdlib-QTfrontend.diff
</span>similarity index 52%
rename from games/hedgewars/files/patch-0004-remove-hardcoded-stdlib-and-iokit-QTfrontend.diff
rename to games/hedgewars/files/patch-remove-hardcoded-stdlib-QTfrontend.diff
<span style='display:block; white-space:pre;color:#808080;'>index 957c621..e58bcbc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/hedgewars/files/patch-0004-remove-hardcoded-stdlib-and-iokit-QTfrontend.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/hedgewars/files/patch-remove-hardcoded-stdlib-QTfrontend.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,5 @@
</span> --- ./QTfrontend/CMakeLists.txt.orig 2017-01-12 08:51:40.000000000 -0800
+++ ./QTfrontend/CMakeLists.txt 2017-01-12 08:52:31.000000000 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -171,7 +171,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_library(iokit_framework NAMES IOKit)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- list(APPEND HW_LINK_LIBS ${iokit_framework})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND hwfr_src util/platform/CocoaInitializer.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- util/platform/InstallController.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- util/platform/M3Panel.mm
</span> @@ -221,10 +220,6 @@
)
endif()
</pre><pre style='margin:0'>
</pre>