diff options
| -rw-r--r-- | main/minetest/APKBUILD | 18 | ||||
| -rw-r--r-- | main/minetest/fix-header-include-namespace.patch | 22 |
2 files changed, 33 insertions, 7 deletions
diff --git a/main/minetest/APKBUILD b/main/minetest/APKBUILD index 8fd6c090ea..746f5e37c2 100644 --- a/main/minetest/APKBUILD +++ b/main/minetest/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=minetest pkgver=0.4.12 -pkgrel=0 +pkgrel=1 pkgdesc="An infinite-world block sandbox game and a game engine" url="http://minetest.net/" arch="all" @@ -13,13 +13,14 @@ pkgusers="minetest" pkggroups="minetest" makedepends="sqlite-dev bzip2-dev openssl-dev irrlicht-dev cmake libvorbis-dev libjpeg-turbo-dev libpng-dev openal-soft-dev libogg-dev mesa-dev - sqlite-dev lua5.1-dev hiredis-dev" + sqlite-dev lua5.1-dev hiredis-dev curl-dev" source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/minetest/${pkgname}/tar.gz/${pkgver} minetest-server.confd minetest-server.initd shared-lua.patch shared-irrlicht.patch + fix-header-include-namespace.patch " subpackages="$pkgname-doc $pkgname-common $pkgname-server" @@ -48,7 +49,7 @@ build() { -DBUILD_CLIENT=1 \ -DBUILD_SERVER=0 \ -DENABLE_REDIS=0 \ - -DENABLE_CURL=0 \ + -DENABLE_CURL=1 \ -DRUN_IN_PLACE=0 \ .. make || return 1 @@ -62,7 +63,7 @@ build() { -DBUILD_CLIENT=0 \ -DBUILD_SERVER=1 \ -DENABLE_REDIS=1 \ - -DENABLE_CURL=0 \ + -DENABLE_CURL=1 \ -DRUN_IN_PLACE=0 \ .. make || return 1 @@ -100,14 +101,17 @@ md5sums="67d383346ffa08819d062a65614291d6 minetest-0.4.12.tar.gz 505dcc499ba84632cc3a5db97e9d56b5 minetest-server.confd 3a83f73d259cd3db8ab7f8fb2c8e2ac4 minetest-server.initd 9abfd27a3f46b4b004ed9418eef8820a shared-lua.patch -83ef89fa320627dffa464f113c3169e6 shared-irrlicht.patch" +83ef89fa320627dffa464f113c3169e6 shared-irrlicht.patch +c6b548384cbc5ee1bf38e59c91cc0dfc fix-header-include-namespace.patch" sha256sums="b37d663785a1ef9e75ec8513913bbd4fcaf761ccb248f4628d9397c71d4417df minetest-0.4.12.tar.gz b8b02cdb070037fe4a0d01279edb9598ecfaa8bedf66ed991c6a00f2edbc5d7b minetest-server.confd 91caea447ec06656b3620d8f7b7ba3cd4134adad949c21993e4de3b5fa58be6e minetest-server.initd 444d406183c3e5c6139386bfc870faef7062067a2a1cb3250c3ef41f02ff9b94 shared-lua.patch -12d03fb8f9523028dacd5fd45d74dfe901b6d659698cf90aafa8f164018f28cc shared-irrlicht.patch" +12d03fb8f9523028dacd5fd45d74dfe901b6d659698cf90aafa8f164018f28cc shared-irrlicht.patch +7032d4de4a9562c5f2929aecacdfcdb54d0cb121c42b852cb682bc072386461c fix-header-include-namespace.patch" sha512sums="f626debaa2c63a80ce3e1ac7e779db3210f69e683363a3c936d5dc15f0d4766a2986e85ab6148d922ac7d0db0bad3fbc6784319ea25371bf835c553970dcd271 minetest-0.4.12.tar.gz 7bca17dc0bd59db9c07c160677498aa09297026104e922bf93b7629c274d0aebd226af60c5e82f49ffe3cc5c1e4448e3798b6c2a44144fc6eca4d3aaed3384bb minetest-server.confd c27aea87468538b48b5e0a66fa5cdde4fc67f3c00a0e57f359a2f044a31c5617d1b5f3dec72e015537ee3bf126bd1073878c0f4447de67db9be2c4cf21416dd7 minetest-server.initd 0716ea12458533b5687d84ac6b3047d8b257b9c1ccef807586dee7ef392ffbd19157e04a63c67ce3d3f221111c5ff12c02e8f9b224a31a7653ebd3f073487e79 shared-lua.patch -d737d076db32bf62df73f6568f7423511ee27573c08fb975c8d876f7cd56a8f942804ed667b9988f3048cb1efdb52fca0ae9a4f1ff1e912607c7d3765b6149e7 shared-irrlicht.patch" +d737d076db32bf62df73f6568f7423511ee27573c08fb975c8d876f7cd56a8f942804ed667b9988f3048cb1efdb52fca0ae9a4f1ff1e912607c7d3765b6149e7 shared-irrlicht.patch +d64cf27fd7a8d4c8e5c0a571cc72716543f45b81dc2f02ac150369de9ac1a2edb01c6496292022f24b660333033a7b1f80bef56d1bcb0ff97e16a9a8a691d235 fix-header-include-namespace.patch" diff --git a/main/minetest/fix-header-include-namespace.patch b/main/minetest/fix-header-include-namespace.patch new file mode 100644 index 0000000000..d2f1cac76c --- /dev/null +++ b/main/minetest/fix-header-include-namespace.patch @@ -0,0 +1,22 @@ +diff --git a/src/porting.h b/src/porting.h +index 492c9d3..39499ef 100644 +--- a/src/porting.h ++++ b/src/porting.h +@@ -59,6 +59,8 @@ with this program; if not, write to the Free Software Foundation, Inc., + #else + #include <unistd.h> + #include <stdint.h> //for uintptr_t ++ #include <sys/time.h> ++ #include <time.h> + + #if (defined(linux) || defined(__linux) || defined(__GNU__)) && !defined(_GNU_SOURCE) + #define _GNU_SOURCE +@@ -190,8 +192,6 @@ void initIrrlicht(irr::IrrlichtDevice * ); + } + + #else // Posix +-#include <sys/time.h> +-#include <time.h> + #if defined(__MACH__) && defined(__APPLE__) + #include <mach/clock.h> + #include <mach/mach.h> |