From a5a4f08a540ca5c5e7f272787c7e7b8af109dfb1 Mon Sep 17 00:00:00 2001 From: Krul Ceter Date: Mon, 16 Jan 2023 12:48:51 +0300 Subject: [PATCH] devilutionX: switch to the -src tarball; drop gettext One of the upstream maintainers (glebm) suggested to use the "src" tarball instead of "src-fully-vendored", which does not bundle libraries already available in the repository (SDL2, SDL2_image, libfmt, bzip2, libsodium, googletest) without the need to specify dedicated configure flags for them. gettext is used for generating libdevilutionX.mpq but not required here because it is shipped in the tarball. Rebuild is not required as the result is the same: shlibs, extracted files, configuration are identical. "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" now is globally used in 48dabfa86779c1b32d40055ffc5747ba36332152 following the previous update for this package, so it is not needed here anymore. --- srcpkgs/devilutionX/template | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template index 7e46cd95a68e..902309be5352 100644 --- a/srcpkgs/devilutionX/template +++ b/srcpkgs/devilutionX/template @@ -3,12 +3,8 @@ pkgname=devilutionX version=1.4.1 revision=1 build_style=cmake -configure_args="-DVERSION_NUM=$version -DFETCHCONTENT_FULLY_DISCONNECTED=ON - -DDISABLE_ZERO_TIER=ON -DDEVILUTIONX_SYSTEM_GOOGLETEST=ON - -DDEVILUTIONX_SYSTEM_SDL2=ON -DDEVILUTIONX_SYSTEM_SDL_IMAGE=ON - -DDEVILUTIONX_SYSTEM_LIBFMT=ON -DDEVILUTIONX_SYSTEM_BZIP2=ON - -DDEVILUTIONX_SYSTEM_LIBSODIUM=ON" -hostmakedepends="pkg-config gettext" +configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON" +hostmakedepends="pkg-config" makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel gtest-devel fmt-devel zlib-devel" short_desc="Diablo I engine for modern operating systems" @@ -16,8 +12,8 @@ maintainer="MarcoAPC " license="Unlicense" homepage="https://github.com/diasurgical/devilutionX" changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md" -distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src-fully-vendored.tar.xz" -checksum=80527c29cd1d369ce905be426b671350b400c9468b73ef8cfbe6a09a563aeac0 +distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz" +checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f post_install() { vlicense LICENSE