Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/viking/, sci-geosciences/viking/files/
Date: Sun, 01 Mar 2020 08:31:16
Message-Id: 1583051458.9a7f524ff4060e48f10b7c3cec3fc77be0f29399.graaff@gentoo
1 commit: 9a7f524ff4060e48f10b7c3cec3fc77be0f29399
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 1 08:30:58 2020 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 1 08:30:58 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a7f524f
7
8 sci-geosciences/viking: fix compilation with no-common
9
10 Closes: https://bugs.gentoo.org/710904
11 Package-Manager: Portage-2.3.89, Repoman-2.3.20
12 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
13
14 .../viking/files/viking-1.7-no-common.patch | 13 +++
15 sci-geosciences/viking/viking-1.7-r1.ebuild | 93 ++++++++++++++++++++++
16 2 files changed, 106 insertions(+)
17
18 diff --git a/sci-geosciences/viking/files/viking-1.7-no-common.patch b/sci-geosciences/viking/files/viking-1.7-no-common.patch
19 new file mode 100644
20 index 00000000000..bf49709dc86
21 --- /dev/null
22 +++ b/sci-geosciences/viking/files/viking-1.7-no-common.patch
23 @@ -0,0 +1,13 @@
24 +--- a/src/babel.h.orig 2020-02-06 07:22:12.924565811 +0100
25 ++++ b/src/babel.h 2020-02-06 07:22:25.092329302 +0100
26 +@@ -109,8 +109,8 @@
27 + gchar *label;
28 + } BabelFile;
29 +
30 +-GList *a_babel_file_list;
31 +-GList *a_babel_device_list;
32 ++extern GList *a_babel_file_list;
33 ++extern GList *a_babel_device_list;
34 +
35 + void a_babel_foreach_file_with_mode (BabelMode mode, GFunc func, gpointer user_data);
36 + void a_babel_foreach_file_read_any (GFunc func, gpointer user_data);
37
38 diff --git a/sci-geosciences/viking/viking-1.7-r1.ebuild b/sci-geosciences/viking/viking-1.7-r1.ebuild
39 new file mode 100644
40 index 00000000000..6649edf1b58
41 --- /dev/null
42 +++ b/sci-geosciences/viking/viking-1.7-r1.ebuild
43 @@ -0,0 +1,93 @@
44 +# Copyright 1999-2020 Gentoo Authors
45 +# Distributed under the terms of the GNU General Public License v2
46 +
47 +EAPI=6
48 +
49 +inherit gnome2-utils
50 +
51 +DESCRIPTION="GPS data editor and analyzer"
52 +HOMEPAGE="https://sourceforge.net/projects/viking/"
53 +IUSE="doc +exif libexif geoclue gps +magic mapnik nls oauth sqlite"
54 +SRC_URI="
55 + mirror://sourceforge/${PN}/${P}.tar.bz2
56 + doc? ( mirror://sourceforge/${PN}/${PN}.pdf )"
57 +
58 +LICENSE="GPL-2"
59 +SLOT="0"
60 +KEYWORDS="~amd64 ~x86"
61 +
62 +COMMONDEPEND="
63 + app-arch/bzip2
64 + >=dev-tcltk/expect-5.45.4
65 + dev-libs/expat
66 + dev-libs/glib:2
67 + dev-libs/nettle
68 + net-misc/curl
69 + sys-libs/zlib
70 + x11-libs/gdk-pixbuf:2
71 + x11-libs/gtk+:2
72 + geoclue? ( app-misc/geoclue:2.0 )
73 + gps? ( >=sci-geosciences/gpsd-2.96 )
74 + exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) )
75 + magic? ( sys-apps/file )
76 + mapnik? ( sci-geosciences/mapnik )
77 + oauth? ( net-libs/liboauth )
78 + sqlite? ( dev-db/sqlite:3 )
79 +"
80 +RDEPEND="${COMMONDEPEND}
81 + sci-geosciences/gpsbabel
82 +"
83 +DEPEND="${COMMONDEPEND}
84 + app-text/gnome-doc-utils
85 + dev-util/intltool
86 + dev-util/gtk-doc-am
87 + app-text/rarian
88 + dev-libs/libxslt
89 + virtual/pkgconfig
90 + sys-devel/gettext
91 +"
92 +
93 +PATCHES=( "${FILESDIR}/${P}-no-common.patch" )
94 +
95 +src_configure() {
96 + econf \
97 + --disable-deprecations \
98 + --with-libcurl \
99 + --with-expat \
100 + --enable-google \
101 + --enable-nettle \
102 + --enable-terraserver \
103 + --enable-expedia \
104 + --enable-openstreetmap \
105 + --enable-bluemarble \
106 + --enable-geonames \
107 + --enable-geocaches \
108 + --disable-dem24k \
109 + $(use_enable exif geotag) \
110 + $(use_with libexif ) \
111 + $(use_enable geoclue) \
112 + $(use_enable gps realtime-gps-tracking) \
113 + $(use_enable magic) \
114 + $(use_enable mapnik) \
115 + $(use_enable nls) \
116 + $(use_enable oauth) \
117 + $(use_enable sqlite mbtiles )
118 +}
119 +
120 +src_install() {
121 + default
122 + if use doc; then
123 + insinto /usr/share/doc/${PF}
124 + doins "${DISTDIR}"/${PN}.pdf
125 + fi
126 +}
127 +
128 +pkg_postinst() {
129 + xdg_desktop_database_update
130 + gnome2_icon_cache_update
131 +}
132 +
133 +pkg_postrm() {
134 + xdg_desktop_database_update
135 + gnome2_icon_cache_update
136 +}