[gnome-ostree] 3.6: Build avahi

[Colin Walters <walters src gnome org>]

commit 7e9a2d416bd3d131b23f81b02864f704b89a73f9
Author: Colin Walters <walters verbum org>
Date:   Thu Sep 20 18:05:53 2012 -0400

    3.6: Build avahi
    
    Needed by epiphany.

 gnomeos-3.6.json                                   |   18 ++
 ...odernize-by-renaming-bootstrap.sh-autogen.patch |  170 ++++++++++++++++++++
 2 files changed, 188 insertions(+), 0 deletions(-)
---
diff --git a/gnomeos-3.6.json b/gnomeos-3.6.json
index 4b213e3..fda7600 100644
--- a/gnomeos-3.6.json
+++ b/gnomeos-3.6.json
@@ -484,6 +484,24 @@
 		                 "--disable-strict"],
 		 "patches": ["upower-no-builddir.patch"]},
 
+	        {"src": "0pointer:libdaemon",
+		 "patches": ["libdaemon-build-sys-Modernize-by-renaming-bootstrap.sh-autogen.patch"],
+		 "config-opts": ["--disable-examples"]},
+
+	        {"src": "0pointer:avahi",
+		 "config-opts": ["--with-distro=none",
+				 "--enable-gobject",
+				 "--with-xml=expat",
+				 "--enable-libdaemon",
+				 "--disable-core-docs",
+		                 "--disable-manpages",
+				 "--disable-mono",
+				 "--disable-qt3",
+				 "--disable-qt4",
+				 "--disable-python",
+				 "--disable-gtk",
+				 "--disable-gtk3"]},
+
 		{"src": "gnome:gnome-doc-utils",
 		 "config-opts": ["--disable-scrollkeeper",
 		                 "--disable-documentation"]},
diff --git a/patches/libdaemon-build-sys-Modernize-by-renaming-bootstrap.sh-autogen.patch b/patches/libdaemon-build-sys-Modernize-by-renaming-bootstrap.sh-autogen.patch
new file mode 100644
index 0000000..458fb02
--- /dev/null
+++ b/patches/libdaemon-build-sys-Modernize-by-renaming-bootstrap.sh-autogen.patch
@@ -0,0 +1,170 @@
+From bdd6a3cdbe64f0b7211dc85b5185c79571f26464 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Thu, 20 Sep 2012 17:35:32 -0400
+Subject: [PATCH] build-sys: Modernize by renaming bootstrap.sh -> autogen.sh
+
+See http://people.gnome.org/~walters/docs/build-api.txt
+---
+ autogen.sh   | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ bootstrap.sh | 71 ------------------------------------------------------------
+ 2 files changed, 71 insertions(+), 71 deletions(-)
+ create mode 100755 autogen.sh
+ delete mode 100755 bootstrap.sh
+
+diff --git a/autogen.sh b/autogen.sh
+new file mode 100755
+index 0000000..381f31c
+--- /dev/null
++++ b/autogen.sh
+@@ -0,0 +1,71 @@
++#!/bin/sh
++
++# This file is part of libdaemon.
++#
++# Copyright 2003-2008 Lennart Poettering
++#
++# Permission is hereby granted, free of charge, to any person obtaining a copy
++# of this software and associated documentation files (the "Software"), to deal
++# in the Software without restriction, including without limitation the rights
++# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++# copies of the Software, and to permit persons to whom the Software is
++# furnished to do so, subject to the following conditions:
++#
++# The above copyright notice and this permission notice shall be included in
++# all copies or substantial portions of the Software.
++#
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++# SOFTWARE.
++
++VERSION=1.9
++
++run_versioned() {
++    local P
++    local V
++
++    V=$(echo "$2" | sed -e 's,\.,,g')
++
++    if [ -e "`which $1$V 2> /dev/null`" ] ; then
++        P="$1$V"
++    else
++	if [ -e "`which $1-$2 2> /dev/null`" ] ; then
++            P="$1-$2"
++	else
++	    P="$1"
++	fi
++    fi
++
++    shift 2
++    "$P" "$@"
++}
++
++set -ex
++
++if [ "x$1" = "xam" ] ; then
++    run_versioned automake "$VERSION" -a -c --foreign
++    ./config.status
++else
++    rm -rf autom4te.cache
++    rm -f config.cache
++
++    touch config.rpath
++    test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize
++
++    mkdir -p common
++
++    "$LIBTOOLIZE" -c --force
++    run_versioned aclocal "$VERSION" -I m4
++    run_versioned autoconf 2.59 -Wall
++    run_versioned autoheader 2.59
++    run_versioned automake "$VERSION" -a -c --foreign
++
++    if test "x$NOCONFIGURE" = "x"; then
++        CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var "$@"
++        make clean
++    fi
++fi
+diff --git a/bootstrap.sh b/bootstrap.sh
+deleted file mode 100755
+index 381f31c..0000000
+--- a/bootstrap.sh
++++ /dev/null
+@@ -1,71 +0,0 @@
+-#!/bin/sh
+-
+-# This file is part of libdaemon.
+-#
+-# Copyright 2003-2008 Lennart Poettering
+-#
+-# Permission is hereby granted, free of charge, to any person obtaining a copy
+-# of this software and associated documentation files (the "Software"), to deal
+-# in the Software without restriction, including without limitation the rights
+-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+-# copies of the Software, and to permit persons to whom the Software is
+-# furnished to do so, subject to the following conditions:
+-#
+-# The above copyright notice and this permission notice shall be included in
+-# all copies or substantial portions of the Software.
+-#
+-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+-# SOFTWARE.
+-
+-VERSION=1.9
+-
+-run_versioned() {
+-    local P
+-    local V
+-
+-    V=$(echo "$2" | sed -e 's,\.,,g')
+-
+-    if [ -e "`which $1$V 2> /dev/null`" ] ; then
+-        P="$1$V"
+-    else
+-	if [ -e "`which $1-$2 2> /dev/null`" ] ; then
+-            P="$1-$2"
+-	else
+-	    P="$1"
+-	fi
+-    fi
+-
+-    shift 2
+-    "$P" "$@"
+-}
+-
+-set -ex
+-
+-if [ "x$1" = "xam" ] ; then
+-    run_versioned automake "$VERSION" -a -c --foreign
+-    ./config.status
+-else
+-    rm -rf autom4te.cache
+-    rm -f config.cache
+-
+-    touch config.rpath
+-    test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize
+-
+-    mkdir -p common
+-
+-    "$LIBTOOLIZE" -c --force
+-    run_versioned aclocal "$VERSION" -I m4
+-    run_versioned autoconf 2.59 -Wall
+-    run_versioned autoheader 2.59
+-    run_versioned automake "$VERSION" -a -c --foreign
+-
+-    if test "x$NOCONFIGURE" = "x"; then
+-        CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var "$@"
+-        make clean
+-    fi
+-fi
+-- 
+1.7.11.4
+