[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtksourceview/, x11-libs/gtksourceview/files/

[Matt Turner]

commit:     284fa7b9c84407be55015e601768262d5c2c0f0d
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 01:54:50 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 01:55:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=284fa7b9

x11-libs/gtksourceview: Add patch to build with GCC-11

I mistakenly thought this patch was included in the v4.8.1 release when
I added it and closed bug #732784.

Closes: https://bugs.gentoo.org/732784
Closes: https://bugs.gentoo.org/786630
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 ...ble-Werror-for-incompatible-pointer-types.patch | 33 ++++++++++++++++++++++
 x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild  |  4 +++
 2 files changed, 37 insertions(+)

diff --git a/x11-libs/gtksourceview/files/4.8.1-build-disable-Werror-for-incompatible-pointer-types.patch b/x11-libs/gtksourceview/files/4.8.1-build-disable-Werror-for-incompatible-pointer-types.patch
new file mode 100644
index 00000000000..e13a65c3bc4
--- /dev/null
+++ b/x11-libs/gtksourceview/files/4.8.1-build-disable-Werror-for-incompatible-pointer-types.patch
@@ -0,0 +1,33 @@
+From d1ed58b2ab82bd5be55881088fc17ff1527511db Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert@××××××.com>
+Date: Thu, 15 Apr 2021 08:11:22 -0700
+Subject: [PATCH] build: disable -Werror for incompatible-pointer-types
+
+This causes an issue with volatile and GLib in some configurations, so
+just keep it out for now. We will bring it back at some point going
+forward.
+
+We are already doing the same in 5.0.
+
+Fixes #179
+---
+ meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 826a3121..6ff5b155 100644
+--- a/meson.build
++++ b/meson.build
+@@ -181,7 +181,8 @@ else
+     '-Werror=empty-body',
+     '-Werror=implicit',
+     '-Werror=implicit-function-declaration',
+-    '-Werror=incompatible-pointer-types',
++    # Disabled due to volatile changes in GLib
++    # '-Werror=incompatible-pointer-types',
+     '-Werror=init-self',
+     '-Werror=int-conversion',
+     '-Werror=int-to-pointer-cast',
+-- 
+2.26.3
+

diff --git a/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild b/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild
index c8e7a97d1ba..ea3909535ab 100644
--- a/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild
@@ -36,6 +36,10 @@ BDEPEND="
 	vala? ( $(vala_depend) )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-build-disable-Werror-for-incompatible-pointer-types.patch
+)
+
 src_prepare() {
 	use vala && vala_src_prepare
 	xdg_src_prepare