diff options
Diffstat (limited to 'user')
| -rw-r--r-- | user/btrfs-progs/APKBUILD | 9 | ||||
| -rw-r--r-- | user/btrfs-progs/asciidoctor-build.patch | 40 |
2 files changed, 3 insertions, 46 deletions
diff --git a/user/btrfs-progs/APKBUILD b/user/btrfs-progs/APKBUILD index b4f0f3b9f..079282295 100644 --- a/user/btrfs-progs/APKBUILD +++ b/user/btrfs-progs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=btrfs-progs -pkgver=5.4 +pkgver=5.4.1 pkgrel=0 pkgdesc="File system utilities for Btrfs" url="https://btrfs.wiki.kernel.org/index.php/Main_Page" @@ -11,9 +11,7 @@ depends="" makedepends="asciidoctor attr-dev e2fsprogs-dev libexecinfo-dev lzo-dev util-linux-dev xmlto zlib-dev zstd-dev" subpackages="$pkgname-doc" -source="https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$pkgver.tar.xz - asciidoctor-build.patch - " +source="https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$pkgver.tar.xz" builddir="$srcdir"/$pkgname-v$pkgver build() { @@ -33,5 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cc445b9e2b7c5a0adeaa0c467de797f240e4ee9b58c6ac51b9dad51bc0ba0c580fd265efebc04fa46dc23e5b3c4d6baf3ad0b8e2e82728cf34ef51973f028a90 btrfs-progs-v5.4.tar.xz -e32ff862d8f8606957225df2b53c1a4b08f655b2d2a1b15b5402f2ce538c5639d373e0a2eaff209dd5c6333754eab052f82481da7b5a42ae945ef48fad886d5d asciidoctor-build.patch" +sha512sums="56381b37036aecea61b758fb4971abfeda24a387bb3a828f7d54eb068982a37763a8ebe2bcc6be61d6a8bc2057dddcd4754325b236e14d8ec02e58cf711f192f btrfs-progs-v5.4.1.tar.xz" diff --git a/user/btrfs-progs/asciidoctor-build.patch b/user/btrfs-progs/asciidoctor-build.patch deleted file mode 100644 index d7eedc406..000000000 --- a/user/btrfs-progs/asciidoctor-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -From ecf430c2e1c6e070542e4b2425318febd5c97261 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Wed, 8 Jan 2020 15:19:02 -0600 -Subject: [PATCH] Documentation: Don't erase XMLTO_EXTRA contents - -XMLTO_EXTRA is defined above, and then appended to if `asciidoctor` is -used to generate the manual pages. The second definition was clearing -the value of this variable, which caused builds with asciidoctor to -fail with: - -``` - [XMLTO] btrfs-ioctl.3 -xmlto: /usr/src/packages/user/btrfs-progs/src/btrfs-progs-v5.4/Documentation/btrfs-ioctl.xml does not validate (status 3) -xmlto: Fix document syntax or use --skip-validation option -validity error : no DTD found! -Document /usr/src/packages/user/btrfs-progs/src/btrfs-progs-v5.4/Documentation/btrfs-ioctl.xml does not validate -make[1]: *** [Makefile:114: btrfs-ioctl.3] Error 13 -``` - -Fixes: 669f56177 ("btrfs-progs: docs: use docbook5 backend for asciidoctor") -Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com> ---- - Documentation/Makefile.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in -index 0cc65398..d35cb858 100644 ---- a/Documentation/Makefile.in -+++ b/Documentation/Makefile.in -@@ -66,7 +66,6 @@ ASCIIDOC_DEPS = - endif - - MANPAGE_XSL = manpage-normal.xsl --XMLTO_EXTRA = - INSTALL = @INSTALL@ - RM = @RM@ - RMDIR = @RMDIR@ --- -2.24.1 - |