Changeset 155197 in webkit

Timestamp:

Sep 6, 2013 11:19:45 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Desktop proxy settings are ignored inside the internal jhbuild
​https://bugs.webkit.org/show_bug.cgi?id=120833

Patch by Mario Sanchez Prada <​mario.prada@samsung.com> on 2013-09-06
Reviewed by Gustavo Noronha Silva.

Add dconf as an optional module for the internal jhbuild, along
with vala 0.17 as a dependency, and make sure we do not explicitly
set always the 'memory' backend, so we can have an easy way to
allow apps access desktop settings from the jhbuild. This is
useful for example to be able to run apps such as MiniBrowser
inside the jhbuild (by means of run-launcher, for instance) while
working behind a proxy, since those network settings have to be
read from the system global configuration in org.gnome.system.proxy.

• gtk/jhbuild-optional.modules: Added dconf 0.14 and vala 0.17.
• gtk/jhbuildrc: Do not explicitly choose the GSettings memory

backend here, since that will make more difficult to use the dconf
backend from inside the jhbuild if we need to do it so.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• gtk/jhbuild-optional.modules (modified) (1 diff)
• gtk/jhbuildrc (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-09-06  Mario Sanchez Prada  <mario.prada@samsung.com>
+
+        [GTK] Desktop proxy settings are ignored inside the internal jhbuild
+        https://bugs.webkit.org/show_bug.cgi?id=120833
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Add dconf as an optional module for the internal jhbuild, along
+        with vala 0.17 as a dependency, and make sure we do not explicitly
+        set always the 'memory' backend, so we can have an easy way to
+        allow apps access desktop settings from the jhbuild. This is
+        useful for example to be able to run apps such as MiniBrowser
+        inside the jhbuild (by means of run-launcher, for instance) while
+        working behind a proxy, since those network settings have to be
+        read from the system global configuration in org.gnome.system.proxy.
+
+        * gtk/jhbuild-optional.modules: Added dconf 0.14 and vala 0.17.
+        * gtk/jhbuildrc: Do not explicitly choose the GSettings memory
+        backend here, since that will make more difficult to use the dconf
+        backend from inside the jhbuild if we need to do it so.
+
 2013-09-06  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Tools/gtk/jhbuild-optional.modules

@@ -17 +17 @@
   </autotools>
 
+  <!-- dconf is interesting in case you need to make sure that you can
+       access your global settings from inside the jhbuild environment
+       (e.g running MiniBrowser behind a proxy needs to read settings
+       from the org.gnome.system.proxy GSettings scheme -->
+  <autotools id="dconf" autogen-sh="configure">
+    <branch repo="ftp.gnome.org"
+            module="/pub/GNOME/sources/dconf/0.14/dconf-0.14.1.tar.xz" version="0.14"
+            hash="sha256:59c58c5eafa0ebd616287d078f4441d5342870a44634445d324e88fc0287f0b8"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libxml2"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="vala" autogenargs="--enable-vapigen" supports-non-srcdir-builds="no">
+    <pkg-config>libvala-0.20.pc</pkg-config>
+    <branch repo="ftp.gnome.org"
+            module="/pub/GNOME/sources/vala/0.17/vala-0.17.7.tar.xz" version="0.17"
+            hash="sha256:dfdb9b3cb1c455462a57fd71a7e832c3b7b4131e85d2d0a2030111dae9fae24f"/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
 </moduleset>

trunk/Tools/gtk/jhbuildrc

@@ -56 +56 @@
 os.environ['GST_PLUGIN_SYSTEM_PATH'] = ''
 
-# We often end up using the memory backend anyway, so explicitly choosing
-# it will prevent the warning message.
-os.environ['GSETTINGS_BACKEND'] = 'memory'
-
 # We always enable introspection so that we can sniff out problems with our
 # annotations sooner rather than later.