summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlfredo Ramos2015-11-21 02:01:53 -0600
committerAlfredo Ramos2015-11-21 02:01:53 -0600
commitaec8f9594e3c4e93adfea69198af6bed001e0784 (patch)
tree984b38522cedca96f7915d383a080adf19fa55d0
parent9cc41da5df6623ab710d6769bbd5d95bdb0bf45b (diff)
downloadaur-aec8f9594e3c4e93adfea69198af6bed001e0784.tar.gz
Add missing dependency
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD10
-rw-r--r--enet_shared_lib.patch11
3 files changed, 16 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a94257922152..d07b06ac9e4f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = freeminer-git
pkgdesc = An open source sandbox game inspired by Minecraft. Development version.
- pkgver = 0.4.13.7.r12.g2771f5c
- pkgrel = 2
+ pkgver = 0.4.13.7.r726.g7e62806
+ pkgrel = 1
url = http://freeminer.org/
install = freeminer-git.install
arch = i686
@@ -24,14 +24,15 @@ pkgbase = freeminer-git
depends = jsoncpp
depends = libvorbis
depends = hicolor-icon-theme
- provides = freeminer=0.4.13.7.r12.g2771f5c
+ depends = freetype2
+ provides = freeminer=0.4.13.7.r726.g7e62806
conflicts = freeminer
source = git+https://github.com/freeminer/freeminer.git
source = freeminer-git.install
source = enet_shared_lib.patch
sha512sums = SKIP
sha512sums = d590345e9b87e4350b7420eebf8f69e4ad65a53415257573b569ed1c85568a40b4f65fc8df5925f7c03af75d340c52a10a4d1389e5d868816aef9711102ebef1
- sha512sums = abce96de2c2221f1373fc07fc2766de19d1fc2c1339ada0cb98d6b571649413f72ca2ea8c53dc7257f0700dc0509cdfeb0346144f806a626b28d5514b598accd
+ sha512sums = ac51ee33df27f9fb3bdf16c50b2a9da602d6c55bba7afe21492d0056cdfefa5f84ccfb306c23bd2bcf22066ca3ef2a952110ba0de350602393754f0466383004
pkgname = freeminer-git
diff --git a/PKGBUILD b/PKGBUILD
index 9644e6c652ec..42789f7c617d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,14 @@
_pkgname=freeminer
pkgname=${_pkgname}-git
-pkgver=0.4.13.7.r12.g2771f5c
-pkgrel=2
+pkgver=0.4.13.7.r726.g7e62806
+pkgrel=1
pkgdesc='An open source sandbox game inspired by Minecraft. Development version.'
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' 'enet' 'jsoncpp' 'libvorbis' 'hicolor-icon-theme')
+depends=('leveldb' 'curl' 'hiredis' 'sqlite' 'luajit' 'xdg-utils' 'irrlicht' 'openal' 'enet' 'jsoncpp' 'libvorbis' 'hicolor-icon-theme' 'freetype2')
makedepends=('cmake' 'git' 'msgpack-c' 'clang')
provides=("${_pkgname}=${pkgver}")
conflicts=("${_pkgname}")
@@ -26,7 +26,7 @@ source=(
sha512sums=(
'SKIP'
'd590345e9b87e4350b7420eebf8f69e4ad65a53415257573b569ed1c85568a40b4f65fc8df5925f7c03af75d340c52a10a4d1389e5d868816aef9711102ebef1'
- 'abce96de2c2221f1373fc07fc2766de19d1fc2c1339ada0cb98d6b571649413f72ca2ea8c53dc7257f0700dc0509cdfeb0346144f806a626b28d5514b598accd'
+ 'ac51ee33df27f9fb3bdf16c50b2a9da602d6c55bba7afe21492d0056cdfefa5f84ccfb306c23bd2bcf22066ca3ef2a952110ba0de350602393754f0466383004'
)
pkgver() {
@@ -43,7 +43,7 @@ prepare() {
cd ${srcdir}/${_pkgname}
# Use Arch's enet lib
- patch ./src/main.cpp ../enet_shared_lib.patch
+ patch -p1 < ../enet_shared_lib.patch
# Remove src/msgpack-c src/enet and src/jsoncpp submodules
git submodule deinit src/{msgpack-c,enet,jsoncpp}
diff --git a/enet_shared_lib.patch b/enet_shared_lib.patch
index 127017b6ad44..da78e70b89ae 100644
--- a/enet_shared_lib.patch
+++ b/enet_shared_lib.patch
@@ -1,11 +1,12 @@
---- a/src/main.cpp 2015-05-11 22:23:13.147964508 -0500
-+++ b/src/main.cpp 2015-05-11 22:24:50.488518671 -0500
-@@ -59,7 +59,7 @@ along with Freeminer. If not, see <http
-
+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