1 |
commit: 3cde84b767b5c2a811d008681382c0042810567c |
2 |
Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de> |
3 |
AuthorDate: Sat Sep 24 16:02:52 2022 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 28 00:30:39 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cde84b7 |
7 |
|
8 |
sci-geosciences/geocode-glib: Add SLOT="2" for libsoup:3.0 support |
9 |
|
10 |
This provides geocode-glib-2.0. |
11 |
|
12 |
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de> |
13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
14 |
|
15 |
profiles/package.mask | 1 + |
16 |
.../files/3.26.4-r200-do-not-install-icons.patch | 27 ++++++++++++ |
17 |
.../geocode-glib/geocode-glib-3.26.4-r200.ebuild | 48 ++++++++++++++++++++++ |
18 |
3 files changed, 76 insertions(+) |
19 |
|
20 |
diff --git a/profiles/package.mask b/profiles/package.mask |
21 |
index 5273fe3935d3..c6e9d675e9b2 100644 |
22 |
--- a/profiles/package.mask |
23 |
+++ b/profiles/package.mask |
24 |
@@ -559,6 +559,7 @@ sys-devel/automake:1.11 |
25 |
>=gnome-extra/gnome-calculator-43 |
26 |
net-libs/libsoup:3.0 |
27 |
net-libs/webkit-gtk:4.1 |
28 |
+sci-geosciences/geocode-glib:2 |
29 |
|
30 |
# Thomas Deutschmann <whissi@g.o> (2021-09-07) |
31 |
# Masked while being tested and reverse deps aren't fully compatible |
32 |
|
33 |
diff --git a/sci-geosciences/geocode-glib/files/3.26.4-r200-do-not-install-icons.patch b/sci-geosciences/geocode-glib/files/3.26.4-r200-do-not-install-icons.patch |
34 |
new file mode 100644 |
35 |
index 000000000000..c85e250e5c2f |
36 |
--- /dev/null |
37 |
+++ b/sci-geosciences/geocode-glib/files/3.26.4-r200-do-not-install-icons.patch |
38 |
@@ -0,0 +1,27 @@ |
39 |
+geocode-glib-3.26.4 in SLOT="2" has file collissions with geocode-glib-3.26.4 with SLOT="0". |
40 |
+These file collissions are only 11 svg-files. We do not install them with SLOT="2" and instead only install them with SLOT="0" and |
41 |
+SLOT="2" depends on SLOT="0" to make sure users that try to only install SLOT="2" get the files regardless. |
42 |
+ |
43 |
+2022-09-24 - Pascal Jaeger (Schievel) <pascal.jaeger@×××××××××.de> |
44 |
+ |
45 |
+--- |
46 |
+ |
47 |
+diff --git a/icons/meson.build b/icons/meson.build |
48 |
+index 8d58886..edecbed 100644 |
49 |
+--- a/icons/meson.build |
50 |
++++ b/icons/meson.build |
51 |
+@@ -10,14 +10,3 @@ public_icons = [ 'poi-airport.svg', |
52 |
+ 'poi-restaurant.svg', |
53 |
+ 'poi-bar.svg', |
54 |
+ 'poi-light-rail-station.svg' ] |
55 |
+- |
56 |
+-foreach icon : public_icons |
57 |
+- file = join_paths('maki' , icon) |
58 |
+- install_dir = join_paths(get_option('datadir'), |
59 |
+- 'icons', |
60 |
+- 'hicolor', |
61 |
+- 'scalable', |
62 |
+- 'places') |
63 |
+- |
64 |
+- install_data(file, install_dir: install_dir) |
65 |
+-endforeach |
66 |
|
67 |
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r200.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r200.ebuild |
68 |
new file mode 100644 |
69 |
index 000000000000..2912deb19a51 |
70 |
--- /dev/null |
71 |
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r200.ebuild |
72 |
@@ -0,0 +1,48 @@ |
73 |
+# Copyright 1999-2022 Gentoo Authors |
74 |
+# Distributed under the terms of the GNU General Public License v2 |
75 |
+ |
76 |
+EAPI=8 |
77 |
+inherit gnome.org meson xdg |
78 |
+ |
79 |
+DESCRIPTION="GLib helper library for geocoding services" |
80 |
+HOMEPAGE="https://gitlab.gnome.org/GNOME/geocode-glib" |
81 |
+ |
82 |
+LICENSE="LGPL-2+" |
83 |
+SLOT="2" |
84 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" |
85 |
+IUSE="gtk-doc +introspection test" |
86 |
+RESTRICT="!test? ( test )" |
87 |
+ |
88 |
+# Needs to depend on geocode-glib-3.26.4:0 because only slot 0 has some svg |
89 |
+# files that we patch out here to avoid file collisions. |
90 |
+RDEPEND=" |
91 |
+ >=dev-libs/glib-2.44:2 |
92 |
+ >=dev-libs/json-glib-0.99.2[introspection?] |
93 |
+ >=net-libs/libsoup-3.0.8:3.0[introspection?] |
94 |
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= ) |
95 |
+ >=sci-geosciences/geocode-glib-3.26.4:0 |
96 |
+" |
97 |
+DEPEND="${RDEPEND}" |
98 |
+BDEPEND=" |
99 |
+ dev-util/glib-utils |
100 |
+ gtk-doc? ( |
101 |
+ >=dev-util/gtk-doc-1.13 |
102 |
+ app-text/docbook-xml-dtd:4.3 |
103 |
+ ) |
104 |
+ >=sys-devel/gettext-0.19.8 |
105 |
+ virtual/pkgconfig |
106 |
+" |
107 |
+ |
108 |
+PATCHES=( |
109 |
+ "${FILESDIR}"/${PV}-r200-do-not-install-icons.patch |
110 |
+) |
111 |
+ |
112 |
+src_configure() { |
113 |
+ local emesonargs=( |
114 |
+ -Denable-installed-tests=false |
115 |
+ $(meson_use introspection enable-introspection) |
116 |
+ $(meson_use gtk-doc enable-gtk-doc) |
117 |
+ -Dsoup2=false |
118 |
+ ) |
119 |
+ meson_src_configure |
120 |
+} |