[ostree] gnomeos: Getting up to NetworkManager now

From: Colin Walters <walters src gnome org>
To: commits-list gnome org
Cc:
Subject: [ostree] gnomeos: Getting up to NetworkManager now
Date: Sun, 8 Jan 2012 19:21:48 +0000 (UTC)
commit e8b5ffed22607d41c439058d3c0bf3422ebaf6b9
Author: Colin Walters <walters verbum org>
Date:   Sun Jan 8 14:21:02 2012 -0500

    gnomeos: Getting up to NetworkManager now

 gnomeos/3.4/NetworkManager-builddir.patch |  395 +++++++++++++++++++++++++++++
 gnomeos/3.4/NetworkManager-distro.patch   |   26 ++
 gnomeos/3.4/dbus-xmlto-docs.patch         |   39 +++
 gnomeos/3.4/expat-autogen.patch           |  137 ++++++++++
 gnomeos/3.4/manifest.json                 |   32 ++-
 5 files changed, 626 insertions(+), 3 deletions(-)
---
diff --git a/gnomeos/3.4/NetworkManager-builddir.patch b/gnomeos/3.4/NetworkManager-builddir.patch
new file mode 100644
index 0000000..a23544a
--- /dev/null
+++ b/gnomeos/3.4/NetworkManager-builddir.patch
@@ -0,0 +1,395 @@
+From 0210fedce2e6c84821556d9c91fd868dad2577a9 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sun, 8 Jan 2012 12:30:02 -0500
+Subject: [PATCH] build: Fix srcdir != builddir
+
+nm-version.h is in ${top_builddir}/include.
+---
+ callouts/Makefile.am                            |    2 ++
+ callouts/tests/Makefile.am                      |    1 +
+ cli/src/Makefile.am                             |    1 +
+ examples/C/glib/Makefile.am                     |    3 ++-
+ examples/C/qt/Makefile.am                       |    3 ++-
+ libnm-glib/Makefile.am                          |    1 +
+ libnm-glib/tests/Makefile.am                    |    1 +
+ libnm-util/Makefile.am                          |    2 +-
+ libnm-util/tests/Makefile.am                    |    1 +
+ src/Makefile.am                                 |    1 +
+ src/backends/Makefile.am                        |    1 +
+ src/bluez-manager/Makefile.am                   |    1 +
+ src/dhcp-manager/Makefile.am                    |    1 +
+ src/dhcp-manager/tests/Makefile.am              |    1 +
+ src/dns-manager/Makefile.am                     |    3 ++-
+ src/ip6-manager/Makefile.am                     |    1 +
+ src/modem-manager/Makefile.am                   |    1 +
+ src/ppp-manager/Makefile.am                     |    1 +
+ src/settings/Makefile.am                        |    1 +
+ src/settings/plugins/ifcfg-rh/Makefile.am       |    1 +
+ src/settings/plugins/ifcfg-rh/tests/Makefile.am |    1 +
+ src/settings/plugins/keyfile/Makefile.am        |    1 +
+ src/settings/plugins/keyfile/tests/Makefile.am  |    1 +
+ src/settings/tests/Makefile.am                  |    1 +
+ src/supplicant-manager/Makefile.am              |    1 +
+ src/supplicant-manager/tests/Makefile.am        |    1 +
+ src/tests/Makefile.am                           |    1 +
+ src/vpn-manager/Makefile.am                     |    1 +
+ test/Makefile.am                                |    3 ++-
+ 29 files changed, 34 insertions(+), 5 deletions(-)
+
+diff --git a/callouts/Makefile.am b/callouts/Makefile.am
+index 4a1ea7c..a3a2d26 100644
+--- a/callouts/Makefile.am
++++ b/callouts/Makefile.am
+@@ -58,6 +58,7 @@ nm_dispatcher_action_SOURCES = \
+ nm_dispatcher_action_CPPFLAGS = \
+ 	-I${top_srcdir} \
+ 	-I${top_srcdir}/include \
++	-I${top_builddir}/include \
+ 	-I${top_srcdir}/libnm-util \
+ 	$(DBUS_CFLAGS) \
+ 	$(GLIB_CFLAGS) \
+@@ -83,6 +84,7 @@ libtest_dispatcher_envp_la_SOURCES = \
+ 
+ libtest_dispatcher_envp_la_CPPFLAGS = \
+ 	-I${top_srcdir}/include \
++	-I${top_builddir}/include \
+ 	-I${top_srcdir}/libnm-util \
+ 	$(GLIB_CFLAGS) \
+ 	$(DBUS_CFLAGS)
+diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am
+index 6a46b62..7121b92 100644
+--- a/callouts/tests/Makefile.am
++++ b/callouts/tests/Makefile.am
+@@ -1,5 +1,6 @@
+ INCLUDES = \
+ 	-I$(top_srcdir)/include \
++	-I${top_builddir}/include \
+ 	-I$(top_srcdir)/libnm-util \
+ 	-I$(top_srcdir)/callouts
+ 
+diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am
+index 9b1babe..742bf0f 100644
+--- a/cli/src/Makefile.am
++++ b/cli/src/Makefile.am
+@@ -4,6 +4,7 @@ bin_PROGRAMS = \
+ INCLUDES = \
+ 	-I${top_srcdir} \
+ 	-I${top_srcdir}/include \
++	-I${top_builddir}/include \
+ 	-I${top_srcdir}/libnm-util \
+ 	-I${top_srcdir}/libnm-glib
+ 
+diff --git a/examples/C/glib/Makefile.am b/examples/C/glib/Makefile.am
+index 1063d52..332a3b3 100644
+--- a/examples/C/glib/Makefile.am
++++ b/examples/C/glib/Makefile.am
+@@ -1,6 +1,7 @@
+ INCLUDES = -I${top_srcdir}/libnm-util         \
+            -I${top_srcdir}/libnm-glib         \
+-           -I${top_srcdir}/include
++           -I${top_srcdir}/include	      \
++           -I${top_builddir}/include
+ 
+ AM_CPPFLAGS = \
+ 	$(DBUS_CFLAGS) \
+diff --git a/examples/C/qt/Makefile.am b/examples/C/qt/Makefile.am
+index 5f0c6a1..cde7371 100644
+--- a/examples/C/qt/Makefile.am
++++ b/examples/C/qt/Makefile.am
+@@ -1,4 +1,5 @@
+-INCLUDES = -I${top_srcdir}/include
++INCLUDES = -I${top_srcdir}/include \
++	   -I${top_builddir}/include
+ 
+ AM_CPPFLAGS = \
+ 	$(DBUS_CFLAGS) \
+diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am
+index abee1f8..df98fa1 100644
+--- a/libnm-glib/Makefile.am
++++ b/libnm-glib/Makefile.am
+@@ -2,6 +2,7 @@ SUBDIRS=. tests
+ 
+ INCLUDES = \
+ 	-I$(top_srcdir)/include \
++	-I$(top_builddir)/include \
+ 	-I$(top_srcdir)/libnm-util \
+ 	-I$(top_builddir)/marshallers
+ 
+diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am
+index 06aee71..1564c59 100644
+--- a/libnm-glib/tests/Makefile.am
++++ b/libnm-glib/tests/Makefile.am
+@@ -1,5 +1,6 @@
+ INCLUDES = \
+ 	-I$(top_srcdir)/include \
++	-I$(top_builddir)/include \
+ 	-I$(top_srcdir)/libnm-util \
+ 	-I$(top_srcdir)/libnm-glib
+ 
+diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am
+index d0bf73a..1ccb5a6 100644
+--- a/libnm-util/Makefile.am
++++ b/libnm-util/Makefile.am
+@@ -1,6 +1,6 @@
+ SUBDIRS=. tests
+ 
+-INCLUDES = -I${top_srcdir} -I${top_srcdir}/include
++INCLUDES = -I${top_srcdir} -I${top_srcdir}/include -I${top_builddir}/include
+ 
+ lib_LTLIBRARIES=libnm-util.la
+ 
+diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am
+index 1d737d1..a3e12c3 100644
+--- a/libnm-util/tests/Makefile.am
++++ b/libnm-util/tests/Makefile.am
+@@ -2,6 +2,7 @@ SUBDIRS=certs
+ 
+ INCLUDES = \
+ 	-I$(top_srcdir)/include \
++	-I$(top_builddir)/include \
+ 	-I$(top_srcdir)/libnm-util
+ 
+ noinst_PROGRAMS = \
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2318166..37e6b9c 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -21,6 +21,7 @@ SUBDIRS += . tests
+ 
+ INCLUDES = -I${top_srcdir} \
+            -I${top_srcdir}/include \
++           -I${top_builddir}/include \
+            -I${top_builddir}/marshallers \
+            -I${top_srcdir}/src/logging \
+            -I${top_srcdir}/src/dns-manager \
+diff --git a/src/backends/Makefile.am b/src/backends/Makefile.am
+index e9260f6..11a154a 100644
+--- a/src/backends/Makefile.am
++++ b/src/backends/Makefile.am
+@@ -2,6 +2,7 @@ INCLUDES = \
+ 	-I${top_srcdir} \
+ 	-I${top_srcdir}/src/logging \
+ 	-I${top_srcdir}/include \
++	-I${top_builddir}/include \
+ 	-I${top_srcdir}/src \
+ 	-I${top_srcdir}/libnm-util
+ 
+diff --git a/src/bluez-manager/Makefile.am b/src/bluez-manager/Makefile.am
+index 623c106..c720b01 100644
+--- a/src/bluez-manager/Makefile.am
++++ b/src/bluez-manager/Makefile.am
+@@ -1,6 +1,7 @@
+ INCLUDES = \
+ 	-I${top_srcdir} \
+ 	-I${top_srcdir}/include \
++	-I${top_builddir}/include \
+ 	-I${top_srcdir}/libnm-util \
+ 	-I${top_srcdir}/src \
+ 	-I${top_srcdir}/src/logging \
+diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am
+index 14ddde0..849b8ef 100644
+--- a/src/dhcp-manager/Makefile.am
++++ b/src/dhcp-manager/Makefile.am
+@@ -3,6 +3,7 @@ SUBDIRS=. tests
+ INCLUDES = \
+ 	-I${top_srcdir} \
+ 	-I${top_srcdir}/include \
++	-I${top_builddir}/include \
+ 	-I${top_builddir}/marshallers \
+ 	-I${top_srcdir}/src/logging \
+ 	-I${top_srcdir}/libnm-util \
+diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am
+index b075fd6..d1b3c84 100644
+--- a/src/dhcp-manager/tests/Makefile.am
++++ b/src/dhcp-manager/tests/Makefile.am
+@@ -1,5 +1,6 @@
+ INCLUDES = \
+ 	-I$(top_srcdir)/include \
++	-I$(top_builddir)/include \
+ 	-I${top_srcdir}/libnm-util \
+ 	-I$(top_srcdir)/src/dhcp-manager
+ 
+diff --git a/src/dns-manager/Makefile.am b/src/dns-manager/Makefile.am
+index b51f667..def8fe6 100644
+--- a/src/dns-manager/Makefile.am
++++ b/src/dns-manager/Makefile.am
+@@ -2,7 +2,8 @@ INCLUDES = \
+ 	-I${top_srcdir}/src/logging \
+ 	-I${top_srcdir}/libnm-util \
+ 	-I${top_srcdir}/src \
+-	-I${top_srcdir}/include
++	-I${top_srcdir}/include \
++	-I${top_builddir}/include
+ 
+ noinst_LTLIBRARIES = libdns-manager.la
+ 
+diff --git a/src/ip6-manager/Makefile.am b/src/ip6-manager/Makefile.am
+index b98d6de..c88a9cc 100644
+--- a/src/ip6-manager/Makefile.am
++++ b/src/ip6-manager/Makefile.am
+@@ -1,6 +1,7 @@
+ INCLUDES = \
+ 	-I${top_srcdir} \
+ 	-I${top_srcdir}/include \
++	-I${top_builddir}/include \
+ 	-I${top_builddir}/marshallers \
+ 	-I${top_srcdir}/libnm-util \
+ 	-I${top_srcdir}/src/logging \
+diff --git a/src/modem-manager/Makefile.am b/src/modem-manager/Makefile.am
+index 3c3af16..2060866 100644
+--- a/src/modem-manager/Makefile.am
++++ b/src/modem-manager/Makefile.am
+@@ -2,6 +2,7 @@ INCLUDES = \
+ 	-I${top_srcdir}/src \
+ 	-I${top_srcdir}/src/logging \
+ 	-I${top_srcdir}/include \
++	-I${top_builddir}/include \
+ 	-I${top_srcdir}/libnm-util \
+ 	-I${top_builddir}/marshallers
+ 
+diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am
+index 540e585..22deb41 100644
+--- a/src/ppp-manager/Makefile.am
++++ b/src/ppp-manager/Makefile.am
+@@ -1,6 +1,7 @@
+ INCLUDES = \
+ 	-I${top_srcdir} \
+ 	-I${top_srcdir}/include \
++	-I${top_builddir}/include \
+ 	-I${top_srcdir}/libnm-util \
+ 	-I${top_srcdir}/src \
+ 	-I${top_srcdir}/src/logging \
+diff --git a/src/settings/Makefile.am b/src/settings/Makefile.am
+index 21dc5bb..d87f713 100644
+--- a/src/settings/Makefile.am
++++ b/src/settings/Makefile.am
+@@ -2,6 +2,7 @@ SUBDIRS=plugins . tests
+ 
+ INCLUDES = -I${top_srcdir} \
+            -I${top_srcdir}/include \
++           -I${top_builddir}/include \
+            -I${top_srcdir}/libnm-util \
+            -I${top_srcdir}/src/logging \
+            -I${top_srcdir}/src \
+diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am
+index 9874d35..0bf8d19 100644
+--- a/src/settings/plugins/ifcfg-rh/Makefile.am
++++ b/src/settings/plugins/ifcfg-rh/Makefile.am
+@@ -25,6 +25,7 @@ libifcfg_rh_io_la_SOURCES = \
+ INCLUDES = \
+ 	-I$(top_srcdir)/src/settings \
+ 	-I$(top_srcdir)/include \
++	-I$(top_builddir)/include \
+ 	-I$(top_srcdir)/libnm-glib \
+ 	-I$(top_srcdir)/libnm-util \
+ 	-I$(top_builddir)/marshallers
+diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
+index 1b76a47..6b99561 100644
+--- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am
++++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
+@@ -2,6 +2,7 @@ SUBDIRS=network-scripts
+ 
+ INCLUDES = \
+ 	-I$(top_srcdir)/include \
++	-I$(top_builddir)/include \
+ 	-I$(top_srcdir)/libnm-util \
+ 	-I$(top_srcdir)/libnm-glib \
+ 	-I$(srcdir)/../
+diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am
+index 3b24214..e941e9b 100644
+--- a/src/settings/plugins/keyfile/Makefile.am
++++ b/src/settings/plugins/keyfile/Makefile.am
+@@ -3,6 +3,7 @@ SUBDIRS=. tests
+ INCLUDES = \
+ 	-I$(top_srcdir)/src/settings \
+ 	-I$(top_srcdir)/include \
++	-I$(top_builddir)/include \
+ 	-I$(top_srcdir)/libnm-util
+ 
+ noinst_LTLIBRARIES = \
+diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am
+index affe8dc..90bc233 100644
+--- a/src/settings/plugins/keyfile/tests/Makefile.am
++++ b/src/settings/plugins/keyfile/tests/Makefile.am
+@@ -2,6 +2,7 @@ SUBDIRS=keyfiles
+ 
+ INCLUDES = \
+ 	-I$(top_srcdir)/include \
++	-I$(top_builddir)/include \
+ 	-I$(top_srcdir)/libnm-util \
+ 	-I$(top_srcdir)/libnm-glib \
+ 	-I$(srcdir)/../
+diff --git a/src/settings/tests/Makefile.am b/src/settings/tests/Makefile.am
+index 4a45139..57d56fc 100644
+--- a/src/settings/tests/Makefile.am
++++ b/src/settings/tests/Makefile.am
+@@ -1,5 +1,6 @@
+ INCLUDES = \
+ 	-I$(top_srcdir)/include \
++	-I$(top_builddir)/include \
+ 	-I$(top_srcdir)/libnm-util \
+ 	-I$(top_srcdir)/src/settings
+ 
+diff --git a/src/supplicant-manager/Makefile.am b/src/supplicant-manager/Makefile.am
+index 359fc70..58c174d 100644
+--- a/src/supplicant-manager/Makefile.am
++++ b/src/supplicant-manager/Makefile.am
+@@ -4,6 +4,7 @@ INCLUDES = \
+ 	-I${top_srcdir}/src \
+ 	-I${top_srcdir}/src/logging \
+ 	-I${top_srcdir}/include \
++	-I${top_builddir}/include \
+ 	-I${top_srcdir}/libnm-util \
+ 	-I${top_builddir}/marshallers
+ 
+diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am
+index b5e4db6..b236025 100644
+--- a/src/supplicant-manager/tests/Makefile.am
++++ b/src/supplicant-manager/tests/Makefile.am
+@@ -1,5 +1,6 @@
+ INCLUDES = \
+ 	-I$(top_srcdir)/include \
++	-I$(top_builddir)/include \
+ 	-I$(top_srcdir)/libnm-util \
+ 	-I$(top_srcdir)/src \
+ 	-I$(top_srcdir)/src/supplicant-manager
+diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
+index 296668a..38a8d22 100644
+--- a/src/tests/Makefile.am
++++ b/src/tests/Makefile.am
+@@ -1,5 +1,6 @@
+ INCLUDES = \
+ 	-I$(top_srcdir)/include \
++	-I$(top_builddir)/include \
+ 	-I$(top_srcdir)/libnm-util \
+ 	-I$(top_srcdir)/src/dhcp-manager \
+ 	-I$(top_builddir)/marshallers \
+diff --git a/src/vpn-manager/Makefile.am b/src/vpn-manager/Makefile.am
+index ce99728..c4c7b3e 100644
+--- a/src/vpn-manager/Makefile.am
++++ b/src/vpn-manager/Makefile.am
+@@ -1,6 +1,7 @@
+ INCLUDES = \
+ 	-I${top_srcdir} \
+ 	-I${top_srcdir}/include \
++	-I${top_builddir}/include \
+ 	-I${top_srcdir}/libnm-util \
+ 	-I${top_srcdir}/src/logging \
+ 	-I${top_srcdir}/src \
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 7bdaf0d..952f8e7 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -1,7 +1,8 @@
+ INCLUDES = -I${top_srcdir}                    \
+            -I${top_srcdir}/libnm-util         \
+            -I${top_srcdir}/libnm-glib         \
+-           -I${top_srcdir}/include
++           -I${top_srcdir}/include            \
++	   -I${top_builddir}/include
+ 
+ AM_CPPFLAGS = \
+ 	$(DBUS_CFLAGS) \
+-- 
+1.7.6.4
+
diff --git a/gnomeos/3.4/NetworkManager-distro.patch b/gnomeos/3.4/NetworkManager-distro.patch
new file mode 100644
index 0000000..7682173
--- /dev/null
+++ b/gnomeos/3.4/NetworkManager-distro.patch
@@ -0,0 +1,26 @@
+From 0da5b6f2404f8abeb542207aeea23820687e60e4 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sun, 8 Jan 2012 14:13:23 -0500
+Subject: [PATCH] configure: Add --with-distro=generic
+
+For now we'll just get a basic NM setup for GNOME.
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7cb5dc0..955e2e4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -132,7 +132,7 @@ if test "z$with_distro" = "z"; then
+ 	exit 1
+ else
+ 	case $with_distro in
+-		redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo) ;;
++		redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo|generic) ;;
+ 		*)
+ 			echo "Your distribution (${with_distro}) is not yet supported!  (patches welcome)"
+ 			exit 1
+-- 
+1.7.6.4
+
diff --git a/gnomeos/3.4/dbus-xmlto-docs.patch b/gnomeos/3.4/dbus-xmlto-docs.patch
new file mode 100644
index 0000000..6cbbc87
--- /dev/null
+++ b/gnomeos/3.4/dbus-xmlto-docs.patch
@@ -0,0 +1,39 @@
+From 6bf8258df72c3ebbc6d574dfd5c44561f5a4724b Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sun, 8 Jan 2012 12:11:11 -0500
+Subject: [PATCH] build: Make --disable-xml-docs build work again
+
+We can't build the .html files without xmlto, so don't add them
+to a dist_ variable.
+---
+ doc/Makefile.am |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 3fdb780..db2537e 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -59,9 +59,6 @@ STATIC_HTML = \
+ 
+ dist_html_DATA += $(STATIC_HTML)
+ 
+-# we distribute these in the tarball so users don't necessarily need xmlto
+-dist_html_DATA += $(XMLTO_OUTPUT)
+-
+ XMLTO_OUTPUT=					\
+ 	dbus-faq.html				\
+ 	dbus-specification.html			\
+@@ -69,6 +66,10 @@ XMLTO_OUTPUT=					\
+ 	dbus-tutorial.html
+ 
+ if DBUS_XML_DOCS_ENABLED
++
++# we distribute these in the tarball so users don't necessarily need xmlto
++dist_html_DATA += $(XMLTO_OUTPUT)
++
+ dbus-specification.html: dbus-specification.xml
+ 	$(XMLTO) html-nochunks $<
+ 
+-- 
+1.7.6.4
+
diff --git a/gnomeos/3.4/expat-autogen.patch b/gnomeos/3.4/expat-autogen.patch
new file mode 100644
index 0000000..fac771a
--- /dev/null
+++ b/gnomeos/3.4/expat-autogen.patch
@@ -0,0 +1,137 @@
+From c5051be9cc07c307c45f32b7e8d6b2ec4949dffd Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sun, 8 Jan 2012 11:08:26 -0500
+Subject: [PATCH] Add autogen.sh to implement GNOME Build API, delete
+ buildconf.sh
+
+Delete buildconf.sh since does broken hacks looking for libtool.m4;
+autoreconf should be enough now.
+
+See http://people.gnome.org/~walters/docs/build-api.txt
+---
+ autogen.sh   |    3 ++
+ buildconf.sh |  102 ----------------------------------------------------------
+ 2 files changed, 3 insertions(+), 102 deletions(-)
+ create mode 100755 autogen.sh
+ delete mode 100755 buildconf.sh
+
+diff --git a/autogen.sh b/autogen.sh
+new file mode 100755
+index 0000000..c0d2e78
+--- /dev/null
++++ b/autogen.sh
+@@ -0,0 +1,3 @@
++#! /bin/sh
++
++exec autoreconf -vfi
+diff --git a/buildconf.sh b/buildconf.sh
+deleted file mode 100755
+index 2fc5932..0000000
+--- a/buildconf.sh
++++ /dev/null
+@@ -1,102 +0,0 @@
+-#! /bin/sh
+-
+-#--------------------------------------------------------------------------
+-# autoconf 2.52 or newer
+-#
+-ac_version="`${AUTOCONF:-autoconf} --version 2> /dev/null | head -1 | sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`"
+-if test -z "$ac_version"; then
+-  echo "ERROR: autoconf not found."
+-  echo "       You need autoconf version 2.52 or newer installed."
+-  exit 1
+-fi
+-IFS=.; set $ac_version; IFS=' '
+-if test "$1" = "2" -a "$2" -lt "52" || test "$1" -lt "2"; then
+-  echo "ERROR: autoconf version $ac_version found."
+-  echo "       You need autoconf version 2.52 or newer installed."
+-  exit 1
+-fi
+-
+-echo "found: autoconf version $ac_version (ok)"
+-
+-#--------------------------------------------------------------------------
+-# libtool 1.4 or newer
+-#
+-
+-#
+-# find libtoolize, or glibtoolize on MacOS X
+-#
+-libtoolize=`conftools/PrintPath glibtoolize libtoolize`
+-if [ "x$libtoolize" = "x" ]; then
+-  echo "ERROR: libtoolize not found."
+-  echo "       You need libtool version 1.4 or newer installed"
+-  exit 1
+-fi
+-
+-lt_pversion="`$libtoolize --version 2> /dev/null | sed -e 's/^[^0-9]*//'`"
+-
+-# convert something like 1.4p1 to 1.4.p1
+-lt_version="`echo $lt_pversion | sed -e 's/\([a-z]*\)$/.\1/'`"
+-
+-IFS=.; set $lt_version; IFS=' '
+-if test "$1" = "1" -a "$2" -lt "4"; then
+-  echo "ERROR: libtool version $lt_pversion found."
+-  echo "       You need libtool version 1.4 or newer installed"
+-  exit 1
+-fi
+-
+-echo "found: libtool version $lt_pversion (ok)"
+-
+-#--------------------------------------------------------------------------
+-
+-# Remove any libtool files so one can switch between libtool 1.3
+-# and libtool 1.4 by simply rerunning the buildconf script.
+-(cd conftools/; rm -f ltmain.sh ltconfig)
+-
+-#
+-# Create the libtool helper files
+-#
+-echo "Copying libtool helper files ..."
+-
+-#
+-# Note: we don't use --force (any more) since we have a special
+-# config.guess/config.sub that we want to ensure is used.
+-#
+-# --copy to avoid symlinks; we want originals for the distro
+-# --automake to make it shut up about "things to do"
+-#
+-$libtoolize --copy --automake
+-
+-#
+-# Find the libtool.m4 file. The developer/packager can set the LIBTOOL_M4
+-# environment variable to specify its location. If that variable is not
+-# set, then we'll assume a "standard" libtool installation and try to
+-# derive its location.
+-#
+-ltpath=`dirname $libtoolize`
+-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
+-cp $ltfile conftools/libtool.m4
+-
+-echo "Using libtool.m4 from ${ltfile}."
+-
+-#--------------------------------------------------------------------------
+-
+-### for a little while... remove stray aclocal.m4 files from
+-### developers' working copies. we no longer use it. (nothing else
+-### will remove it, and leaving it creates big problems)
+-rm -f aclocal.m4
+-
+-#
+-# Generate the autoconf header template (expat_config.h.in) and ./configure
+-#
+-echo "Creating expat_config.h.in ..."
+-${AUTOHEADER:-autoheader}
+-
+-echo "Creating configure ..."
+-### do some work to toss config.cache?
+-${AUTOCONF:-autoconf}
+-
+-# toss this; it gets created by autoconf on some systems
+-rm -rf autom4te*.cache
+-
+-# exit with the right value, so any calling script can continue
+-exit 0
+-- 
+1.7.6.4
+
diff --git a/gnomeos/3.4/manifest.json b/gnomeos/3.4/manifest.json
index 5ca76f6..efba3ef 100644
--- a/gnomeos/3.4/manifest.json
+++ b/gnomeos/3.4/manifest.json
@@ -6,7 +6,10 @@
   "config-opts": ["--disable-static", "--disable-silent-rules"],
 
   "vcsconfig": {"gnome": "git:git://git.gnome.org/",
-                "fd": "git:git://anongit.freedesktop.org/git/"},
+                "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/",
+		"cgwalters": "git:git://github.com/cgwalters/"},
 
   "components": [
    		{"src": "gnome:gtk-doc-stub",
@@ -248,7 +251,30 @@
 		{"src": "gnome:gnome-common",
 		 "component": "devel"},
 
-		{"src": "gnome:gobject-introspection"}
+		{"src": "cgwalters:intltool-git-mirror",
+		 "component": "devel"},
+
+		{"src": "gnome:gobject-introspection"},
+
+		{"src": "cgwalters:expat-git-mirror.git",
+		 "patches": ["expat-autogen.patch"]},
+
+		{"src": "fd-dbus:dbus",
+		 "config-opts": ["--enable-inotify",
+				 "--disable-xml-docs",
+				 "--disable-doxygen-docs",
+				 "--disable-tests"],
+                 "patches": ["dbus-xmlto-docs.patch"]},
+
+		{"src": "fd-dbus:dbus-glib",
+		 "config-opts": ["--disable-gtk-doc"]},
+
+		{"src": "git:git://git.infradead.org/users/tgr/libnl.git",
+		 "name": "libnl3",
+		 		 "branch": "libnl3_1"},
 
-		]
+		{"src": "fd-NM:NetworkManager",
+		 "config-opts": ["--with-distro=generic"],
+		 "patches": ["NetworkManager-builddir.patch", "NetworkManager-distro.patch"]}
+	]
 }
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]