Attachment 875954 Details for Bug 1077756 – Build with system lua instead of bundled one

[patch] Build with system lua instead of bundled one

Build-with-system-lua-instead-of-bundled-one.patch (text/plain), 5.66 KB, created by Ville Skyttä on 2014-03-18 14:10:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-03-18 14:10:33 UTC

Size: 5.66 KB

patch

obsolete

>From cc53b4794124b5a2096499c2ef328d4a9593e588 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Tue, 18 Mar 2014 16:07:41 +0200
>Subject: [PATCH] Build with system lua instead of bundled one
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1077756
>---
> freedroidrpg-0.15.1-lua51.patch | 59 +++++++++++++++++++++++++++++++++++++++++
> freedroidrpg.spec               | 19 +++++++++++--
> 2 files changed, 76 insertions(+), 2 deletions(-)
> create mode 100644 freedroidrpg-0.15.1-lua51.patch
>
>diff --git a/freedroidrpg-0.15.1-lua51.patch b/freedroidrpg-0.15.1-lua51.patch
>new file mode 100644
>index 0000000..6d9f7a8
>--- /dev/null
>+++ b/freedroidrpg-0.15.1-lua51.patch
>@@ -0,0 +1,59 @@
>+diff -up freedroidrpg-0.15.1/configure~ freedroidrpg-0.15.1/configure
>+--- freedroidrpg-0.15.1/configure~	2012-03-17 18:31:39.000000000 +0200
>++++ freedroidrpg-0.15.1/configure	2014-03-18 16:01:46.285933907 +0200
>+@@ -5480,12 +5480,12 @@ if test -n "$LUA_CFLAGS"; then
>+     pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
>+  elif test -n "$PKG_CONFIG"; then
>+     if test -n "$PKG_CONFIG" && \
>+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
>+-  ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
>++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
>++  ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
>+   ac_status=$?
>+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
>+   test $ac_status = 0; }; then
>+-  pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1" 2>/dev/null`
>++  pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1" 2>/dev/null`
>+ else
>+   pkg_failed=yes
>+ fi
>+@@ -5496,12 +5496,12 @@ if test -n "$LUA_LIBS"; then
>+     pkg_cv_LUA_LIBS="$LUA_LIBS"
>+  elif test -n "$PKG_CONFIG"; then
>+     if test -n "$PKG_CONFIG" && \
>+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
>+-  ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
>++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
>++  ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
>+   ac_status=$?
>+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
>+   test $ac_status = 0; }; then
>+-  pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1" 2>/dev/null`
>++  pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1" 2>/dev/null`
>+ else
>+   pkg_failed=yes
>+ fi
>+@@ -5521,9 +5521,9 @@ else
>+         _pkg_short_errors_supported=no
>+ fi
>+         if test $_pkg_short_errors_supported = yes; then
>+-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua5.1 >= 5.1" 2>&1`
>++	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua-5.1 >= 5.1" 2>&1`
>+         else
>+-	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua5.1 >= 5.1" 2>&1`
>++	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua-5.1 >= 5.1" 2>&1`
>+         fi
>+ 	# Put the nasty error message in config.log where it belongs
>+ 	echo "$LUA_PKG_ERRORS" >&5
>+diff -up freedroidrpg-0.15.1/m4/lua.m4~ freedroidrpg-0.15.1/m4/lua.m4
>+--- freedroidrpg-0.15.1/m4/lua.m4~	2012-03-16 15:42:17.000000000 +0200
>++++ freedroidrpg-0.15.1/m4/lua.m4	2014-03-18 16:00:40.366532461 +0200
>+@@ -38,7 +38,7 @@ AC_DEFUN([KYUA_LUA], [
>+     PKG_CHECK_MODULES([LUA], [lua >= 5.1], [lua_found=yes], [true])
>+ 
>+     if test "${lua_found}" = no; then
>+-        PKG_CHECK_MODULES([LUA], [lua5.1 >= 5.1], [lua_found=yes], [true])
>++        PKG_CHECK_MODULES([LUA], [lua-5.1 >= 5.1], [lua_found=yes], [true])
>+     fi
>+ 
>+     if test "${lua_found}" = no; then
>diff --git a/freedroidrpg.spec b/freedroidrpg.spec
>index da52e18..6d26d34 100644
>--- a/freedroidrpg.spec
>+++ b/freedroidrpg.spec
>@@ -1,6 +1,6 @@
> Name:           freedroidrpg
> Version:        0.15.1
>-Release:        6%{?dist}
>+Release:        7%{?dist}
> Summary:        Role playing game with Freedroid theme and Tux as the hero
> 
> Group:          Amusements/Games
>@@ -8,6 +8,8 @@ License:        GPLv2+
> URL:            http://freedroid.sourceforge.net/
> Source0:        http://downloads.sourceforge.net/freedroid/freedroidRPG-%{version}.tar.gz
> Source1:        %{name}.desktop
>+# for compat-lua-devel
>+Patch0:         %{name}-0.15.1-lua51.patch
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires:  SDL_image-devel
>@@ -22,6 +24,12 @@ BuildRequires:  libvorbis-devel
> BuildRequires:  desktop-file-utils
> BuildRequires:  libGLU-devel
> BuildRequires:  gettext
>+# Need lua 5.1
>+%if 0%{?fedora} < 20
>+BuildRequires:  lua-devel
>+%else
>+BuildRequires:  compat-lua-devel
>+%endif
> Requires:       freedroidrpg-data = %{version}-%{release}
> Requires(post): coreutils
> Requires(postun): coreutils
>@@ -41,6 +49,10 @@ Data files for the freedroidrpg game.
> 
> %prep
> %setup -q
>+%patch0 -p1 -b .lua51
>+touch -r configure.lua51 configure
>+touch -r m4/lua.m4.lua51 m4/lua.m4
>+rm -r lua
> 
> # Update the timestamp to avoid unnecessarily running configure
> touch -r configure.ac aclocal.m4
>@@ -95,6 +107,9 @@ fi
> 
> 
> %changelog
>+* Tue Mar 18 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 0.15.1-7
>+- Build with system lua instead of bundled one
>+
> * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15.1-6
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
> 
>@@ -193,7 +208,7 @@ fi
> * Sun May 22 2005 Jeremy Katz <katzj@redhat.com> - 0.9.12-3
> - rebuild on all arches
> 
>-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.12-2
>+* Wed Apr  6 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.12-2
> - rebuilt
> 
> * Mon Apr  5 2004 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.9.12-0.fdr.1
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1077756: 875954