From: "Mart Raudsepp" <leio@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libchamplain/
Date: Tue, 19 Mar 2019 08:41:52 +0000 (UTC) [thread overview]
Message-ID: <1552984882.d6e61afea56bb12919144ceb66a0d1dd221aeb21.leio@gentoo> (raw)
commit: d6e61afea56bb12919144ceb66a0d1dd221aeb21
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 08:32:22 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 08:41:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6e61afe
media-libs/libchamplain: fix gtk-doc, other fixes and touchups
* Fix LICENSE from LGPL-2 to LGPL-2.1+.
* Fix USE=gtk-doc to always be honored (implicitly disabled upstream
if gtk widgetry is disabled) and actually show up in devhelp.
* Add missing meson minimum version requirement - requires 0.49.0,
but meson.eclass only guarantees 0.48.2 at this point.
* Fix EAPI-7 bump to actually be an EAPI-7 port by properly using
DEPEND and BDEPEND.
* Use emesonargs array to be able to comment options on the relevant
line.
* Add longdescription to metadata.
* Sort deps and options in occurrences order for easier review on
future bumps.
* Depend on >=gobject-introspection-1.54 to ensure compat with meson.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
...12.19.ebuild => libchamplain-0.12.19-r1.ebuild} | 42 +++++++++++++---------
media-libs/libchamplain/metadata.xml | 6 ++++
2 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/media-libs/libchamplain/libchamplain-0.12.19.ebuild b/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild
similarity index 51%
rename from media-libs/libchamplain/libchamplain-0.12.19.ebuild
rename to media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild
index 9cecc17634a..1240a3e7c15 100644
--- a/media-libs/libchamplain/libchamplain-0.12.19.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild
@@ -10,44 +10,52 @@ DESCRIPTION="Clutter based world map renderer"
HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
SLOT="0.12"
-LICENSE="LGPL-2"
+LICENSE="LGPL-2.1+"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="+gtk gtk-doc +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
+REQUIRED_USE="
+ vala? ( introspection )
+ gtk-doc? ( gtk )
+" # gtk-doc build gets disabled in meson if gtk widgetry is disabled (no separate libchamplain-gtk gtk-docs anymore)
RDEPEND="
- dev-db/sqlite:3
>=dev-libs/glib-2.38:2
+ >=x11-libs/gtk+-3.0:3
>=media-libs/clutter-1.24:1.0[introspection?]
- media-libs/cogl:=
- >=net-libs/libsoup-2.42:2.4
- >=x11-libs/cairo-1.4
- x11-libs/gtk+:3
gtk? (
x11-libs/gtk+:3[introspection?]
media-libs/clutter-gtk:1.0 )
- introspection? ( dev-libs/gobject-introspection:= )
+ >=x11-libs/cairo-1.4
+ dev-db/sqlite:3
+ >=net-libs/libsoup-2.42:2.4
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+ media-libs/cogl:=
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-util/glib-utils
+ >=dev-util/meson-0.49.0
virtual/pkgconfig
gtk-doc? ( >=dev-util/gtk-doc-1.15 )
vala? ( $(vala_depend) )
"
src_prepare() {
- use vala && vala_src_prepare
xdg_src_prepare
+ use vala && vala_src_prepare
+ # Fix showing inside devhelp (gtkdocdir subdir and name of the module need to match)
+ sed -i -e 's:package_name:package_string:' docs/reference/meson.build || die # https://gitlab.gnome.org/GNOME/libchamplain/merge_requests/7
}
src_configure() {
- # demos are only built, so just disable them
- meson_src_configure \
- -Dmemphis=false \
- -Ddemos=false \
- $(meson_use gtk widgetry) \
- $(meson_use gtk-doc gtk_doc) \
- $(meson_use introspection) \
+ local emesonargs=(
+ -Dmemphis=false # TODO: What's the state of this vector renderer?
+ $(meson_use introspection)
$(meson_use vala vapi)
+ $(meson_use gtk widgetry)
+ $(meson_use gtk-doc gtk_doc)
+ -Ddemos=false # only built, not installed
+ )
+ meson_src_configure
}
diff --git a/media-libs/libchamplain/metadata.xml b/media-libs/libchamplain/metadata.xml
index 996e7cacd21..c119093f59a 100644
--- a/media-libs/libchamplain/metadata.xml
+++ b/media-libs/libchamplain/metadata.xml
@@ -5,4 +5,10 @@
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
+ <longdescription lang="en">
+ libchamplain is a Gtk widget displaying zoomable and pannable maps that can be
+ loaded from various network sources. It supports overlay layers, markers, and
+ custom elements displayed on top of the maps. The library is written in C but
+ other language mappings are also available thanks to GObject-introspection.
+ </longdescription>
</pkgmetadata>
next reply other threads:[~2019-03-19 8:41 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-19 8:41 Mart Raudsepp [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-02 16:18 [gentoo-commits] repo/gentoo:master commit in: media-libs/libchamplain/ Sam James
2023-07-27 10:22 WANG Xuerui
2023-02-20 17:32 Matt Turner
2023-02-17 8:23 Arthur Zamarin
2023-02-16 18:39 Arthur Zamarin
2023-01-19 1:14 Matt Turner
2023-01-13 19:03 Arthur Zamarin
2022-10-31 2:56 Matt Turner
2021-12-13 5:54 Yixun Lan
2019-11-10 18:55 Pacho Ramos
2019-08-04 18:04 Aaron Bauman
2019-05-18 23:05 Mart Raudsepp
2019-03-09 12:48 Pacho Ramos
2019-03-09 12:48 Pacho Ramos
2019-02-23 15:59 Pacho Ramos
2018-11-02 12:18 Mart Raudsepp
2017-12-20 21:02 Mart Raudsepp
2017-12-19 19:14 Thomas Deutschmann
2017-12-16 14:04 Tobias Klausmann
2017-09-11 6:38 Gilles Dartiguelongue
2017-03-19 17:30 Mart Raudsepp
2016-09-26 19:13 Mart Raudsepp
2016-09-26 16:23 Agostino Sarubbo
2016-09-26 16:22 Agostino Sarubbo
2016-09-08 7:26 Gilles Dartiguelongue
2016-08-04 19:15 Pacho Ramos
2016-07-30 20:37 Pacho Ramos
2016-04-03 12:42 Pacho Ramos
2016-04-03 12:42 Pacho Ramos
2016-03-06 20:12 Mikle Kolyada
2015-12-12 14:29 Pacho Ramos
2015-12-12 14:29 Pacho Ramos
2015-11-11 8:20 Agostino Sarubbo
2015-11-10 17:02 Agostino Sarubbo
2015-09-20 18:35 Pacho Ramos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1552984882.d6e61afea56bb12919144ceb66a0d1dd221aeb21.leio@gentoo \
--to=leio@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox