commit: 16e7e9c773c4b320e7287349aac293970136f61a Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Fri Nov 27 17:36:40 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri Nov 27 17:36:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16e7e9c7
dev-util/difffilter: fix build with gcc-10 Closes: https://bugs.gentoo.org/706900 Package-Manager: Portage-3.0.9, Repoman-3.0.1 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> gentoo.org> dev-util/difffilter/difffilter-0.3.3-r1.ebuild | 12 +++++------- dev-util/difffilter/files/difffilter-0.3.3-fno-common.patch | 11 +++++++++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dev-util/difffilter/difffilter-0.3.3-r1.ebuild b/dev-util/difffilter/difffilter-0.3.3-r1.ebuild index 1b210f17216..bffbd2c1c63 100644 --- a/dev-util/difffilter/difffilter-0.3.3-r1.ebuild +++ b/dev-util/difffilter/difffilter-0.3.3-r1.ebuild @@ -11,14 +11,12 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux" -RDEPEND=" - >=dev-libs/liblist-2.3.1 +RDEPEND=">=dev-libs/liblist-2.3.1 dev-libs/libstrl - dev-libs/tre -" -DEPEND=" - ${RDEPEND} -" + dev-libs/tre" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) src_install() { default diff --git a/dev-util/difffilter/files/difffilter-0.3.3-fno-common.patch b/dev-util/difffilter/files/difffilter-0.3.3-fno-common.patch new file mode 100644 index 00000000000..8e4c57738b7 --- /dev/null +++ b/dev-util/difffilter/files/difffilter-0.3.3-fno-common.patch @@ -0,0 +1,11 @@ +--- a/src/block.h ++++ b/src/block.h +@@ -38,7 +38,7 @@ + * The string literal ``\ No newline at end of file'' including the + * newline at the end. + */ +-const char *DIFFFILTER_DIFF_NO_NL_AT_EOF; ++extern const char *DIFFFILTER_DIFF_NO_NL_AT_EOF; + + struct diff_block; + typedef struct diff_block *diff_block_t;
