gentoo auto-resync : 25:10:2022 - 21:54:27

2 files changed, 59 insertions, 0 deletions

diff --git a/net-libs/libsignon-glib/files/libsignon-glib-2.1-docs-optional.patch b/net-libs/libsignon-glib/files/libsignon-glib-2.1-docs-optional.patch
new file mode 100644
index 000000000000..b31bd46a825e
--- /dev/null
+++ b/net-libs/libsignon-glib/files/libsignon-glib-2.1-docs-optional.patch
@@ -0,0 +1,28 @@
+From fc1098b3a376a04020c9e733eafda9fa0ac51723 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.pino@tiscali.it>
+Date: Sat, 2 Jan 2021 14:19:18 +0100
+Subject: [PATCH] build: make documentation really optional
+
+Build of the documentation only if the meson option for it is enabled.
+---
+ meson.build | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 5d0de55..b10f80d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -23,7 +23,9 @@ endif
+ root_dir = include_directories ('.')
+ 
+ subdir('libsignon-glib')
+-subdir('docs')
++if get_option('documentation')
++    subdir('docs')
++endif
+ 
+ if get_option('python')
+     subdir('pygobject')
+-- 
+GitLab
+
diff --git a/net-libs/libsignon-glib/files/libsignon-glib-2.1-meson-0.61.patch b/net-libs/libsignon-glib/files/libsignon-glib-2.1-meson-0.61.patch
new file mode 100644
index 000000000000..66254e398029
--- /dev/null
+++ b/net-libs/libsignon-glib/files/libsignon-glib-2.1-meson-0.61.patch
@@ -0,0 +1,31 @@
+From 4fae9155a19aca601072f361768e0bf8ed556b1e Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Tue, 11 Jan 2022 22:05:11 +0100
+Subject: [PATCH] Fix build with meson >= 0.61.0
+
+Otherwise it fails with "docs/reference/meson.build:21:6: ERROR:
+gnome.gtkdoc keyword argument 'expand_content_files' was of type
+array[File] but should have been array[str]".
+---
+ docs/reference/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/reference/meson.build b/docs/reference/meson.build
+index 654404b..3927109 100644
+--- a/docs/reference/meson.build
++++ b/docs/reference/meson.build
+@@ -47,9 +47,9 @@ gnome.gtkdoc(
+         'libsignon-glib.types',
+     ],
+     content_files: doc_content_files,
+-    expand_content_files: files(
++    expand_content_files: [
+         'migrating-1to2.xml'
+-    ),
++    ],
+     fixxref_args: [
+         '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
+         '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
+-- 
+GitLab
+