1 |
commit: 5240288de1ae51f86ed6ca31b3584fad3dd7366e |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 11 12:30:50 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 11 20:58:42 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5240288d |
7 |
|
8 |
sci-geosciences/geocode-glib: bump to 3.26.0 |
9 |
|
10 |
Remove long unnecessary (I think) gvfs[http] dep; old version |
11 |
did use g_file_new_for_uri on a http:// URI, but it's all |
12 |
direct libsoup nowadays, with g_file for local cache file only. |
13 |
|
14 |
Re-enable tests and remove unnecessary dbus machinery, as |
15 |
current tests seem to make no use of it. Patch the test suite |
16 |
to not install tests. |
17 |
|
18 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
19 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
20 |
|
21 |
sci-geosciences/geocode-glib/Manifest | 1 + |
22 |
.../files/disable-installed-tests.patch | 38 +++++++++++++++++++ |
23 |
.../geocode-glib/geocode-glib-3.26.0.ebuild | 43 ++++++++++++++++++++++ |
24 |
3 files changed, 82 insertions(+) |
25 |
|
26 |
diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest |
27 |
index 8960f1594e1..8a1c932fbf8 100644 |
28 |
--- a/sci-geosciences/geocode-glib/Manifest |
29 |
+++ b/sci-geosciences/geocode-glib/Manifest |
30 |
@@ -1 +1,2 @@ |
31 |
DIST geocode-glib-3.24.0.tar.xz 413536 BLAKE2B 37eebd39bb64d614af338e323b7c37c9bcf554d82b761c135326a9b2c0ab405901739ffe89f50c35932d162e4d2743a21caf4f446924c5d9f47bcf50eb11f4e8 SHA512 0e3910e99d164fdf5afd6befbcb7139a56779834fb1f2a318951c03e5196a31c4dafd7f88c37c7014377f15cd4d4b81e7080a440881e2c50aadaadf621abe3b6 |
32 |
+DIST geocode-glib-3.26.0.tar.xz 75984 BLAKE2B 72d7655e1066c276663ce90082d40c353a3c11ca13e51cb1568180d39e6058df5e7729b2206b44539ed70bd7fb8afeb7d4c264f7a541ab9b9c80223bcab0a457 SHA512 d0924673b669a29d04ad5f1d70797e98b67af3bc85edd8870d21d22d18ec8f2b93a13f94226e295ccb3c6e83d1545bdd2361ebacdbb1928c06b8beed36759838 |
33 |
|
34 |
diff --git a/sci-geosciences/geocode-glib/files/disable-installed-tests.patch b/sci-geosciences/geocode-glib/files/disable-installed-tests.patch |
35 |
new file mode 100644 |
36 |
index 00000000000..9358e489652 |
37 |
--- /dev/null |
38 |
+++ b/sci-geosciences/geocode-glib/files/disable-installed-tests.patch |
39 |
@@ -0,0 +1,38 @@ |
40 |
+--- a/geocode-glib/tests/meson.build 2019-01-11 14:10:47.797376871 +0200 |
41 |
++++ b/geocode-glib/tests/meson.build 2019-01-11 14:13:09.409159050 +0200 |
42 |
+@@ -3,7 +3,7 @@ |
43 |
+ e = executable('geo-uri', |
44 |
+ 'geo-uri.c', |
45 |
+ dependencies: geocode_glib_dep, |
46 |
+- install: true, |
47 |
++ install: false, |
48 |
+ install_dir: install_dir) |
49 |
+ test('Geo URI', e) |
50 |
+ |
51 |
+@@ -12,7 +12,7 @@ |
52 |
+ 'geocode-nominatim-test.c', |
53 |
+ 'geocode-glib.c', |
54 |
+ dependencies: geocode_glib_dep, |
55 |
+- install: true, |
56 |
++ install: false, |
57 |
+ install_dir: install_dir) |
58 |
+ env = ['G_TEST_SRCDIR=' + meson.current_source_dir()] |
59 |
+ test('API test', e, env: env) |
60 |
+@@ -20,10 +20,11 @@ |
61 |
+ e = executable('mock-backend', |
62 |
+ 'mock-backend.c', |
63 |
+ dependencies: geocode_glib_dep, |
64 |
+- install: true, |
65 |
++ install: false, |
66 |
+ install_dir: install_dir) |
67 |
+ test('Test mock backend', e) |
68 |
+ |
69 |
++if false |
70 |
+ install_data('locale_format.json', |
71 |
+ 'locale_name.json', |
72 |
+ 'nominatim-area.json', |
73 |
+@@ -39,3 +40,4 @@ |
74 |
+ 'search_lat_long.json', |
75 |
+ 'xep.json', |
76 |
+ install_dir: install_dir) |
77 |
++endif |
78 |
|
79 |
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.0.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.0.ebuild |
80 |
new file mode 100644 |
81 |
index 00000000000..018bb7e4086 |
82 |
--- /dev/null |
83 |
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.26.0.ebuild |
84 |
@@ -0,0 +1,43 @@ |
85 |
+# Copyright 1999-2019 Gentoo Authors |
86 |
+# Distributed under the terms of the GNU General Public License v2 |
87 |
+ |
88 |
+EAPI=6 |
89 |
+inherit gnome.org meson xdg |
90 |
+ |
91 |
+DESCRIPTION="GLib helper library for geocoding services" |
92 |
+HOMEPAGE="https://git.gnome.org/browse/geocode-glib" |
93 |
+ |
94 |
+LICENSE="LGPL-2+" |
95 |
+SLOT="0" |
96 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
97 |
+IUSE="gtk-doc +introspection test" |
98 |
+ |
99 |
+RDEPEND=" |
100 |
+ >=dev-libs/glib-2.44:2 |
101 |
+ >=dev-libs/json-glib-0.99.2[introspection?] |
102 |
+ >=net-libs/libsoup-2.42:2.4[introspection?] |
103 |
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= ) |
104 |
+" |
105 |
+DEPEND="${RDEPEND} |
106 |
+ dev-util/glib-utils |
107 |
+ gtk-doc? ( |
108 |
+ >=dev-util/gtk-doc-1.13 |
109 |
+ app-text/docbook-xml-dtd:4.3 ) |
110 |
+ >=sys-devel/gettext-0.19.8 |
111 |
+ virtual/pkgconfig |
112 |
+" |
113 |
+ |
114 |
+RESTRICT="!test? ( test )" |
115 |
+ |
116 |
+PATCHES=( |
117 |
+ "${FILESDIR}"/disable-installed-tests.patch |
118 |
+) |
119 |
+ |
120 |
+src_configure() { |
121 |
+ local emesonargs=( |
122 |
+ $(meson_use test enable-installed-tests) # Actual installation to live system is sedded out, but we need this for running them in src_test |
123 |
+ $(meson_use introspection enable-introspection) |
124 |
+ $(meson_use gtk-doc enable-gtk-doc) |
125 |
+ ) |
126 |
+ meson_src_configure |
127 |
+} |