gentoo resync : 05.04.2019

2 files changed, 75 insertions, 0 deletions

diff --git a/dev-util/devhelp/files/3.30.1-optional-gedit.patch b/dev-util/devhelp/files/3.30.1-optional-gedit.patch
new file mode 100644
index 000000000000..09e4405a50e0
--- /dev/null
+++ b/dev-util/devhelp/files/3.30.1-optional-gedit.patch
@@ -0,0 +1,37 @@
+From 5bb00c3748741d585d544c96933a25bd399736ed Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Fri, 22 Mar 2019 19:47:49 +0200
+Subject: [PATCH 2/2] build: Add optionality for gedit plugin installation
+
+---
+ meson.build       | 4 +++-
+ meson_options.txt | 1 +
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index a0def09c..2d1d3e0a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -155,7 +155,9 @@ add_global_arguments(supported_warning_cflags, language : 'c')
+ ##### end CFLAGS
+ 
+ subdir('data')
+-subdir('plugins/gedit-plugin')
++if get_option('gedit_plugin')
++  subdir('plugins/gedit-plugin')
++endif
+ subdir('po')
+ subdir('help')
+ subdir('devhelp')
+diff --git a/meson_options.txt b/meson_options.txt
+index 2eaa7ff9..8fdb5a89 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,4 @@
+ option('flatpak_build', type : 'boolean', value : false, description : 'Flatpak build mode')
++option('gedit_plugin', type : 'boolean', value : true, description : 'Install the gedit plugin')
+ option('gtk_doc', type : 'boolean', value : false, description : 'Build the API reference')
+ option('introspection', type : 'boolean', value : true, description : 'Build GObject Introspection data')
+-- 
+2.17.0
+
diff --git a/dev-util/devhelp/files/3.30.1-optional-introspection.patch b/dev-util/devhelp/files/3.30.1-optional-introspection.patch
new file mode 100644
index 000000000000..b5afa8a2b874
--- /dev/null
+++ b/dev-util/devhelp/files/3.30.1-optional-introspection.patch
@@ -0,0 +1,38 @@
+From 3434481e901a0ffbcba9817e4c0641ca8c19275a Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Fri, 22 Mar 2019 19:44:40 +0200
+Subject: [PATCH 1/2] build: Add optionality for introspection build
+
+---
+ devhelp/meson.build | 2 ++
+ meson_options.txt   | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/devhelp/meson.build b/devhelp/meson.build
+index ea217895..f88fcb07 100644
+--- a/devhelp/meson.build
++++ b/devhelp/meson.build
+@@ -123,6 +123,7 @@ PKG_CONFIG.generate(
+         requires : LIBDEVHELP_DEPS_STR
+ )
+ 
++if get_option('introspection')
+ GNOME.generate_gir(
+         libdevhelp,
+         export_packages : 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL),
+@@ -139,3 +140,4 @@ GNOME.generate_gir(
+         include_directories : ROOT_INCLUDE_DIR,
+         install : true
+ )
++endif
+diff --git a/meson_options.txt b/meson_options.txt
+index a10fc603..2eaa7ff9 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,2 +1,3 @@
+ option('flatpak_build', type : 'boolean', value : false, description : 'Flatpak build mode')
+ option('gtk_doc', type : 'boolean', value : false, description : 'Build the API reference')
++option('introspection', type : 'boolean', value : true, description : 'Build GObject Introspection data')
+-- 
+2.17.0
+