diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-08 21:23:22 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-08 21:23:22 +0000 |
| commit | 70a61c71d34433ae379367b6f6365d7ec7988d27 (patch) | |
| tree | 4a6e8de18b6916c2e90ab64a9c90ace8a48bcba0 | |
| parent | 999bf9b0f1676d84456a5d1edf0d0ace03b27d6f (diff) | |
| download | packages-70a61c71d34433ae379367b6f6365d7ec7988d27.tar.gz packages-70a61c71d34433ae379367b6f6365d7ec7988d27.tar.bz2 packages-70a61c71d34433ae379367b6f6365d7ec7988d27.tar.xz packages-70a61c71d34433ae379367b6f6365d7ec7988d27.zip | |
user/btrfs-progs: Bump to 5.4
| -rw-r--r-- | user/btrfs-progs/APKBUILD | 9 | ||||
| -rw-r--r-- | user/btrfs-progs/asciidoctor-build.patch | 40 |
2 files changed, 46 insertions, 3 deletions
diff --git a/user/btrfs-progs/APKBUILD b/user/btrfs-progs/APKBUILD index ffc0d10e7..b4f0f3b9f 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.2.2 +pkgver=5.4 pkgrel=0 pkgdesc="File system utilities for Btrfs" url="https://btrfs.wiki.kernel.org/index.php/Main_Page" @@ -11,7 +11,9 @@ 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" +source="https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$pkgver.tar.xz + asciidoctor-build.patch + " builddir="$srcdir"/$pkgname-v$pkgver build() { @@ -31,4 +33,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="97eaf3dd8ce1629f0acace23f3eedc7c6942299ddb65cdc3b0a7b623026db1063d72f3c1b6297782705e08dfc4c361384e17b5e27a16e756cd0a81e35e79aa9c btrfs-progs-v5.2.2.tar.xz" +sha512sums="cc445b9e2b7c5a0adeaa0c467de797f240e4ee9b58c6ac51b9dad51bc0ba0c580fd265efebc04fa46dc23e5b3c4d6baf3ad0b8e2e82728cf34ef51973f028a90 btrfs-progs-v5.4.tar.xz +e32ff862d8f8606957225df2b53c1a4b08f655b2d2a1b15b5402f2ce538c5639d373e0a2eaff209dd5c6333754eab052f82481da7b5a42ae945ef48fad886d5d asciidoctor-build.patch" diff --git a/user/btrfs-progs/asciidoctor-build.patch b/user/btrfs-progs/asciidoctor-build.patch new file mode 100644 index 000000000..d7eedc406 --- /dev/null +++ b/user/btrfs-progs/asciidoctor-build.patch @@ -0,0 +1,40 @@ +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 + |