06/17: gnu: golly: Use system lua.

[Mark H. Weaver]

mhw pushed a commit to branch reproduce-bug-29774
in repository guix.

commit 318a53957532b65199a77877da44980333570959
Author: Mark H Weaver <address@hidden>
Date:   Sun Jan 28 22:35:54 2018 -0500

    gnu: golly: Use system lua.
    
    * gnu/packages/patches/golly-system-lua.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
    * gnu/packages/games.scm (golly)[source]: Add patch and snippet.
    [arguments]: Remove "CC=gcc" from make flags.
    [native-inputs]: Add pkg-config.  Remove lua.
    [inputs]: Add lua-5.2.
---
 gnu/local.mk                                |  1 +
 gnu/packages/games.scm                      | 17 +++++--
 gnu/packages/patches/golly-system-lua.patch | 73 +++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 5 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 4b7612d..b74373d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -752,6 +752,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
   %D%/packages/patches/gobject-introspection-cc.patch          \
   %D%/packages/patches/gobject-introspection-girepository.patch        \
+  %D%/packages/patches/golly-system-lua.patch                  \
   %D%/packages/patches/gpm-glibc-2.26.patch                    \
   %D%/packages/patches/gpsbabel-minizip.patch                  \
   %D%/packages/patches/gpsbabel-qstring.patch                  \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index f1f7625..aa5da46 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2014 Sylvain Beucler <address@hidden>
 ;;; Copyright © 2014, 2015, 2018 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2014, 2015, 2016 Sou Bunnbu <address@hidden>
-;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
+;;; Copyright © 2014, 2015, 2018 Mark H Weaver <address@hidden>
 ;;; Copyright © 2015, 2016 Andreas Enge <address@hidden>
 ;;; Copyright © 2015 David Hashe <address@hidden>
 ;;; Copyright © 2015, 2017 Christopher Allan Webber <address@hidden>
