[gentoo-commits] repo/gentoo:master commit in: dev-util/devhelp/files/

[gentoo-commits] repo/gentoo:master commit in: dev-util/devhelp/files/

[Matt Turner]

commit:     9d4ba7603a12af57ce917bdb80507462f8179de3
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jun  1 17:24:04 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jun  1 19:01:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d4ba760

dev-util/devhelp: remove unused patches

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/devhelp/files/3.30.1-optional-gedit.patch | 37 ---------------------
 .../files/3.30.1-optional-introspection.patch      | 38 ----------------------
 2 files changed, 75 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
deleted file mode 100644
index 09e4405a50e..00000000000
--- a/dev-util/devhelp/files/3.30.1-optional-gedit.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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
deleted file mode 100644
index b5afa8a2b87..00000000000
--- a/dev-util/devhelp/files/3.30.1-optional-introspection.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
-

[gentoo-commits] repo/gentoo:master commit in: dev-util/devhelp/files/

[Matt Turner]

commit:     5ac10b6fe2826a1adba0807f6c7b98fd577aef01
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Mar 20 17:04:09 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 19:54:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ac10b6f

dev-util/devhelp: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../files/40.0-optional-introspection.patch        | 47 ----------------------
 1 file changed, 47 deletions(-)

diff --git a/dev-util/devhelp/files/40.0-optional-introspection.patch b/dev-util/devhelp/files/40.0-optional-introspection.patch
deleted file mode 100644
index d4c00d369d63..000000000000
--- a/dev-util/devhelp/files/40.0-optional-introspection.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 6c982d00f9d6f03f916bb6a572e7f938cd56fa74 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 22 Mar 2019 19:44:40 +0200
-Subject: [PATCH] build: Add optionality for introspection build
-
----
- devhelp/meson.build | 2 ++
- meson_options.txt   | 6 ++++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/devhelp/meson.build b/devhelp/meson.build
-index eef055e7..eeaa51eb 100644
---- a/devhelp/meson.build
-+++ b/devhelp/meson.build
-@@ -120,6 +120,7 @@ PKG_CONFIG.generate(
-   requires_private: LIBDEVHELP_PRIVATE_DEPS
- )
- 
-+if get_option('introspection')
- GNOME.generate_gir(
-   libdevhelp_shared_lib,
-   export_packages: 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL),
-@@ -140,3 +141,4 @@ GNOME.generate_gir(
-     '--quiet',
-   ],
- )
-+endif
-diff --git a/meson_options.txt b/meson_options.txt
-index 17dc85f5..c69a2906 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -10,6 +10,12 @@ option(
-   description: 'Build the API reference'
- )
- 
-+option(
-+  'introspection',
-+  type: 'boolean', value: true,
-+  description: 'Build GObject Introspection data'
-+)
-+
- option(
-   'plugin_emacs',
-   type: 'boolean', value: false,
--- 
-2.26.3
-