Updated: PKGBUILD

3 files changed, 25 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aac3d4fb66aa..14a04ae32822 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = freeminer-git
-	pkgver = 0.4.14.8.909.g69b31a173
+	pkgver = 0.4.14.8.r911.g5d2f00fa7
 	pkgrel = 1
-	url = http://freeminer.org/
+	url = https://freeminer.org/
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	license = CCPL:cc-by-sa-3.0
 	makedepends = leveldb
 	makedepends = curl
+	makedepends = git
 	makedepends = hiredis
 	makedepends = sqlite
 	makedepends = luajit
@@ -21,16 +22,14 @@ pkgbase = freeminer-git
 	makedepends = cmake
 	makedepends = msgpack-c
 	makedepends = clang
-	makedepends = ccache
-	makedepends = git
 	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 = fix_enet_lib.patch
+	source = enet_shared_lib.patch
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = 8bdd0226cce1a8773feb840f90c392481d5486ef2bca5b144c1626df33a0bda861d93ccfb451eb5013aa42ab6fe2b029f44c02e9b85b32ed80a6668985deeb62
+	sha512sums = ac51ee33df27f9fb3bdf16c50b2a9da602d6c55bba7afe21492d0056cdfefa5f84ccfb306c23bd2bcf22066ca3ef2a952110ba0de350602393754f0466383004
 
 pkgname = freeminer-git
 	pkgdesc = An open source sandbox game inspired by Minecraft
@@ -47,7 +46,7 @@ pkgname = freeminer-git
 	depends = libvorbis
 	depends = hicolor-icon-theme
 	depends = freetype2
-	provides = freeminer=0.4.14.8.909.g69b31a173
+	provides = freeminer=0.4.14.8.r911.g5d2f00fa7
 	conflicts = freeminer
 
 pkgname = freeminer-server-git
@@ -60,12 +59,12 @@ pkgname = freeminer-server-git
 	depends = luajit
 	depends = enet
 	depends = jsoncpp
-	provides = freeminer-server=0.4.14.8.909.g69b31a173
+	provides = freeminer-server=0.4.14.8.r911.g5d2f00fa7
 	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.909.g69b31a173
+	provides = freeminer-common=0.4.14.8.r911.g5d2f00fa7
 	conflicts = freeminer-common
 
diff --git a/PKGBUILD b/PKGBUILD
index 7f407181b5e3..20e382ad3901 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,6 @@
-# Maintainer: Frederic Bezies <fredbezies at gmail dot com>
+# Maintainer:
+# Contributor: Felix Golatofski <contact@xdfr.de>
+# Contributor: Frederic Bezies <fredbezies at gmail dot com>
 # Contributor: Alfredo Ramos <alfredo dot ramos at yandex dot com>
 # Contributor: Martin C. Doege <mdoege at compuserve dot com>
 # Contributor: kusakata <shohei atmark kusakata period com>
@@ -6,43 +8,40 @@
 _pkgbase=freeminer
 pkgbase="${_pkgbase}-git"
 pkgname=("${_pkgbase}-git" "${_pkgbase}-server-git" "${_pkgbase}-common-git")
-pkgver=0.4.14.8.909.g69b31a173
+pkgver=0.4.14.8.r911.g5d2f00fa7
 pkgrel=1
 arch=('i686' 'x86_64')
-url='http://freeminer.org/'
+url='https://freeminer.org/'
 license=('GPL3' 'CCPL:cc-by-sa-3.0')
 
+
 makedepends=(
-	'leveldb' 'curl' 'hiredis' 'sqlite' 'luajit'
+	'leveldb' 'curl' 'git' 'hiredis' 'sqlite' 'luajit'
 	'irrlicht' 'openal' 'enet' 'jsoncpp' 'libvorbis'
 	'hicolor-icon-theme' 'freetype2' 'cmake' 'msgpack-c' 'clang'
-	'ccache' 'git'
 )
 
 source=(
 	"git+https://github.com/${_pkgbase}/${_pkgbase}.git"
 	"git+https://github.com/${_pkgbase}/default.git"
 	"git+https://github.com/kaadmy/pixture.git"
-	'fix_enet_lib.patch'
-)
-sha512sums=(
-	'SKIP'
-	'SKIP'
-	'SKIP'
-	'8bdd0226cce1a8773feb840f90c392481d5486ef2bca5b144c1626df33a0bda861d93ccfb451eb5013aa42ab6fe2b029f44c02e9b85b32ed80a6668985deeb62'
+	'enet_shared_lib.patch'
 )
+sha512sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            'ac51ee33df27f9fb3bdf16c50b2a9da602d6c55bba7afe21492d0056cdfefa5f84ccfb306c23bd2bcf22066ca3ef2a952110ba0de350602393754f0466383004')
 
 pkgver() {
-	# Updating package version
 	cd "${srcdir}"/${_pkgbase}
-	git describe --long --tags 2>/dev/null | sed 's/-/./g'
+	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
 	cd "${srcdir}"/${_pkgbase}
 
 	# Use Arch's enet lib
-	patch -Np1 < ../fix_enet_lib.patch
+	patch -Np1 < ../enet_shared_lib.patch
 
 	# Remove msgpack-c, enet and jsoncpp submodules
 	git submodule deinit src/external/{msgpack-c,enet,jsoncpp}
diff --git a/fix_enet_lib.patch b/enet_shared_lib.patch
index 43e3890184b6..da78e70b89ae 100644
--- a/fix_enet_lib.patch
+++ b/enet_shared_lib.patch
@@ -1,7 +1,7 @@
 diff -uprNEBZ --suppress-blank-empty a/src/main.cpp b/src/main.cpp
---- a/src/main.cpp	2016-12-07 18:10:06.000000000 -0600
-+++ b/src/main.cpp	2016-12-07 23:39:37.707828396 -0600
-@@ -57,7 +57,7 @@ along with Freeminer.  If not, see <http
+--- 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