| 1 |
commit: 9d4ba7603a12af57ce917bdb80507462f8179de3 |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Tue Jun 1 17:24:04 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 1 19:01:28 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d4ba760 |
| 7 |
|
| 8 |
dev-util/devhelp: remove unused patches |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
| 11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 12 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-util/devhelp/files/3.30.1-optional-gedit.patch | 37 --------------------- |
| 15 |
.../files/3.30.1-optional-introspection.patch | 38 ---------------------- |
| 16 |
2 files changed, 75 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-util/devhelp/files/3.30.1-optional-gedit.patch b/dev-util/devhelp/files/3.30.1-optional-gedit.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index 09e4405a50e..00000000000 |
| 21 |
--- a/dev-util/devhelp/files/3.30.1-optional-gedit.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,37 +0,0 @@ |
| 24 |
-From 5bb00c3748741d585d544c96933a25bd399736ed Mon Sep 17 00:00:00 2001 |
| 25 |
-From: Mart Raudsepp <leio@g.o> |
| 26 |
-Date: Fri, 22 Mar 2019 19:47:49 +0200 |
| 27 |
-Subject: [PATCH 2/2] build: Add optionality for gedit plugin installation |
| 28 |
- |
| 29 |
---- |
| 30 |
- meson.build | 4 +++- |
| 31 |
- meson_options.txt | 1 + |
| 32 |
- 2 files changed, 4 insertions(+), 1 deletion(-) |
| 33 |
- |
| 34 |
-diff --git a/meson.build b/meson.build |
| 35 |
-index a0def09c..2d1d3e0a 100644 |
| 36 |
---- a/meson.build |
| 37 |
-+++ b/meson.build |
| 38 |
-@@ -155,7 +155,9 @@ add_global_arguments(supported_warning_cflags, language : 'c') |
| 39 |
- ##### end CFLAGS |
| 40 |
- |
| 41 |
- subdir('data') |
| 42 |
--subdir('plugins/gedit-plugin') |
| 43 |
-+if get_option('gedit_plugin') |
| 44 |
-+ subdir('plugins/gedit-plugin') |
| 45 |
-+endif |
| 46 |
- subdir('po') |
| 47 |
- subdir('help') |
| 48 |
- subdir('devhelp') |
| 49 |
-diff --git a/meson_options.txt b/meson_options.txt |
| 50 |
-index 2eaa7ff9..8fdb5a89 100644 |
| 51 |
---- a/meson_options.txt |
| 52 |
-+++ b/meson_options.txt |
| 53 |
-@@ -1,3 +1,4 @@ |
| 54 |
- option('flatpak_build', type : 'boolean', value : false, description : 'Flatpak build mode') |
| 55 |
-+option('gedit_plugin', type : 'boolean', value : true, description : 'Install the gedit plugin') |
| 56 |
- option('gtk_doc', type : 'boolean', value : false, description : 'Build the API reference') |
| 57 |
- option('introspection', type : 'boolean', value : true, description : 'Build GObject Introspection data') |
| 58 |
--- |
| 59 |
-2.17.0 |
| 60 |
- |
| 61 |
|
| 62 |
diff --git a/dev-util/devhelp/files/3.30.1-optional-introspection.patch b/dev-util/devhelp/files/3.30.1-optional-introspection.patch |
| 63 |
deleted file mode 100644 |
| 64 |
index b5afa8a2b87..00000000000 |
| 65 |
--- a/dev-util/devhelp/files/3.30.1-optional-introspection.patch |
| 66 |
+++ /dev/null |
| 67 |
@@ -1,38 +0,0 @@ |
| 68 |
-From 3434481e901a0ffbcba9817e4c0641ca8c19275a Mon Sep 17 00:00:00 2001 |
| 69 |
-From: Mart Raudsepp <leio@g.o> |
| 70 |
-Date: Fri, 22 Mar 2019 19:44:40 +0200 |
| 71 |
-Subject: [PATCH 1/2] build: Add optionality for introspection build |
| 72 |
- |
| 73 |
---- |
| 74 |
- devhelp/meson.build | 2 ++ |
| 75 |
- meson_options.txt | 1 + |
| 76 |
- 2 files changed, 3 insertions(+) |
| 77 |
- |
| 78 |
-diff --git a/devhelp/meson.build b/devhelp/meson.build |
| 79 |
-index ea217895..f88fcb07 100644 |
| 80 |
---- a/devhelp/meson.build |
| 81 |
-+++ b/devhelp/meson.build |
| 82 |
-@@ -123,6 +123,7 @@ PKG_CONFIG.generate( |
| 83 |
- requires : LIBDEVHELP_DEPS_STR |
| 84 |
- ) |
| 85 |
- |
| 86 |
-+if get_option('introspection') |
| 87 |
- GNOME.generate_gir( |
| 88 |
- libdevhelp, |
| 89 |
- export_packages : 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL), |
| 90 |
-@@ -139,3 +140,4 @@ GNOME.generate_gir( |
| 91 |
- include_directories : ROOT_INCLUDE_DIR, |
| 92 |
- install : true |
| 93 |
- ) |
| 94 |
-+endif |
| 95 |
-diff --git a/meson_options.txt b/meson_options.txt |
| 96 |
-index a10fc603..2eaa7ff9 100644 |
| 97 |
---- a/meson_options.txt |
| 98 |
-+++ b/meson_options.txt |
| 99 |
-@@ -1,2 +1,3 @@ |
| 100 |
- option('flatpak_build', type : 'boolean', value : false, description : 'Flatpak build mode') |
| 101 |
- option('gtk_doc', type : 'boolean', value : false, description : 'Build the API reference') |
| 102 |
-+option('introspection', type : 'boolean', value : true, description : 'Build GObject Introspection data') |
| 103 |
--- |
| 104 |
-2.17.0 |
| 105 |
- |
Archives