[gnome-continuous] Attempt to fix glib-networking build



commit 3547e35783b190856551d9c1e12b449a4748343d
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sat Oct 21 12:20:51 2017 -0500

    Attempt to fix glib-networking build

 manifest.json                           |    2 +-
 patches/glib-networking-build-api.patch |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index a1d9178..4ab4bad 100644
--- a/manifest.json
+++ b/manifest.json
@@ -809,7 +809,7 @@
                 {"src": "gnome:glib-networking",
                 "component": "minimal",
                  "patches": ["glib-networking-build-api.patch"],
-                "config-opts": ["--enable-installed-tests"]},
+                "config-opts": ["--enable-installed-tests --disable-libproxy"]},
 
                {"src": "gnome:libsoup",
                 "component": "minimal",
diff --git a/patches/glib-networking-build-api.patch b/patches/glib-networking-build-api.patch
index d4572a1..da739bc 100644
--- a/patches/glib-networking-build-api.patch
+++ b/patches/glib-networking-build-api.patch
@@ -13,7 +13,7 @@ new file mode 100755
 index 0000000..25b666c
 --- /dev/null
 +++ b/configure
-@@ -0,0 +1,155 @@
+@@ -0,0 +1,159 @@
 +#!/bin/bash
 +# configure script adapter for Meson
 +# Based on build-api: https://github.com/cgwalters/build-api
@@ -73,6 +73,7 @@ index 0000000..25b666c
 +
 +enable_docs='-Denable-gtk-doc=false'
 +enable_man='-Denable-man=false'
++enable_libproxy='-Denable_libproxy=true'
 +
 +while (($# > 0)); do
 +    case "${1%%=*}" in
@@ -90,6 +91,8 @@ index 0000000..25b666c
 +      --disable-gtk-doc) enable_docs='-Denable-gtk-doc=false';;
 +      --enable-man) enable_man='-Denable-man=true';;
 +      --disable-man) enable_man='-Denable-man=false';;
++      --enable-libproxy) enable_libproxy='-Denable_libproxy=true';;
++      --disable-libproxy) enable_libproxy='-Denable_libproxy=false';;
 +      *) echo -e "\e[1;33mINFO\e[0m: Ignoring unknown option '$1'";;
 +    esac
 +    shift
@@ -151,7 +154,7 @@ index 0000000..25b666c
 +echo "  mandir:...... ${mandir}"
 +echo "  includedir:.. ${includedir}"
 +echo "  additional:.."
-+echo "    - ${enable_docs} ${enable_man}"
++echo "    - ${enable_docs} ${enable_man} ${enable_libproxy}"
 +
 +exec ${MESON} \
 +      --prefix=${prefix} \
@@ -165,6 +168,7 @@ index 0000000..25b666c
 +      --default-library shared \
 +      ${enable_docs} \
 +      ${enable_man} \
++       ${enable_libproxy} \
 +      ${builddir} \
 +      ${srcdir}
 +


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]