diff --git a/srcpkgs/apk-tools/patches/includes.patch b/srcpkgs/apk-tools/patches/includes.patch deleted file mode 100644 index 606b421ba2f..00000000000 --- a/srcpkgs/apk-tools/patches/includes.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- src/archive.c.orig 2018-10-19 14:12:08.563391676 +0200 -+++ src/archive.c 2018-10-19 14:12:34.374508920 +0200 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - #include "apk_defines.h" - #include "apk_print.h" - ---- src/database.c.orig 2018-10-19 14:13:54.465872730 +0200 -+++ src/database.c 2018-10-19 14:14:11.279949108 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include "apk_defines.h" - #include "apk_package.h" diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template index 87ecbd8a144..dbdc782a0a9 100644 --- a/srcpkgs/apk-tools/template +++ b/srcpkgs/apk-tools/template @@ -1,19 +1,20 @@ # Template file for 'apk-tools' pkgname=apk-tools -version=2.10.5 -revision=2 +version=2.12.0 +revision=1 build_style=gnu-makefile -make_build_args="LUAAPK=" -hostmakedepends="pkg-config" -makedepends="libressl-devel zlib-devel lua52-devel" +# Link libapk statically +make_build_args="LUAAPK=no LDFLAGS_apk.static= static" +hostmakedepends="pkg-config lua53 lua53-zlib" +makedepends="libressl-devel zlib-devel" short_desc="Alpine Package Keeper (Alpine package manager)" maintainer="Leah Neukirchen " license="GPL-2.0-only" homepage="http://git.alpinelinux.org/cgit/apk-tools" distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2" -checksum=d0de1793ff56d4a311841cf4f13a51bb1cc1c0a259d8748c1e633f8f11c6f965 +checksum=763ed44a5b33f8cf6054b9ad6de53c355a37dcdf954024bbc59b953c675b78c6 CFLAGS="-Wno-error" do_install() { - vbin src/apk + vbin src/apk.static apk }