[gnome-ostree] manifest: Pull in libqmi and ModemManager

[Colin Walters <walters src gnome org>]

commit ff5a73408cb5423f74fbe8c02b48b89f09741ac2
Author: Colin Walters <walters verbum org>
Date:   Sun Feb 24 05:18:12 2013 -0500

    manifest: Pull in libqmi and ModemManager
    
    So that gnome-control-center will have a network panel.

 manifest.json                     |    8 ++++++++
 patches/MM-builddir-include.patch |   25 +++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 0 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 1370cb6..c0e73a2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -16,6 +16,7 @@
                 "fd": "git:git://anongit.freedesktop.org/git/",
                 "fd-dbus": "git:git://anongit.freedesktop.org/git/dbus/",
                 "fd-NM": "git:git://anongit.freedesktop.org/git/NetworkManager/",
+                "fd-MM": "git:git://anongit.freedesktop.org/git/ModemManager/",
                 "fd-mesa": "git:git://anongit.freedesktop.org/git/mesa/",
                 "fd-pulse": "git:git://anongit.freedesktop.org/git/pulseaudio/",
                 "fd-xdg": "git:git://anongit.freedesktop.org/git/xdg/",
@@ -411,6 +412,13 @@
                                 "--enable-more-warnings=yes",
                                 "--enable-modify-system"]},
 
+               {"src": "fd:libqmi"},
+
+               {"src": "fd-MM:ModemManager.git",
+                "patches": ["MM-builddir-include.patch"],
+                "config-opts": ["--with-udev-base-dir=/usr/lib/udev",
+                                "--disable-more-warnings"]},
+
                {"src": "0pointer:libatasmart.git"},
 
                {"src": "fd:udisks",
diff --git a/patches/MM-builddir-include.patch b/patches/MM-builddir-include.patch
new file mode 100644
index 0000000..848025e
--- /dev/null
+++ b/patches/MM-builddir-include.patch
@@ -0,0 +1,25 @@
+From 93971f58aa317bc5263783ee74ad0679cb8267bc Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sun, 24 Feb 2013 05:12:33 -0500
+Subject: [PATCH] build: Look for generated file in builddir, not srcdir
+
+---
+ libmm-glib/generated/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libmm-glib/generated/Makefile.am b/libmm-glib/generated/Makefile.am
+index 16dd413..c0429b1 100644
+--- a/libmm-glib/generated/Makefile.am
++++ b/libmm-glib/generated/Makefile.am
+@@ -66,7 +66,7 @@ mm-errors-types.c: Makefile.am $(top_srcdir)/include/ModemManager-errors.h $(top
+               --template $(top_srcdir)/build-aux/mm-errors-template.c \
+               $(top_srcdir)/include/ModemManager-errors.h > $@
+ 
+-mm-errors-quarks.c: Makefile.am $(top_srcdir)/include/ModemManager-errors.h 
$(top_srcdir)/build-aux/mm-errors-quarks-template.c $(top_srcdir)/include/ModemManager-names.h 
mm-errors-types.h
++mm-errors-quarks.c: Makefile.am $(top_srcdir)/include/ModemManager-errors.h 
$(top_srcdir)/build-aux/mm-errors-quarks-template.c $(top_builddir)/include/ModemManager-names.h 
mm-errors-types.h
+       $(AM_V_GEN) $(GLIB_MKENUMS) \
+               --fhead "#include <ModemManager.h>\n#include \"mm-errors-types.h\"\n" \
+               --template $(top_srcdir)/build-aux/mm-errors-quarks-template.c \
+-- 
+1.7.1
+