commit:     c00dbd5fd54a3b9f6cfecfad906f30cc2d551bf2
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Wed Apr 28 21:21:04 2021 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Wed Apr 28 21:21:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c00dbd5f

sys-fs/dwarfs: fix patch and ebuild

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild              | 1 -
 sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild 
b/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild
index f45a47b0b..fb546ce27 100644
--- a/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild
+++ b/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild
@@ -57,7 +57,6 @@ BDEPEND="
 
        test? ( dev-cpp/gtest )
 "
->>>>>>> f29f4045 (sys-fs/dwarfs: unbundling 
WIP):sys-fs/dwarfs/dwarfs-0.5.4-r1.ebuild
 
 CHECKREQS_DISK_BUILD="1300M"
 

diff --git a/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch 
b/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch
index 62f4ee1f9..853ebe046 100644
--- a/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch
+++ b/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt     2021-04-28 16:56:24.432666631 +0200
-+++ CMakeLists.txt2    2021-04-28 17:00:04.622812742 +0200
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -298,7 +298,7 @@
  if(WITH_TESTS OR WITH_BENCHMARKS)
    add_library(test_helpers test/test_helpers.cpp test/test_strings.cpp

Reply via email to