dev-libs/appstream: Fix build with GCC-7.3.0

Reported-by: Oruriz <[email protected]> Thanks-to: Felix Tiede <[email protected]> Closes: https://bugs.gentoo.org/670584 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <[email protected]>
johu · Nov 17, 2018 · 1108720 · 1108720
1 parent 17eaf6d
commit 1108720
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/dev-libs/appstream/appstream-0.12.2.ebuild b/dev-libs/appstream/appstream-0.12.2.ebuild
@@ -43,6 +43,8 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-gcc-7.3.patch" )
+
 src_prepare() {
 	default
 	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die

diff --git a/dev-libs/appstream/files/appstream-0.12.2-gcc-7.3.patch b/dev-libs/appstream/files/appstream-0.12.2-gcc-7.3.patch
@@ -0,0 +1,24 @@
+From 9252de815e4443d1b617211f38685afe7c0f6b0e Mon Sep 17 00:00:00 2001
+From: Matthias Klumpp <[email protected]>
+Date: Sat, 20 Oct 2018 20:20:09 +0200
+Subject: [PATCH] Explicitly include string.h in as-tag.c
+
+This apparently is necessary to fix an FTBFS issue with older GCC
+releases. Resolves #207
+---
+ src/as-tag.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/as-tag.c b/src/as-tag.c
+index 6afba621..91076e69 100644
+--- a/src/as-tag.c
++++ b/src/as-tag.c
+@@ -32,6 +32,8 @@
+
+ #include "as-tag.h"
+
++#include <string.h>
++
+ #ifdef __clang__
+ #pragma clang diagnostic ignored "-Wmissing-field-initializers"
+ #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,6 +43,8 @@ DEPEND="${RDEPEND} @@
     	)
     "
+    PATCHES=( "${FILESDIR}/${P}-gcc-7.3.patch" )
     src_prepare() {
     	default
     	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
@@ Expand Down @@