[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/16: gnu: fifengine: Fix build with newer Swig and Python.
From: |
guix-commits |
Subject: |
03/16: gnu: fifengine: Fix build with newer Swig and Python. |
Date: |
Sat, 14 Mar 2020 07:03:53 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 5afffbeffc931d00074e570f5ec89df8a1ebe568
Author: Marius Bakke <address@hidden>
AuthorDate: Fri Mar 13 20:31:27 2020 +0100
gnu: fifengine: Fix build with newer Swig and Python.
* gnu/packages/patches/fifengine-swig-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/games.scm (fifengine)[source](patches): New field.
[arguments]: Remove hard coded Python version from #:configure-flags.
---
gnu/local.mk | 1 +
gnu/packages/games.scm | 5 ++++-
gnu/packages/patches/fifengine-swig-compat.patch | 17 +++++++++++++++++
3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index f2e323c..47279ff 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -868,6 +868,7 @@ dist_patch_DATA =
\
%D%/packages/patches/fasthenry-spSolve.patch \
%D%/packages/patches/fasthenry-spFactor.patch \
%D%/packages/patches/fbreader-curl-7.62.patch \
+ %D%/packages/patches/fifengine-swig-compat.patch \
%D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \
%D%/packages/patches/fifo-map-remove-catch.hpp.patch \
%D%/packages/patches/findutils-localstatedir.patch \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index e7764cc..43199d2 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2280,6 +2280,7 @@ Widgets, and allows users to create more.")
(uri (string-append "https://codeload.github.com/fifengine/"
"fifengine/tar.gz/" version))
(file-name (string-append name "-" version ".tar.gz"))
+ (patches (search-patches "fifengine-swig-compat.patch"))
(sha256
(base32
"1y4grw25cq5iqlg05rnbyxw1njl11ypidnlsm3qy4sm3xxdvb0p8"))))
@@ -2296,7 +2297,9 @@ Widgets, and allows users to create more.")
"/include/AL")
(string-append "-DPYTHON_SITE_PACKAGES="
(assoc-ref %outputs "out")
- "/lib/python3.7/site-packages"))
+ "/lib/python"
+ ,(version-major+minor (package-version python))
+ "/site-packages"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-run_tests.py
diff --git a/gnu/packages/patches/fifengine-swig-compat.patch
b/gnu/packages/patches/fifengine-swig-compat.patch
new file mode 100644
index 0000000..85cd05f
--- /dev/null
+++ b/gnu/packages/patches/fifengine-swig-compat.patch
@@ -0,0 +1,17 @@
+Fix build failure when using Swig 4.
+
+Taken from upstream:
+https://github.com/fifengine/fifengine/commit/d14f232f4cd9a00b05d6872957070e8c020f515d
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -893,7 +893,7 @@ if(build-python)
+ find_package(PythonLibs ${PYTHON_VERSION_STRING} EXACT)
+ include_directories(${PYTHON_INCLUDE_PATH})
+
+- set(CMAKE_SWIG_FLAGS -modern -fastdispatch -dirvtable -nosafecstrings
-noproxydel -fastproxy -fastinit -fastunpack -fastquery -modernargs
-nobuildnone -keyword -w511 -w473 -w404 -w314)
++ set(CMAKE_SWIG_FLAGS -modern -fastdispatch -dirvtable -noproxydel
-fastproxy -fastinit -fastunpack -fastquery -modernargs -keyword -w511 -w473
-w404 -w314)
+
+ set_source_files_properties("${PROJECT_BINARY_DIR}/fife.i" PROPERTIES
CPLUSPLUS ON)
+ set(FIFE_SOURCES ${FIFE_CORE_SRC})
- branch core-updates updated (11a5ffb -> 7cf79d7), guix-commits, 2020/03/14
- 01/16: gnu: wesnoth: Remove obsolete workaround., guix-commits, 2020/03/14
- 02/16: gnu: libtorrent-rasterbar: Build with Python 3., guix-commits, 2020/03/14
- 06/16: gnu: LibUV: Update to 1.35.0., guix-commits, 2020/03/14
- 04/16: gnu: c-ares: Update to 1.16.0., guix-commits, 2020/03/14
- 05/16: gnu: cURL: Update to 7.69.1., guix-commits, 2020/03/14
- 03/16: gnu: fifengine: Fix build with newer Swig and Python.,
guix-commits <=
- 09/16: gnu: pcre: Update to 8.44., guix-commits, 2020/03/14
- 12/16: gnu: gimp: Do not run gtk-update-icon-cache during the build process., guix-commits, 2020/03/14
- 10/16: gnu: jbig2dec: Update to 0.18., guix-commits, 2020/03/14
- 11/16: gnu: ghostscript: Update to 9.51., guix-commits, 2020/03/14
- 07/16: gnu: icu4c: Update to 66.1., guix-commits, 2020/03/14
- 08/16: gnu: libuninameslist: Update to 20200313., guix-commits, 2020/03/14
- 13/16: gnu: innoextract: Fix build failure with recent Boost and CMake., guix-commits, 2020/03/14
- 14/16: gnu: log4cpp: Fix build with glibc 2.31., guix-commits, 2020/03/14
- 15/16: gnu: mit-krb5: Fix segfault in gsasl test suite., guix-commits, 2020/03/14
- 16/16: gnu: kiki: Adjust for CPLUS_INCLUDE_PATH change., guix-commits, 2020/03/14