Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/totem-pl-parser/, dev-libs/totem-pl-parser/files/
Date: Thu, 17 Jan 2019 10:23:21
Message-Id: 1547720582.c8297e8429431c95e37fcaa44962240567bf56ea.leio@gentoo
1 commit: c8297e8429431c95e37fcaa44962240567bf56ea
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 17 10:14:55 2019 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 17 10:23:02 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8297e84
7
8 dev-libs/totem-pl-parser: bump to 3.26.2
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 dev-libs/totem-pl-parser/Manifest | 1 +
14 .../files/3.26.2-optional-introspection.patch | 35 +++++++++++
15 .../totem-pl-parser/totem-pl-parser-3.26.2.ebuild | 68 ++++++++++++++++++++++
16 3 files changed, 104 insertions(+)
17
18 diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
19 index bf321894776..2f0258c541c 100644
20 --- a/dev-libs/totem-pl-parser/Manifest
21 +++ b/dev-libs/totem-pl-parser/Manifest
22 @@ -1 +1,2 @@
23 DIST totem-pl-parser-3.10.8.tar.xz 1618992 BLAKE2B ab7dc3010afb9a2112f19991ee74c43436962a66fa233162b2d2c6743e5727762102f6f0bfed2a30750c0d4e3cf0fbfdb7fdab8568b0cb827e49d0f99a938c41 SHA512 1692fe6d183838bdfb9125ae2bf9fbf74762333a7ebb6becc755bfdbfb8d2ea1ae257f42aab7b7a1ab419aee2b35902176a731f26736a62015806d1423adae70
24 +DIST totem-pl-parser-3.26.2.tar.xz 1314032 BLAKE2B 1513223e7cdebf1b16587a8ef899dd0318d0474d3987a346525cb0f77966c87bf858510c6432f204e4ec758467da273c8644fa6976eb0da237b729f507763646 SHA512 b4d05f6c41942d243be411fb58aa557c0402eac56acc4fc213214a59d20df4354c17d5dec4064a5580f88e721411a16953e69e94c2ebe98e1aaf8b0729b8a83d
25
26 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
27 new file mode 100644
28 index 00000000000..f258b20b73d
29 --- /dev/null
30 +++ b/dev-libs/totem-pl-parser/files/3.26.2-optional-introspection.patch
31 @@ -0,0 +1,35 @@
32 +From e097a4608cafac147546db658a4a37f8a23715ca Mon Sep 17 00:00:00 2001
33 +From: Mart Raudsepp <leio@g.o>
34 +Date: Thu, 17 Jan 2019 01:16:40 +0200
35 +Subject: [PATCH] build: make introspection optional, not based on
36 + cross-compiling
37 +
38 +This is how most other projects do it - cross-compiling that hits trouble
39 +can just disable it then.
40 +
41 +diff --git a/meson_options.txt b/meson_options.txt
42 +index 9c32a5f..58e9f8c 100644
43 +--- a/meson_options.txt
44 ++++ b/meson_options.txt
45 +@@ -6,3 +6,5 @@ option('enable-libgcrypt', type: 'combo', choices : ['yes', 'no', 'auto'], value
46 + description : 'Enable libgcrypt support.')
47 + option('enable-gtk-doc', type: 'boolean', value: 'false',
48 + description : 'Generate the API reference (depends on GTK-Doc)')
49 ++option('enable-introspection', type: 'boolean', value: 'true',
50 ++ description : 'Generate gobject-introspection bindings')
51 +diff --git a/plparse/meson.build b/plparse/meson.build
52 +index bdfde9d..ad4e344 100644
53 +--- a/plparse/meson.build
54 ++++ b/plparse/meson.build
55 +@@ -121,7 +121,7 @@ if have_quvi
56 + endif
57 +
58 + # Introspection
59 +-if not meson.is_cross_build()
60 ++if get_option('enable-introspection')
61 + gnome.generate_gir(plparser_lib,
62 + sources: plparser_public_headers + plparser_sources + [
63 + totem_pl_parser_marshalers[1],
64 +--
65 +2.17.0
66 +
67
68 diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.2.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.2.ebuild
69 new file mode 100644
70 index 00000000000..10d51035833
71 --- /dev/null
72 +++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.2.ebuild
73 @@ -0,0 +1,68 @@
74 +# Copyright 1999-2019 Gentoo Authors
75 +# Distributed under the terms of the GNU General Public License v2
76 +
77 +EAPI=6
78 +inherit gnome.org meson xdg
79 +
80 +DESCRIPTION="Playlist parsing library"
81 +HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/"
82 +
83 +LICENSE="LGPL-2+"
84 +SLOT="0/18"
85 +IUSE="archive crypt gtk-doc +introspection +quvi test"
86 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
87 +
88 +RDEPEND="
89 + >=dev-libs/glib-2.36:2
90 + quvi? ( >=media-libs/libquvi-0.9.1:0= )
91 + archive? ( >=app-arch/libarchive-3 )
92 + dev-libs/libxml2:2
93 + crypt? ( dev-libs/libgcrypt:0= )
94 + introspection? ( >=dev-libs/gobject-introspection-1.54:= )
95 +"
96 +DEPEND="${RDEPEND}
97 + dev-util/glib-utils
98 + gtk-doc? (
99 + >=dev-util/gtk-doc-1.14
100 + app-text/docbook-xml-dtd:4.3 )
101 + >=sys-devel/gettext-0.19.8
102 + virtual/pkgconfig
103 + test? (
104 + gnome-base/gvfs[http]
105 + sys-apps/dbus )
106 +"
107 +
108 +PATCHES=(
109 + "${FILESDIR}"/${PV}-optional-introspection.patch
110 +)
111 +
112 +src_prepare() {
113 + # Disable tests requiring network access, bug #346127
114 + # 3rd test fails on upgrade, not once installed
115 + # Leio: I consider network tests important for ensuring full functionality, thus trying with them again */
116 + #sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
117 + # -e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \
118 + # -e 's:\(g_test_add_func.*/parser/parsability.*\):/*\1*/:'\
119 + # -i plparse/tests/parser.c || die "sed failed"
120 +
121 + xdg_src_prepare
122 +}
123 +
124 +src_configure() {
125 + # uninstalled-tests is abused to switch from loading live FS helper
126 + # to in-build-tree helper, check on upgrades this is not having other
127 + # consequences, bug #630242
128 + local emesonargs=(
129 + -Denable-quvi=$(usex quvi yes no)
130 + -Denable-libarchive=$(usex archive yes no)
131 + -Denable-libgcrypt=$(usex crypt yes no)
132 + $(meson_use gtk-doc enable-gtk-doc)
133 + $(meson_use introspection enable-introspection)
134 + )
135 + meson_src_configure
136 +}
137 +
138 +src_test() {
139 + # This is required as told by upstream in bgo#629542
140 + GVFS_DISABLE_FUSE=1 dbus-run-session meson test -C "${BUILD_DIR}"
141 +}