Fix package compilation issue.

3 files changed, 14 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 14a04ae32822..077bc4228397 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = freeminer-git
-	pkgver = 0.4.14.8.r911.g5d2f00fa7
+	pkgver = 0.4.14.8.r5548.g86caf1cfb
 	pkgrel = 1
 	url = https://freeminer.org/
 	arch = i686
@@ -22,14 +22,6 @@ pkgbase = freeminer-git
 	makedepends = cmake
 	makedepends = msgpack-c
 	makedepends = clang
-	source = git+https://github.com/freeminer/freeminer.git
-	source = git+https://github.com/freeminer/default.git
-	source = git+https://github.com/kaadmy/pixture.git
-	source = enet_shared_lib.patch
-	sha512sums = SKIP
-	sha512sums = SKIP
-	sha512sums = SKIP
-	sha512sums = ac51ee33df27f9fb3bdf16c50b2a9da602d6c55bba7afe21492d0056cdfefa5f84ccfb306c23bd2bcf22066ca3ef2a952110ba0de350602393754f0466383004
 
 pkgname = freeminer-git
 	pkgdesc = An open source sandbox game inspired by Minecraft
@@ -46,7 +38,7 @@ pkgname = freeminer-git
 	depends = libvorbis
 	depends = hicolor-icon-theme
 	depends = freetype2
-	provides = freeminer=0.4.14.8.r911.g5d2f00fa7
+	provides = freeminer=0.4.14.8.r5548.g86caf1cfb
 	conflicts = freeminer
 
 pkgname = freeminer-server-git
@@ -59,12 +51,11 @@ pkgname = freeminer-server-git
 	depends = luajit
 	depends = enet
 	depends = jsoncpp
-	provides = freeminer-server=0.4.14.8.r911.g5d2f00fa7
+	provides = freeminer-server=0.4.14.8.r5548.g86caf1cfb
 	conflicts = freeminer-server
 
 pkgname = freeminer-common-git
 	pkgdesc = Common data files for freeminer-git and freeminer-server-git
 	arch = any
-	provides = freeminer-common=0.4.14.8.r911.g5d2f00fa7
+	provides = freeminer-common=0.4.14.8.r5548.g86caf1cfb
 	conflicts = freeminer-common
-
diff --git a/PKGBUILD b/PKGBUILD
index e9d34fe252c2..d1208b7f9f95 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 _pkgbase=freeminer
 pkgbase="${_pkgbase}-git"
 pkgname=("${_pkgbase}-git" "${_pkgbase}-server-git" "${_pkgbase}-common-git")
-pkgver=0.4.14.8.r911.g5d2f00fa7
+pkgver=0.4.14.8.r5548.g86caf1cfb
 pkgrel=1
 arch=('i686' 'x86_64')
 url='https://freeminer.org/'
@@ -21,40 +21,15 @@ makedepends=(
 	'hicolor-icon-theme' 'freetype2' 'cmake' 'msgpack-c' 'clang'
 )
 
-source=(
-	"git+https://github.com/${_pkgbase}/${_pkgbase}.git"
-	"git+https://github.com/${_pkgbase}/default.git"
-	"git+https://github.com/kaadmy/pixture.git"
-	'enet_shared_lib.patch'
-)
-sha512sums=('SKIP'
-            'SKIP'
-            'SKIP'
-            'ac51ee33df27f9fb3bdf16c50b2a9da602d6c55bba7afe21492d0056cdfefa5f84ccfb306c23bd2bcf22066ca3ef2a952110ba0de350602393754f0466383004')
-
 pkgver() {
 	cd "${srcdir}"/${_pkgbase}
 	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-	cd "${srcdir}"/${_pkgbase}
-
-	# Use Arch's enet lib
-	patch -Np1 < ../enet_shared_lib.patch
-
-	# Remove msgpack-c, enet and jsoncpp submodules
-	git submodule deinit src/external/{msgpack-c,enet,jsoncpp}
-	git rm --cached src/external/{msgpack-c,enet,jsoncpp}
-	git config -f .gitmodules --remove-section submodule.src/external/msgpack-c
-	git config -f .gitmodules --remove-section submodule.src/external/enet
-	git config -f .gitmodules --remove-section submodule.src/external/jsoncpp
-	git add .gitmodules
-
-	# Configure submodules
-	git config submodule.games/default.url "${srcdir}"/default
-	git config submodule.games/pixture.url "${srcdir}"/pixture
-	git submodule update --init
+	cd "${srcdir}"
+	
+	git clone --recursive "https://github.com/${_pkgbase}/${_pkgbase}"
 
 	# Create build directory
 	mkdir -p "${srcdir}"/build-{client,server}
@@ -64,28 +39,22 @@ build() {
 	# Building client
 	cd "${srcdir}"/build-client
 	cmake ../${_pkgbase} \
-		-DCMAKE_C_COMPILER=clang \
-		-DCMAKE_CXX_COMPILER=clang++ \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DBUILD_CLIENT=1 \
 		-DBUILD_SERVER=0 \
-		-DRUN_IN_PLACE=0 \
-		-DENABLE_SYSTEM_JSONCPP=1 \
-		-DENABLE_SYSTEM_MSGPACK=1
-	make
+		-DRUN_IN_PLACE=0
+	
+	nice make
 
 	# Building server
 	cd "${srcdir}"/build-server
 	cmake ../${_pkgbase} \
-		-DCMAKE_C_COMPILER=clang \
-		-DCMAKE_CXX_COMPILER=clang++ \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DBUILD_CLIENT=0 \
 		-DBUILD_SERVER=1 \
-		-DRUN_IN_PLACE=0 \
-		-DENABLE_SYSTEM_JSONCPP=1 \
-		-DENABLE_SYSTEM_MSGPACK=1
-	make
+		-DRUN_IN_PLACE=0
+
+	nice make
 }
 
 package_freeminer-git() {
diff --git a/enet_shared_lib.patch b/enet_shared_lib.patch
deleted file mode 100644
index da78e70b89ae..000000000000
--- a/enet_shared_lib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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