[jhbuild] Revert "WebKit: remove geoclue1 dependency"
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] Revert "WebKit: remove geoclue1 dependency"
- Date: Thu, 6 Mar 2014 11:28:36 +0000 (UTC)
commit fb7c89afb794641bd152511653acfbc023c9288a
Author: Javier Jardón <jjardon gnome org>
Date: Tue Mar 4 12:34:42 2014 +0000
Revert "WebKit: remove geoclue1 dependency"
Lets wait to geoclue2 is supported to do this, so we do not
regress the geolocation support
This reverts commit 689251239c1d139650078aa8f7c92c979bf69a24.
modulesets/gnome-suites-core-deps-3.12.modules | 4 +++-
modulesets/gnome-sysdeps-3.12.modules | 5 +++++
2 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.12.modules b/modulesets/gnome-suites-core-deps-3.12.modules
index d1d634c..2c7617c 100644
--- a/modulesets/gnome-suites-core-deps-3.12.modules
+++ b/modulesets/gnome-suites-core-deps-3.12.modules
@@ -1223,7 +1223,8 @@
</dependencies>
</autotools>
- <autotools id="WebKit" makefile="GNUmakefile" autogenargs="--enable-introspection --disable-geolocation">
+ <autotools id="WebKit" makefile="GNUmakefile"
+ autogenargs="--enable-introspection">
<pkg-config>webkitgtk-3.0.pc</pkg-config>
<branch repo="webkitgtk.org"
module="webkitgtk-2.3.91.tar.xz" version="2.3.91"
@@ -1234,6 +1235,7 @@
<dep package="at-spi2-core"/>
<dep package="cairo"/>
<dep package="fontconfig"/>
+ <dep package="geoclue1"/>
<dep package="libxml2"/>
<dep package="gst-plugins-base"/>
<dep package="gtk+"/>
diff --git a/modulesets/gnome-sysdeps-3.12.modules b/modulesets/gnome-sysdeps-3.12.modules
index 1d90e77..7974461 100644
--- a/modulesets/gnome-sysdeps-3.12.modules
+++ b/modulesets/gnome-sysdeps-3.12.modules
@@ -183,6 +183,11 @@
</systemdependencies>
</systemmodule>
+ <systemmodule id="geoclue1">
+ <pkg-config>geoclue.pc</pkg-config>
+ <branch repo="system"/>
+ </systemmodule>
+
<systemmodule id="gettext">
<branch repo="system" version="0.16"/>
<systemdependencies>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]