Version 0.4.14.8

4 files changed, 30 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd423ec85124..c33d229e4552 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Apr 29 06:10:46 UTC 2016
+# Sun May 22 18:25:48 UTC 2016
 pkgbase = freeminer
 	pkgdesc = An open source sandbox game inspired by Minecraft.
-	pkgver = 0.4.13.7
-	pkgrel = 5
+	pkgver = 0.4.14.8
+	pkgrel = 1
 	url = http://freeminer.org/
 	arch = i686
 	arch = x86_64
@@ -17,19 +17,19 @@ pkgbase = freeminer
 	depends = hiredis
 	depends = sqlite
 	depends = luajit
-	depends = xdg-utils
 	depends = irrlicht
 	depends = openal
+	depends = enet
 	depends = jsoncpp
 	depends = libvorbis
 	depends = hicolor-icon-theme
 	depends = freetype2
-	provides = freeminer=0.4.13.7
+	provides = freeminer=0.4.14.8
 	conflicts = freeminer-git
-	source = https://github.com/freeminer/freeminer/releases/download/0.4.13.7/freeminer-0.4.13.7.zip
-	source = msgpackc_fix.patch
-	sha512sums = d650bf3b2f471407d448f080f6cf16af818b4c72607b8e2b1c5e36e0c8ed8447c944a3f148a90de410f507f0eb999a28d77e2de8798f3280559c94d39a2ac505
-	sha512sums = 59ef98c9550ede0e77ce30dcca6002759978a3b3d9046c7a135d319b8344c3647d745123e7f7a9695326f152a31b304824b40c36866818bade511dceaf27a86f
+	source = https://github.com/freeminer/freeminer/releases/download/0.4.14.8/freeminer-0.4.14.8.zip
+	source = enet_shared_lib.patch
+	sha512sums = 093c1640c9a070fdbd45074d0a4acc5b7894d23cd436dc3cf794cee8fff92930cf26f8d802b984cb9ce19bac7fccc6e0ce948c816c9e19b9e9551e373e560beb
+	sha512sums = ac51ee33df27f9fb3bdf16c50b2a9da602d6c55bba7afe21492d0056cdfefa5f84ccfb306c23bd2bcf22066ca3ef2a952110ba0de350602393754f0466383004
 
 pkgname = freeminer
 
diff --git a/PKGBUILD b/PKGBUILD
index cc5c604deda0..b5cb6a0f2d48 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,16 @@
 # Contributor: kusakata <shohei atmark kusakata period com>
 
 pkgname=freeminer
-pkgver=0.4.13.7
-pkgrel=5
+pkgver=0.4.14.8
+pkgrel=1
 pkgdesc='An open source sandbox game inspired by Minecraft.'
 arch=('i686' 'x86_64')
 url='http://freeminer.org/'
 license=('GPL3' 'CCPL:cc-by-sa-3.0')
 
 depends=(
-	'leveldb' 'curl' 'hiredis' 'sqlite' 'luajit' 'xdg-utils' 'irrlicht'
-	'openal' 'jsoncpp' 'libvorbis' 'hicolor-icon-theme' 'freetype2'
+	'leveldb' 'curl' 'hiredis' 'sqlite' 'luajit' 'irrlicht'
+	'openal' 'enet' 'jsoncpp' 'libvorbis' 'hicolor-icon-theme' 'freetype2'
 )
 makedepends=('cmake' 'msgpack-c' 'clang')
 provides=("${pkgname}=${pkgver}")
@@ -19,17 +19,17 @@ conflicts=("${pkgname}-git")
 
 source=(
 	"https://github.com/${pkgname}/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.zip"
-	'msgpackc_fix.patch'
+	'enet_shared_lib.patch'
 )
 sha512sums=(
-	'd650bf3b2f471407d448f080f6cf16af818b4c72607b8e2b1c5e36e0c8ed8447c944a3f148a90de410f507f0eb999a28d77e2de8798f3280559c94d39a2ac505'
-	'59ef98c9550ede0e77ce30dcca6002759978a3b3d9046c7a135d319b8344c3647d745123e7f7a9695326f152a31b304824b40c36866818bade511dceaf27a86f'
+	'093c1640c9a070fdbd45074d0a4acc5b7894d23cd436dc3cf794cee8fff92930cf26f8d802b984cb9ce19bac7fccc6e0ce948c816c9e19b9e9551e373e560beb'
+	'ac51ee33df27f9fb3bdf16c50b2a9da602d6c55bba7afe21492d0056cdfefa5f84ccfb306c23bd2bcf22066ca3ef2a952110ba0de350602393754f0466383004'
 )
 
 prepare() {
-	# msgpack-c now provides libmsgpackc
+	# Use Arch's enet lib
 	cd "${srcdir}"/${pkgname}-${pkgver}
-	patch -Np1 < ../msgpackc_fix.patch
+	patch -Np1 < ../enet_shared_lib.patch
 
 	# Create build directory
 	mkdir -p "${srcdir}"/build
diff --git a/enet_shared_lib.patch b/enet_shared_lib.patch
new file mode 100644
index 000000000000..da78e70b89ae
--- /dev/null
+++ b/enet_shared_lib.patch
@@ -0,0 +1,12 @@
+diff -uprNEBZ --suppress-blank-empty a/src/main.cpp b/src/main.cpp
+--- a/src/main.cpp	2015-11-21 01:53:20.445038202 -0600
++++ b/src/main.cpp	2015-11-21 01:57:13.407056516 -0600
+@@ -64,7 +64,7 @@ along with Freeminer.  If not, see <http
+
+ #if USE_ENET
+ // todo: move to connection
+-#include "enet/enet.h"
++#include <enet/enet.h>
+ #endif
+
+ #ifdef HAVE_TOUCHSCREENGUI
diff --git a/msgpackc_fix.patch b/msgpackc_fix.patch
deleted file mode 100644
index 3cf0b82d25e4..000000000000
--- a/msgpackc_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uprNEBZ --suppress-blank-empty a/cmake/Modules/FindMsgPack.cmake b/cmake/Modules/FindMsgPack.cmake
---- a/cmake/Modules/FindMsgPack.cmake	2015-08-20 18:43:58.000000000 -0500
-+++ b/cmake/Modules/FindMsgPack.cmake	2016-04-29 00:52:17.364847529 -0500
-@@ -22,7 +22,7 @@ ENDIF ()
-
- FIND_PATH(MSGPACK_INCLUDE_DIR msgpack.hpp)
-
--FIND_LIBRARY(MSGPACK_LIBRARY NAMES msgpack PATHS)
-+FIND_LIBRARY(MSGPACK_LIBRARY NAMES msgpack msgpackc PATHS)
-
- MARK_AS_ADVANCED(MSGPACK_INCLUDE_DIR MSGPACK_LIBRARY)
-