Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/totem-pl-parser/files/
Date: Sat, 20 Apr 2019 23:25:28
Message-Id: 1555723728.05dd51216c3eb04489f1b2b28632dbb257cd0dd6.bman@gentoo
1 commit: 05dd51216c3eb04489f1b2b28632dbb257cd0dd6
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Apr 7 14:46:31 2019 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 20 01:28:48 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05dd5121
7
8 dev-libs/totem-pl-parser: remove unused patch
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/11626
12 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
13
14 .../files/3.26.2-optional-introspection.patch | 35 ----------------------
15 1 file changed, 35 deletions(-)
16
17 diff --git a/dev-libs/totem-pl-parser/files/3.26.2-optional-introspection.patch b/dev-libs/totem-pl-parser/files/3.26.2-optional-introspection.patch
18 deleted file mode 100644
19 index f258b20b73d..00000000000
20 --- a/dev-libs/totem-pl-parser/files/3.26.2-optional-introspection.patch
21 +++ /dev/null
22 @@ -1,35 +0,0 @@
23 -From e097a4608cafac147546db658a4a37f8a23715ca Mon Sep 17 00:00:00 2001
24 -From: Mart Raudsepp <leio@g.o>
25 -Date: Thu, 17 Jan 2019 01:16:40 +0200
26 -Subject: [PATCH] build: make introspection optional, not based on
27 - cross-compiling
28 -
29 -This is how most other projects do it - cross-compiling that hits trouble
30 -can just disable it then.
31 -
32 -diff --git a/meson_options.txt b/meson_options.txt
33 -index 9c32a5f..58e9f8c 100644
34 ---- a/meson_options.txt
35 -+++ b/meson_options.txt
36 -@@ -6,3 +6,5 @@ option('enable-libgcrypt', type: 'combo', choices : ['yes', 'no', 'auto'], value
37 - description : 'Enable libgcrypt support.')
38 - option('enable-gtk-doc', type: 'boolean', value: 'false',
39 - description : 'Generate the API reference (depends on GTK-Doc)')
40 -+option('enable-introspection', type: 'boolean', value: 'true',
41 -+ description : 'Generate gobject-introspection bindings')
42 -diff --git a/plparse/meson.build b/plparse/meson.build
43 -index bdfde9d..ad4e344 100644
44 ---- a/plparse/meson.build
45 -+++ b/plparse/meson.build
46 -@@ -121,7 +121,7 @@ if have_quvi
47 - endif
48 -
49 - # Introspection
50 --if not meson.is_cross_build()
51 -+if get_option('enable-introspection')
52 - gnome.generate_gir(plparser_lib,
53 - sources: plparser_public_headers + plparser_sources + [
54 - totem_pl_parser_marshalers[1],
55 ---
56 -2.17.0
57 -