[geany/geany-osx] 92c450: Build lua as part of the plugins build - Commits

6 Mar 2023


      Branch:      refs/heads/master
Author:      Jiří Techet techet@gmail.com
Committer:   Jiří Techet techet@gmail.com
Date:        Mon, 06 Mar 2023 12:20:48 UTC
Commit:      92c4501610b74ce0eb2b22ac8ae9c5d265cc6cbd
             https://github.com/geany/geany-osx/commit/92c4501610b74ce0eb2b22ac8ae9c5d265...
Log Message:
-----------
Build lua as part of the plugins build
Modified Paths:
--------------
    geany.modules
    geany_patches/01-lua51_set_correct_install_prefix.patch
Modified: geany.modules
14 lines changed, 14 insertions(+), 0 deletions(-)
===================================================================
@@ -16,6 +16,8 @@
               href="https://download.geany.org/%22/%3E
   <repository type="tarball" name="files.pythonhosted.org"
               href="https://files.pythonhosted.org/"/>
+  <repository type="tarball" name="lua.org"
+              href="https://www.lua.org/ftp/%22/%3E
<include href="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/modulesets-stable/gtk-osx.modules" />
@@ -57,6 +59,17 @@
             version="1.3.0"/>
   </cmake>
+  <autotools id="lua"
+             makeargs="macosx"
+             skip-autogen="true"
+             supports-non-srcdir-builds="no">
+    <branch repo="lua.org"
+            module="lua-5.1.5.tar.gz"
+            version="5.1.5">
+      <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/01-lua51_set_correct_install_prefix.patch" strip="1" />
+    </branch>
+  </autotools>
+
   <!-- The mac integration library with a fix for radio menu items -->
   <autotools id="gtk-mac-integration-fixed" 
              autogen-sh="configure"
@@ -133,6 +146,7 @@
       <dep package="libgit2" />
       <dep package="hunspell" />
       <dep package="enchant" />
+      <dep package="lua" />
     </dependencies>
   </metamodule>
Modified: geany_patches/01-lua51_set_correct_install_prefix.patch
25 lines changed, 25 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,25 @@
+From 1d2c756ab70d0c29c64b78d2d04beee3723b94e4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= techet@gmail.com
+Date: Mon, 6 Mar 2023 13:12:50 +0100
+Subject: [PATCH] Set correct install prefix
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 209a132..534f995 100644
+--- a/Makefile
++++ b/Makefile
+@@ -9,7 +9,7 @@ PLAT= none
+ 
+ # Where to install. The installation starts in the src and doc directories,
+ # so take care if INSTALL_TOP is not an absolute path.
+-INSTALL_TOP= /usr/local
++INSTALL_TOP= $(PREFIX)
+ INSTALL_BIN= $(INSTALL_TOP)/bin
+ INSTALL_INC= $(INSTALL_TOP)/include
+ INSTALL_LIB= $(INSTALL_TOP)/lib
+-- 
+2.37.5
+
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    