diff options
| -rw-r--r-- | community/minetest/0001-CMake-link-with-Intl-when-necessary.patch | 50 | ||||
| -rw-r--r-- | community/minetest/APKBUILD | 41 |
2 files changed, 75 insertions, 16 deletions
diff --git a/community/minetest/0001-CMake-link-with-Intl-when-necessary.patch b/community/minetest/0001-CMake-link-with-Intl-when-necessary.patch new file mode 100644 index 00000000000..cc1ceca898b --- /dev/null +++ b/community/minetest/0001-CMake-link-with-Intl-when-necessary.patch @@ -0,0 +1,50 @@ +From 45ed3aa6be6d70cf76a4f10c81684ab86cb5017f Mon Sep 17 00:00:00 2001 +From: Romain Naour <romain.naour@gmail.com> +Date: Mon, 12 Jun 2017 21:57:05 +0200 +Subject: [PATCH] CMake: link with Intl when necessary + +On non Glibc system linking with Intl library may be needed when +Gettext support is enabled. + +Fixes: +clientlauncher.cpp:(.text+0xcac): undefined reference to `libintl_gettext' +clientlauncher.cpp:(.text+0xdf0): undefined reference to `libintl_gettext' + +Signed-off-by: Romain Naour <romain.naour@gmail.com> +--- + src/CMakeLists.txt | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -70,6 +70,14 @@ if(ENABLE_GETTEXT) + endif() + set(USE_GETTEXT TRUE) + message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}") ++ # On some platforms, such as Linux with GNU libc, the gettext ++ # functions are present in the C standard library and libintl ++ # is not required. For other libc (uClibc-ng or musl) libintl ++ # may be required. ++ find_package(Intl) ++ if(NOT Intl_LIBRARIES STREQUAL "") ++ message(STATUS "GetText Intl : ${Intl_LIBRARIES}") ++ endif() + endif(GETTEXT_FOUND) + else() + mark_as_advanced(GETTEXT_ICONV_DLL GETTEXT_INCLUDE_DIR GETTEXT_LIBRARY GETTEXT_MSGFMT) +@@ -554,6 +554,7 @@ + ${BZIP2_LIBRARIES} + ${PNG_LIBRARIES} + ${X11_LIBRARIES} ++ ${Intl_LIBRARIES} + ${SOUND_LIBRARIES} + ${SQLITE3_LIBRARY} + ${LUA_LIBRARY} +@@ -623,6 +624,7 @@ + ${ZLIB_LIBRARIES} + ${SQLITE3_LIBRARY} + ${JSON_LIBRARY} ++ ${Intl_LIBRARIES} + ${LUA_LIBRARY} + ${GMP_LIBRARY} + ${PLATFORM_LIBS} diff --git a/community/minetest/APKBUILD b/community/minetest/APKBUILD index cb0ccc9e8b1..fb9f9eb10bf 100644 --- a/community/minetest/APKBUILD +++ b/community/minetest/APKBUILD @@ -1,26 +1,27 @@ # Contributor: <xmingske@gmail.com> # Maintainer: Sascha Paunovic <azarus@posteo.net> pkgname=minetest -pkgver=0.4.17.1 -pkgrel=4 +pkgver=5.0.1 +pkgrel=0 pkgdesc="An infinite-world block sandbox game and a game engine" url="https://minetest.net/" # luajit is not available for disabled arches arch="all !s390x" -install="$pkgname-server.pre-install" license="LGPL-2.1 CC-BY-SA-3.0" -depends="$pkgname-common" 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 luajit-dev hiredis-dev curl-dev" +install="$pkgname-server.pre-install" +depends="$pkgname-common" +makedepends="bzip2-dev cmake curl-dev freetype-dev gettext-dev hiredis-dev irrlicht-dev + libjpeg-turbo-dev libogg-dev libpng-dev libvorbis-dev luajit-dev + mesa-dev openal-soft-dev openssl-dev sqlite-dev + " +subpackages="$pkgname-doc $pkgname-common::noarch $pkgname-server $pkgname-server-openrc:openrc" source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/minetest/$pkgname/tar.gz/$pkgver minetest-server.confd minetest-server.initd + 0001-CMake-link-with-Intl-when-necessary.patch " -subpackages="$pkgname-doc $pkgname-common::noarch $pkgname-server" - builddir="$srcdir"/$pkgname-$pkgver build() { @@ -37,6 +38,7 @@ build() { -DRUN_IN_PLACE=0 \ .. make + mkdir "$builddir"/.build_server cd "$builddir"/.build_server cmake -DCUSTOM_BINDIR=/usr/bin \ @@ -65,13 +67,10 @@ common() { package() { cd "$builddir"/.build_client make DESTDIR="$pkgdir" install - install -D -m755 "$srcdir"/minetest-server.initd \ - "$pkgdir"/etc/init.d/minetest-server - install -D -m644 "$srcdir"/minetest-server.confd \ - "$pkgdir"/etc/conf.d/minetest-server } -server(){ +server() { + pkgdesc="Minetest server" depends="$pkgname-common" mkdir -p "$subpkgdir/usr/bin" cd "$builddir" @@ -80,6 +79,16 @@ server(){ cp bin/minetestserver $subpkgdir/usr/bin } -sha512sums="9f84ae45ebe181cb1cd2dff6b71b558eb276472efdfcd73bd02a111b2761793d49681bdfbbeaccc28f4a2f49e15b80d04b78db2f2f728c852c188b0c96aae618 minetest-0.4.17.1.tar.gz +openrc() { + pkgdesc="Minetest server (OpenRC init scripts)" + install_if="$pkgname-server openrc" + install -D -m755 "$srcdir"/minetest-server.initd \ + "$subpkgdir"/etc/init.d/minetest-server + install -D -m644 "$srcdir"/minetest-server.confd \ + "$subpkgdir"/etc/conf.d/minetest-server +} + +sha512sums="00f0c77c19eb9619387285e5dad690c8aa9969ff11c4de0bdae99ee6e9a4508a8c2f977837fc2e01aebc5d4c1a5191d4f56acb131182d73c8f50da1458695607 minetest-5.0.1.tar.gz 7bca17dc0bd59db9c07c160677498aa09297026104e922bf93b7629c274d0aebd226af60c5e82f49ffe3cc5c1e4448e3798b6c2a44144fc6eca4d3aaed3384bb minetest-server.confd -c27aea87468538b48b5e0a66fa5cdde4fc67f3c00a0e57f359a2f044a31c5617d1b5f3dec72e015537ee3bf126bd1073878c0f4447de67db9be2c4cf21416dd7 minetest-server.initd" +c27aea87468538b48b5e0a66fa5cdde4fc67f3c00a0e57f359a2f044a31c5617d1b5f3dec72e015537ee3bf126bd1073878c0f4447de67db9be2c4cf21416dd7 minetest-server.initd +6e35a39f079f0c1b280dbc3deb46eb789a7620d64b226b5f867c5d954ae8881659b6f15e3e2204a24ccd4ed7b9de50f2fbacc4c80534290fc4c049df24ddc5ff 0001-CMake-link-with-Intl-when-necessary.patch" |