findluabind.cmake now works well with lua53,\n patch is not needed

4 files changed, 7 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index df7281c7bb7c..2896c0def789 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Feb 28 13:19:43 UTC 2016
+# Tue Mar  8 08:18:07 UTC 2016
 pkgbase = ryzom-client
 	pkgdesc = Ryzom is a Free to Play MMORPG .This version is for playing on an official server
-	pkgver = 0.12.0.r7346
+	pkgver = 0.12.0.r7388
 	pkgrel = 1
 	url = http://www.ryzom.com/
 	install = install
@@ -34,10 +34,8 @@ pkgbase = ryzom-client
 	conflicts = ryzom-client-hg
 	source = hg+https://bitbucket.org/ryzom/ryzomcore#branch=compatibility-develop
 	source = ryzom.sh
-	source = findlua53bind.patch
 	md5sums = SKIP
-	md5sums = ff3b18f0c9149ef5a8b7ab74bcb5a59e
-	md5sums = b5b01746543648f646421f190759a886
+	md5sums = 7f9befd9b4f864938648880375ff423e
 
 pkgname = ryzom-client
 
diff --git a/PKGBUILD b/PKGBUILD
index b98165248478..543994772d3c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: PitBall
 
 pkgname=ryzom-client
-pkgver=0.12.0.r7346
+pkgver=0.12.0.r7388
 pkgrel=1
 pkgdesc="Ryzom is a Free to Play MMORPG .This version is for playing on an official server"
 arch=('i686' 'x86_64')
@@ -15,11 +15,9 @@ provides=('libnel' 'ryzom' 'ryzomcore')
 _hg_name='ryzomcore'
 install=install                                     #branch=compatibility
 source=( "hg+https://bitbucket.org/ryzom/${_hg_name}#branch=compatibility-develop"
-         'ryzom.sh' 'findlua53bind.patch')
+         'ryzom.sh')
 md5sums=('SKIP'
-         'ff3b18f0c9149ef5a8b7ab74bcb5a59e'
-         'b5b01746543648f646421f190759a886')
-
+         '7f9befd9b4f864938648880375ff423e')
 
 pkgver() {
   cd "$_hg_name"
@@ -38,7 +36,6 @@ prepare() {
     mkdir -p $srcdir/$_hg_name/build
     cd $srcdir/$_hg_name
 
-    patch -Np0 -i $srcdir/findlua53bind.patch
     sed '/o_xml.h/i#include <libxml/tree.h>' -i \
          code/nel/include/nel/logic/logic_state.h 
 
diff --git a/findlua53bind.patch b/findlua53bind.patch
deleted file mode 100644
index 032d0a798426..000000000000
--- a/findlua53bind.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- code/CMakeModules/FindLuabind.cmake.old	2016-01-31 07:27:45.890212020 +0100
-+++ code/CMakeModules/FindLuabind.cmake	2016-01-31 07:07:40.000000000 +0100
-@@ -9,16 +9,24 @@
-   IF(LUABIND_LIBRARY_RELEASE MATCHES "\\.so")
-     INCLUDE(CheckDepends)
- 
--    SET(LUA52_LIBRARY "liblua5.2")
--    CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA52_LIBRARY LUALIB_FOUND)
-+    SET(LUA53_LIBRARY "liblua")
-+    CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA53_LIBRARY LUALIB_FOUND)
-+ 
-     
-     IF(NOT LUALIB_FOUND)
-       # fedora (v20)
--      SET(LUA52_LIBRARY "liblua-5.2")
--      CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA52_LIBRARY LUALIB_FOUND)
-+      SET(LUA53_LIBRARY "liblua")
-+      CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA53_LIBRARY LUALIB_FOUND)
-     ENDIF(NOT LUALIB_FOUND)
- 
-     IF(LUALIB_FOUND)
-+      MESSAGE(STATUS "Luabind is using Lua 5.3")
-+      FIND_PACKAGE(Lua53 REQUIRED)
-+    ELSE(LUALIB_FOUND)
-+      SET(LUA52_LIBRARY "liblua5.2")
-+      CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA52_LIBRARY LUALIB_FOUND)
-+
-+    IF(LUALIB_FOUND)
-       MESSAGE(STATUS "Luabind is using Lua 5.2")
-       FIND_PACKAGE(Lua52 REQUIRED)
-     ELSE(LUALIB_FOUND)
-@@ -40,6 +48,7 @@
-         ENDIF(LUALIB_FOUND)
-       ENDIF(LUALIB_FOUND)
-     ENDIF(LUALIB_FOUND)
-+  ENDIF(LUALIB_FOUND)
-   ELSE(LUABIND_LIBRARY_RELEASE MATCHES "\\.so")
-     # TODO: find a way to detect Lua version
-     IF(WITH_LUA53)
diff --git a/ryzom.sh b/ryzom.sh
index bf6e4d75c5e1..8093636b8c28 100644
--- a/ryzom.sh
+++ b/ryzom.sh
@@ -3,6 +3,7 @@ if groups | grep games > /dev/null 2>&1 ; then
   #sync data files	
   ryzom_sync 
   #update default config file
+  mkdir -p ~/.ryzom
   cp /etc/ryzom/client_default.cfg ~/.ryzom/client_default.cfg
   #run game
   exec ryzom_client