@@ -378,11 +378,17 @@ effects and music to make a completely free game.")
                                   "-src.tar.gz"))
               (sha256
                (base32
-                "0dn74k3rylhx023n047lz4z6qrqijfcxi0b6jryqklhmm2n532f7"))))
+                "0dn74k3rylhx023n047lz4z6qrqijfcxi0b6jryqklhmm2n532f7"))
+              (patches (search-patches "golly-system-lua.patch"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Remove bundled lua.
+                  (delete-file-recursively "lua")
+                  #t))))
     (build-system gnu-build-system)
     (arguments
-     '(#:make-flags (list "CC=gcc"
-                          (string-append "GOLLYDIR="
+     '(#:make-flags (list (string-append "GOLLYDIR="
                                          (assoc-ref %outputs "out")
                                          "/share/golly"))
        #:tests? #f ; no check target
@@ -426,9 +432,10 @@ effects and music to make a completely free game.")
                          '("Help" "Patterns" "Rules" "Scripts")))
              #t)))))
     (native-inputs
-     `(("lua" ,lua)))
+     `(("pkg-config" ,pkg-config)))
     (inputs
      `(("glu" ,glu)
+       ("lua" ,lua-5.2)
        ("mesa" ,mesa)
        ("python" ,python-2)
        ("wxwidgets" ,wxwidgets-gtk2)
diff --git a/gnu/packages/patches/golly-system-lua.patch 
b/gnu/packages/patches/golly-system-lua.patch
new file mode 100644
index 0000000..e0ca71f
--- /dev/null
+++ b/gnu/packages/patches/golly-system-lua.patch
@@ -0,0 +1,73 @@
+Use the system Lua, instead of the bundled one.  Adapted from Fedora.
+<http://pkgs.fedoraproject.org/cgit/rpms/golly.git/tree/golly-2.8-gtk3.patch>
+
+--- golly-3.1-src/gui-wx/makefile-gtk.orig     2017-10-16 18:51:05.000000000 
-0400
++++ golly-3.1-src/gui-wx/makefile-gtk  2017-11-27 18:22:01.252358808 -0500
+@@ -17,7 +17,7 @@
+ DOCSDIR = ../docs
+ BASEDIR = ../gollybase
+ CMDDIR = ../cmdline
+-LUADIR = ../lua
++#LUADIR = ../lua
+ OTHERGUIS = ../gui-android ../gui-common ../gui-ios ../gui-web
+ 
+ # for building binary and source distributions:
+@@ -30,9 +30,9 @@
+ SRCFILES = $(DOCSDIR) $(BASEDIR) $(CMDDIR) $(OTHERGUIS)
+ GUIFILES = makefile-gtk makefile-mac makefile-win local-win-template.mk \
+    golly.rc Info.plist.in wx*.h wx*.cpp configure bitmaps icons
+-LUAFILES = $(LUADIR)/*.h $(LUADIR)/*.c $(LUADIR)/*.hpp $(LUADIR)/Makefile 
$(LUADIR)/ReadMe.html
++#LUAFILES = $(LUADIR)/*.h $(LUADIR)/*.c $(LUADIR)/*.hpp $(LUADIR)/Makefile 
$(LUADIR)/ReadMe.html
+ 
+-LUALIB = $(LUADIR)/liblua.a -ldl
++#LUALIB = $(LUADIR)/liblua.a -ldl
+ 
+ CXXC = g++
+ CXXFLAGS := -DVERSION=$(APP_VERSION) -DGOLLYDIR="$(GOLLYDIR)" \
+@@ -75,6 +75,10 @@
+ PYTHON_SHLIB = `python -c "import distutils.sysconfig; print 
distutils.sysconfig.get_config_var('LDLIBRARY')"`
+ PYTHON_PREFS = -DPYTHON_SHLIB="$(PYTHON_SHLIB)"
+ 
++LUA_INCLUDE = `pkg-config --cflags lua-5.2`
++LUA_LINK = `pkg-config --libs lua-5.2`
++
++
+ # default settings for zlib support, so clear these to build without zlib
+ ZLIB_CXXFLAGS = -DZLIB
+ ZLIB_LDFLAGS = -lz
+@@ -119,11 +123,11 @@
+ clean: 
+       rm -f $(OBJDIR)/*.o
+       rm -f $(EXEDIR)/golly $(EXEDIR)/bgolly $(EXEDIR)/RuleTableToTree
+-      -(cd $(LUADIR) && $(MAKE) clean)
++#     -(cd $(LUADIR) && $(MAKE) clean)
+ 
+-golly: $(OBJDIR) $(BASEOBJ) $(WXOBJ) $(LUALIB)
+-      $(CXXC) $(CXXFLAGS) -o $(EXEDIR)/golly $(BASEOBJ) $(WXOBJ) $(LUALIB) \
+-$(LDFLAGS) $(ZLIB_LDFLAGS) $(EXTRALIBS_OPENGL) $(WX_LDFLAGS) $(PYTHON_LINK) 
$(PERL_LINK) $(IRRKLANG_LINK)
++golly: $(OBJDIR) $(BASEOBJ) $(WXOBJ) # $(LUALIB)
++      $(CXXC) $(CXXFLAGS) -o $(EXEDIR)/golly $(BASEOBJ) $(WXOBJ) \
++$(LDFLAGS) $(ZLIB_LDFLAGS) $(EXTRALIBS_OPENGL) $(WX_LDFLAGS) $(PYTHON_LINK) 
$(PERL_LINK) $(LUA_LINK) $(IRRKLANG_LINK)
+ 
+ bgolly: $(OBJDIR) $(BASEOBJ) $(OBJDIR)/bgolly.o
+       $(CXXC) $(CXXFLAGS) -o $(EXEDIR)/bgolly $(BASEOBJ) $(OBJDIR)/bgolly.o 
$(LDFLAGS) $(ZLIB_LDFLAGS)
+@@ -131,8 +135,8 @@
+ RuleTableToTree: $(OBJDIR) $(BASEOBJ) $(OBJDIR)/RuleTableToTree.o
+       $(CXXC) $(CXXFLAGS) -o $(EXEDIR)/RuleTableToTree $(BASEOBJ) 
$(OBJDIR)/RuleTableToTree.o $(LDFLAGS) $(ZLIB_LDFLAGS)
+ 
+-$(LUALIB):
+-      (cd $(LUADIR) && $(MAKE) all)
++#$(LUALIB):
++#     (cd $(LUADIR) && $(MAKE) all)
+ 
+ $(OBJDIR)/bgolly.o: $(CMDDIR)/bgolly.cpp
+       $(CXXC) $(CXXFLAGS) $(ZLIB_CXXFLAGS) -c -o $@ $(CMDDIR)/bgolly.cpp
+@@ -237,7 +241,7 @@
+       $(CXXC) $(CXXFLAGS) $(WX_CXXFLAGS) -c -o $@ wxrender.cpp
+ 
+ $(OBJDIR)/wxlua.o: wxlua.cpp
+-      $(CXXC) $(CXXFLAGS) $(WX_CXXFLAGS) -I$(LUADIR) -c -o $@ wxlua.cpp
++      $(CXXC) $(CXXFLAGS) $(WX_CXXFLAGS) $(LUA_INCLUDE) -c -o $@ wxlua.cpp
+ 
+ $(OBJDIR)/wxperl.o: wxperl.cpp
+       $(CXXC) $(CXXFLAGS) $(WX_CXXFLAGS) $(PERL_INCLUDE) -c -o $@ wxperl.cpp