[gentoo-commits] repo/gentoo:master commit in: sys-fs/squashfs-tools-ng/, sys-fs/squashfs-tools-ng/files/
commit: e7258ea623a87d533f0860c5d298dc2e74c5fc8a Author: Matt Turner gentoo org> AuthorDate: Wed Aug 5 16:39:13 2020 + Commit: Matt Turner gentoo org> CommitDate: Wed Aug 5 16:44:03 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7258ea6 sys-fs/squashfs-tools-ng: Drop old versions Signed-off-by: Matt Turner gentoo.org> sys-fs/squashfs-tools-ng/Manifest | 2 - ...0-extras-Pass-flags-argument-to-fix-build.patch | 65 -- .../squashfs-tools-ng-0.9.1.ebuild | 51 - .../squashfs-tools-ng-1.0.0.ebuild | 55 -- 4 files changed, 173 deletions(-) diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest index ec198d9b12e..3c4ad20a177 100644 --- a/sys-fs/squashfs-tools-ng/Manifest +++ b/sys-fs/squashfs-tools-ng/Manifest @@ -1,3 +1 @@ -DIST squashfs-tools-ng-0.9.1.tar.xz 1026036 BLAKE2B 3e0a0acf5b11ea42bad2149a9b97442739f1eceacfc0f5b009403d4616fcd02d69082e2e0721be3a1d6d9ba67ce6287b12ea13fba6409cb751e844f5d48ce7ea SHA512 eb550430917f267ec1ef1d11795167a6893031fc184f914170679cd24c16930a8f73a2b04a349ce1602e80a327957db7935369965a892fbe4904b6e01bb48b5c -DIST squashfs-tools-ng-1.0.0.tar.xz 1079912 BLAKE2B b7a9e4cafc31c0058d73b1a8b69125f92d753214f6e9f0372558271bbd8df163d9b3bf3fea45b96da5044c86e75affc2bfd27826d3725a35fbb417e443cf6ccb SHA512 536f12aa53214f88739cea0d26c55e04434c284935ff1d59ee8f5108acd92fc11e800e42e3a112524d09dbd1fa50c4f15c3211ff5d02ae50b7fa137600d2ae15 DIST squashfs-tools-ng-1.0.1.tar.xz 1079720 BLAKE2B efc4d715c65d42876d5ac51364d195267c6bc6c2219fea5746231bc4efbd9adac3fa23ea58f837da8610179f3d96ec9422efebe4ae231f4ab243cf948e64fa9b SHA512 3b597b7bf654c6897e04dc6c18cec6034a8f0c0fe070c8d6eb3c8f4a06f4ab2ea8c970ac18c12f05ccb3015cf911790e945798a34361fdb7d1a442a1ca646a04 diff --git a/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-1.0.0-extras-Pass-flags-argument-to-fix-build.patch b/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-1.0.0-extras-Pass-flags-argument-to-fix-build.patch deleted file mode 100644 index e61d881c74b..000 --- a/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-1.0.0-extras-Pass-flags-argument-to-fix-build.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 4c10a491a2ddfcdc3226431a71aefd6ca71135d4 Mon Sep 17 00:00:00 2001 -From: Matt Turner -Date: Sat, 13 Jun 2020 11:05:49 -0700 -Subject: [PATCH] extras: Pass flags argument to fix build - -Missed in commit 259a98985b4f (Add flags to functions that might -logically be expanded in the future) - -Signed-off-by: Matt Turner - extras/browse.c | 10 +- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/extras/browse.c b/extras/browse.c -index ef4e223..86ce788 100644 a/extras/browse.c -+++ b/extras/browse.c -@@ -63,7 +63,7 @@ static void list_directory(const char *dirname) - - /* Get the directory inode we want to dump and open the directory */ - if (dirname == NULL) { -- ret = sqfs_dir_reader_open_dir(dr, working_dir); -+ ret = sqfs_dir_reader_open_dir(dr, working_dir, 0); - if (ret) - goto fail_open; - } else if (*dirname == '/') { -@@ -74,7 +74,7 @@ static void list_directory(const char *dirname) - if (ret) - goto fail_resolve; - -- ret = sqfs_dir_reader_open_dir(dr, inode); -+ ret = sqfs_dir_reader_open_dir(dr, inode, 0); - free(inode); - if (ret) - goto fail_open; -@@ -84,7 +84,7 @@ static void list_directory(const char *dirname) - if (ret) - goto fail_resolve; - -- ret = sqfs_dir_reader_open_dir(dr, inode); -+ ret = sqfs_dir_reader_open_dir(dr, inode, 0); - free(inode); - if (ret) - goto fail_open; -@@ -526,7 +526,7 @@ int main(int argc, char **argv) - } - - /* create a directory reader and get the root inode */ -- dr = sqfs_dir_reader_create(&super, cmp, file); -+ dr = sqfs_dir_reader_create(&super, cmp, file, 0); - if (dr == NULL) { - fprintf(stderr, "%s: error creating directory reader.\n", - argv[1]); -@@ -539,7 +539,7 @@ int main(int argc, char **argv) - } - - /* create a data reader */ -- data = sqfs_data_reader_create(file, super.block_size, cmp); -+ data = sqfs_data_reader_create(file, super.block_size, cmp, 0); - - if (data == NULL) { - fprintf(stderr, "%s: error creating data reader.\n", --- -2.26.2 - diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.9.1.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.9.1.ebuild deleted file mode 100644 index 79c567828dd..000 --- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.9.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2019-2020 Gen
[gentoo-commits] repo/gentoo:master commit in: sys-fs/squashfs-tools-ng/, sys-fs/squashfs-tools-ng/files/
commit: 46ed9f22401ebc1fc4558296c5403bc5900d7dac Author: Matt Turner gentoo org> AuthorDate: Sun May 3 21:21:51 2020 + Commit: Matt Turner gentoo org> CommitDate: Sun May 3 21:22:14 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46ed9f22 sys-fs/squashfs-tools-ng: Drop old versions Signed-off-by: Matt Turner gentoo.org> sys-fs/squashfs-tools-ng/Manifest | 3 -- ...ols-ng-0.9-Fix-missing-header-without-LZO.patch | 32 - .../squashfs-tools-ng/squashfs-tools-ng-0.7.ebuild | 51 .../squashfs-tools-ng/squashfs-tools-ng-0.8.ebuild | 51 .../squashfs-tools-ng/squashfs-tools-ng-0.9.ebuild | 55 -- 5 files changed, 192 deletions(-) diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest index a6bd4287b43..a356303181a 100644 --- a/sys-fs/squashfs-tools-ng/Manifest +++ b/sys-fs/squashfs-tools-ng/Manifest @@ -1,4 +1 @@ -DIST squashfs-tools-ng-0.7.tar.xz 372956 BLAKE2B 5fd0849c8cb0255ea56edc5b5cdc771363f5ca038f4306bb7d816ff26ce23cbd4f4652ef8ae497b8c9fe1ec09f9ebcfcf13aeb6b99b97db80a95018c25d4a3a6 SHA512 e53d7b64e68a40b49667b65d9fa8f12e977e8ca923c2fe9ce1e1def2745573f8607f7dee7ae6c06496489ef721c4c500ec40513ea5f6bd3ad4bb3a7796972b8e -DIST squashfs-tools-ng-0.8.tar.xz 1004616 BLAKE2B 5d347eef252886e7750da306f038494a15660350aca7b93aaf85a8411882489d8855c771e719a68b025f5c15fdc8b0d30727dde0884c5982460ff85d106fcd37 SHA512 7a533c7f9f21f717718a9ce5d775cf297c2e8edb6f121741b14692b52cbb6e3d7fe5cd59525222f7f9617440ea2adb2acec4dda3252abf3bebc689905b9fdc20 DIST squashfs-tools-ng-0.9.1.tar.xz 1026036 BLAKE2B 3e0a0acf5b11ea42bad2149a9b97442739f1eceacfc0f5b009403d4616fcd02d69082e2e0721be3a1d6d9ba67ce6287b12ea13fba6409cb751e844f5d48ce7ea SHA512 eb550430917f267ec1ef1d11795167a6893031fc184f914170679cd24c16930a8f73a2b04a349ce1602e80a327957db7935369965a892fbe4904b6e01bb48b5c -DIST squashfs-tools-ng-0.9.tar.xz 1020728 BLAKE2B 4f6672aecfa1f664198465154ad1d1ba92f741bcad576f90b58cdc982cc8a20d21dc7cfcb825604e2801ce187d5f984d55131c04859de0d7e67f515cddd781ac SHA512 6394cb851828f110ed6a3ab17923b214b79b8bb5550069407839da62e5316459d7f564cb31211c849508b9664f4f1f9030ce5f64d5c8649b8a73c3a869ab22d0 diff --git a/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-0.9-Fix-missing-header-without-LZO.patch b/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-0.9-Fix-missing-header-without-LZO.patch deleted file mode 100644 index cd32661e009..000 --- a/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-0.9-Fix-missing-header-without-LZO.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b3f2636f44eea1a8b6fbf892d2daa611cff9d4af Mon Sep 17 00:00:00 2001 -From: Alyssa Ross -Date: Wed, 1 Apr 2020 14:30:51 + -Subject: [PATCH] Fix missing header without LZO - -lib/common/compress.c: In function 'compressor_get_default': -lib/common/compress.c:39:2: warning: implicit declaration of function 'assert' [-Wimplicit-function-declaration] - 39 | assert(0); - | ^~ -lib/common/compress.c:8:1: note: 'assert' is defined in header ''; did you forget to '#include '? -7 | #include "common.h" - +++ |+#include -8 | - lib/common/compress.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/common/compress.c b/lib/common/compress.c -index ea7b71f..f16f080 100644 a/lib/common/compress.c -+++ b/lib/common/compress.c -@@ -5,6 +5,7 @@ - * Copyright (C) 2019 David Oberhollenzer - */ - #include "common.h" -+#include - - static int cmp_ids[] = { - SQFS_COMP_XZ, --- -2.24.1 - diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.7.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.7.ebuild deleted file mode 100644 index 22a2dbc93b6..000 --- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.7.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A new set of tools for working with SquashFS images" -HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng"; -if [[ ${PV} = * ]]; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/AgentD/${PN}.git"; -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz"; -fi - -LICENSE="LGPL-3+ tools? ( GPL-3+ )" -SLOT="0" -IUSE="lz4 lzo selinux +tools +xz zstd" - -DEPEND=" - sys-libs/zlib:= - lz4? ( app-arch/lz4:= ) - lzo? ( dev-libs/lzo:= ) - xz? ( app-arch/xz-utils:= ) - selinux? ( sys-libs/libselinux:= ) - zstd?( app-arch/zstd:= ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - [[ ${PV} == "" ]] && eautoreconf -} - -src_configure() { - local myconf=( - --disable-static - $(use_with lz4) - $(use_with lzo) - $(use_with s
[gentoo-commits] repo/gentoo:master commit in: sys-fs/squashfs-tools-ng/, sys-fs/squashfs-tools-ng/files/
commit: ddfed3ec49867b804baa6af98220ec437e8d117a Author: Matt Turner gentoo org> AuthorDate: Sat Apr 4 03:13:52 2020 + Commit: Matt Turner gentoo org> CommitDate: Sat Apr 4 03:14:55 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddfed3ec sys-fs/squashfs-tools-ng: Fix build failure Closes: https://bugs.gentoo.org/715790 Signed-off-by: Matt Turner gentoo.org> ...ols-ng-0.9-Fix-missing-header-without-LZO.patch | 32 ++ .../squashfs-tools-ng/squashfs-tools-ng-0.9.ebuild | 4 +++ 2 files changed, 36 insertions(+) diff --git a/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-0.9-Fix-missing-header-without-LZO.patch b/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-0.9-Fix-missing-header-without-LZO.patch new file mode 100644 index 000..cd32661e009 --- /dev/null +++ b/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-0.9-Fix-missing-header-without-LZO.patch @@ -0,0 +1,32 @@ +From b3f2636f44eea1a8b6fbf892d2daa611cff9d4af Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Wed, 1 Apr 2020 14:30:51 + +Subject: [PATCH] Fix missing header without LZO + +lib/common/compress.c: In function 'compressor_get_default': +lib/common/compress.c:39:2: warning: implicit declaration of function 'assert' [-Wimplicit-function-declaration] + 39 | assert(0); + | ^~ +lib/common/compress.c:8:1: note: 'assert' is defined in header ''; did you forget to '#include '? +7 | #include "common.h" + +++ |+#include +8 | +--- + lib/common/compress.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/common/compress.c b/lib/common/compress.c +index ea7b71f..f16f080 100644 +--- a/lib/common/compress.c b/lib/common/compress.c +@@ -5,6 +5,7 @@ + * Copyright (C) 2019 David Oberhollenzer + */ + #include "common.h" ++#include + + static int cmp_ids[] = { + SQFS_COMP_XZ, +-- +2.24.1 + diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.9.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.9.ebuild index 79c567828dd..366d46b0bdb 100644 --- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.9.ebuild +++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.9.ebuild @@ -27,6 +27,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-Fix-missing-header-without-LZO.patch +) + src_prepare() { default [[ ${PV} == "" ]] && eautoreconf