diff options
author | Sobhan Mohammadpour <sobhan@gentoo.org> | 2019-06-19 01:46:28 -0400 |
---|---|---|
committer | Sobhan Mohammadpour <sobhan@gentoo.org> | 2019-06-19 01:49:07 -0400 |
commit | 9b1c4910285bbbef821496048f52c10eeef7f96c (patch) | |
tree | 326c8a090690585b9c630f26c3ba0f8e509fc170 /app-misc | |
parent | net-firewall/ipt_netflow: Version 2.3_p20190619 (diff) | |
download | gentoo-9b1c4910285bbbef821496048f52c10eeef7f96c.tar.gz gentoo-9b1c4910285bbbef821496048f52c10eeef7f96c.tar.bz2 gentoo-9b1c4910285bbbef821496048f52c10eeef7f96c.zip |
app-misc/geoclue: 2.5.3 → 2.5.3-r1
fix bad meson args and also make vala optional
Suggested-by: Pacho Ramos <pacho@gentoo.org>
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Sobhan Mohammadpour <sobhan@gentoo.org>
Diffstat (limited to 'app-misc')
-rw-r--r-- | app-misc/geoclue/files/geoclue-2.5.3-optional-vapi.patch | 47 | ||||
-rw-r--r-- | app-misc/geoclue/geoclue-2.5.3-r1.ebuild (renamed from app-misc/geoclue/geoclue-2.5.3.ebuild) | 20 |
2 files changed, 63 insertions, 4 deletions
diff --git a/app-misc/geoclue/files/geoclue-2.5.3-optional-vapi.patch b/app-misc/geoclue/files/geoclue-2.5.3-optional-vapi.patch new file mode 100644 index 000000000000..874488decace --- /dev/null +++ b/app-misc/geoclue/files/geoclue-2.5.3-optional-vapi.patch @@ -0,0 +1,47 @@ +From 56c7ca99dcadbf3e80ff2a9baf3e174f278b6a71 Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour <sobhan@gentoo.org> +Date: Wed, 19 Jun 2019 01:16:16 -0400 +Subject: [PATCH] optinal vala + +--- + libgeoclue/meson.build | 5 +++-- + meson_options.txt | 3 +++ + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/libgeoclue/meson.build b/libgeoclue/meson.build +index e228ec3..e78a3e8 100644 +--- a/libgeoclue/meson.build ++++ b/libgeoclue/meson.build +@@ -58,7 +58,8 @@ libgeoclue_dep = declare_dependency(link_with: libgeoclue, + sources: [ libgeoclue_sources, libgeoclue_headers ]) + + gir = find_program('g-ir-scanner', required: false) +-vapigen = find_program('vapigen', required: false) ++vapigen_req = get_option('vapigen') ++vapigen = find_program('vapigen-ver', required: false) + enable_gir = get_option('introspection') + pkg_requirements = ['glib-2.0', 'gio-2.0', 'gio-unix-2.0'] + gir_sources = [ libgeoclue_sources, +@@ -78,7 +79,7 @@ if gir.found() and enable_gir + install: true, + header: 'geoclue.h', + extra_args: [ '--quiet' ]) +- if vapigen.found() ++ if vapigen.found() and vapigen_req + gnome.generate_vapi('libgeoclue-' + gclue_api_version, + sources: geo_gir[0], + packages: pkg_requirements, +diff --git a/meson_options.txt b/meson_options.txt +index 83bc60e..8611f6c 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,3 +1,6 @@ ++option('vapigen', ++ type: 'boolean', value: false, ++ description: 'Enable vala?') + option('libgeoclue', + type: 'boolean', value: true, + description: 'Enable convenience library') +-- +2.21.0 + diff --git a/app-misc/geoclue/geoclue-2.5.3.ebuild b/app-misc/geoclue/geoclue-2.5.3-r1.ebuild index 67b5750e57ac..b4c7c3071852 100644 --- a/app-misc/geoclue/geoclue-2.5.3.ebuild +++ b/app-misc/geoclue/geoclue-2.5.3-r1.ebuild @@ -2,8 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="6" +VALA_USE_DEPEND="vapigen" +VALA_MIN_API_VERSION="0.32" -inherit gnome.org meson systemd user +inherit gnome.org meson systemd vala user xdg DESCRIPTION="A geoinformation D-Bus service" HOMEPAGE="https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home" @@ -13,7 +15,7 @@ LICENSE="LGPL-2" SLOT="2.0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" #todo maybe add a use flat for libgeoclue -IUSE="+introspection gtk-doc modemmanager zeroconf" +IUSE="+introspection gtk-doc modemmanager vala zeroconf" RDEPEND=" >=dev-libs/glib-2.44:2 @@ -32,16 +34,26 @@ DEPEND="${RDEPEND} >=dev-util/gtk-doc-1 sys-devel/gettext virtual/pkgconfig + vala? ( $(vala_depend) ) " +src_prepare() { + epatch "${FILESDIR}"/${P}-optional-vapi.patch + + vala_src_prepare + sed -i -e "s:'vapigen-ver':'vapigen-$(vala_best_api_version)':" libgeoclue/meson.build || die + xdg_src_prepare +} + src_configure() { # debug only affects CFLAGS local emesonargs=( $(meson_use gtk-doc) - -Ddbus-service-user=geoclue \ + $(meson_use vala vapigen) + -Ddbus-srv-user=geoclue \ -Denable-backend=true \ -Dlibgeoclue=true \ - -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" \ + -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" \ -Ddemo-agent=false \ $(meson_use introspection) \ $(meson_use modemmanager 3g-source) \ |