gentoo resync : 04.05.2021

2 files changed, 90 insertions, 0 deletions

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 000000000000..e13a65c3bc4d
--- /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@redhat.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/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch b/x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch
new file mode 100644
index 000000000000..3fde96b14850
--- /dev/null
+++ b/x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch
@@ -0,0 +1,57 @@
+From 9bea9d1c4a56310701717bb106c52a5324ee392a Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert@redhat.com>
+Date: Sun, 7 Mar 2021 08:54:15 -0800
+Subject: [PATCH] build: ensure access to resources in corelib build
+
+This should help with some transient build failures in dependent projects.
+---
+ gtksourceview/meson.build | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/gtksourceview/meson.build b/gtksourceview/meson.build
+index fd080a9c..b6192604 100644
+--- a/gtksourceview/meson.build
++++ b/gtksourceview/meson.build
+@@ -172,12 +172,18 @@ gtksourceversion_h = configure_file(
+     install_dir: join_paths(pkgincludedir, 'gtksourceview'),
+ )
+ 
++gtksource_res = gnome.compile_resources(
++  'gtksourceview-gresources',
++  'gtksourceview.gresource.xml'
++)
++
+ core_sources = [
+   core_public_c,
+   core_private_c,
+   core_enums,
+   gtksourceversion_h,
+   core_marshallers,
++  gtksource_res,
+ ]
+ 
+ install_headers(
+@@ -216,11 +222,6 @@ extra_public_sources = []
+ 
+ subdir('completion-providers')
+ 
+-gtksource_res = gnome.compile_resources(
+-  'gtksourceview-gresources',
+-  'gtksourceview.gresource.xml'
+-)
+-
+ 
+ # We can't use the static libs on Visual Studio builds
+ # to form our DLL here directly, so we must use
+@@ -233,7 +234,7 @@ foreach int_lib : gtksource_libs
+   gtksource_objs += int_lib.extract_all_objects()
+ endforeach
+ 
+-gtksource_lib = shared_library(package_string, gtksource_res,
++gtksource_lib = shared_library(package_string,
+                 version: lib_version,
+         darwin_versions: lib_osx_version,
+     include_directories: gtksourceview_include_dirs,
+-- 
+2.26.3
+