Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: sys-fs/dwarfs/files/, sys-fs/dwarfs/
Date: Thu, 29 Apr 2021 08:23:35
Message-Id: 1619644864.c00dbd5fd54a3b9f6cfecfad906f30cc2d551bf2.mgorny@gentoo
1 commit: c00dbd5fd54a3b9f6cfecfad906f30cc2d551bf2
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Wed Apr 28 21:21:04 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 28 21:21:04 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c00dbd5f
7
8 sys-fs/dwarfs: fix patch and ebuild
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
12
13 sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild | 1 -
14 sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch | 4 ++--
15 2 files changed, 2 insertions(+), 3 deletions(-)
16
17 diff --git a/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild b/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild
18 index f45a47b0b..fb546ce27 100644
19 --- a/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild
20 +++ b/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild
21 @@ -57,7 +57,6 @@ BDEPEND="
22
23 test? ( dev-cpp/gtest )
24 "
25 ->>>>>>> f29f4045 (sys-fs/dwarfs: unbundling WIP):sys-fs/dwarfs/dwarfs-0.5.4-r1.ebuild
26
27 CHECKREQS_DISK_BUILD="1300M"
28
29
30 diff --git a/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch b/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch
31 index 62f4ee1f9..853ebe046 100644
32 --- a/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch
33 +++ b/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch
34 @@ -1,5 +1,5 @@
35 ---- CMakeLists.txt 2021-04-28 16:56:24.432666631 +0200
36 -+++ CMakeLists.txt2 2021-04-28 17:00:04.622812742 +0200
37 +--- a/CMakeLists.txt
38 ++++ b/CMakeLists.txt
39 @@ -298,7 +298,7 @@
40 if(WITH_TESTS OR WITH_BENCHMARKS)
41 add_library(test_helpers test/test_helpers.cpp test/test_strings.cpp