[ostree] gnomeos: Building gnome-shell, gnome-control-center

From: Colin Walters <walters src gnome org>
To: commits-list gnome org
Cc:
Subject: [ostree] gnomeos: Building gnome-shell, gnome-control-center
Date: Sat, 21 Jan 2012 16:15:19 +0000 (UTC)
commit 87f0de533623a0e2d28cdab3b14dd0de47395040
Author: Colin Walters <walters verbum org>
Date:   Sat Jan 21 11:14:17 2012 -0500

    gnomeos: Building gnome-shell, gnome-control-center

 gnomeos/3.4/dconf-builddir.patch                 |   25 ++++
 gnomeos/3.4/e-d-s-vala.patch                     |   26 ++++
 gnomeos/3.4/folks-builddir.patch                 |   26 ++++
 gnomeos/3.4/folks-config-fatal-warnings.patch    |   30 +++++
 gnomeos/3.4/folks-vala-0.14.patch                |   36 ++++++
 gnomeos/3.4/folks-vala-0.16.patch                |  142 ++++++++++++++++++++++
 gnomeos/3.4/g-c-c-disable-docs.patch             |   47 +++++++
 gnomeos/3.4/gdm-pam-auth.patch                   |   72 +++++++++++
 gnomeos/3.4/gee-builddir.patch                   |   26 ++++
 gnomeos/3.4/gee-gir-version.patch                |   26 ++++
 gnomeos/3.4/gee-vala-0.15.patch                  |   51 ++++++++
 gnomeos/3.4/gnome-bluetooth-applet-la-file.patch |   32 +++++
 gnomeos/3.4/gnome-bluetooth-disable-docs.patch   |   26 ++--
 gnomeos/3.4/libgee-compile.patch                 |   25 ++++
 gnomeos/3.4/manifest.json                        |   70 +++++++----
 gnomeos/3.4/startup-notification-autogen.patch   |   28 +++++
 gnomeos/3.4/telepathy-glib-0.16.patch            |   22 ++++
 gnomeos/3.4/telepathy-glib-builddir.patch        |   26 ++++
 gnomeos/3.4/telepathy-logger-autogen.patch       |   35 ++++++
 gnomeos/3.4/vala-0.14-builddir.patch             |   27 ++++
 gnomeos/3.4/vala-builddir.patch                  |   26 ++++
 21 files changed, 783 insertions(+), 41 deletions(-)
---
diff --git a/gnomeos/3.4/dconf-builddir.patch b/gnomeos/3.4/dconf-builddir.patch
new file mode 100644
index 0000000..52df7a1
--- /dev/null
+++ b/gnomeos/3.4/dconf-builddir.patch
@@ -0,0 +1,25 @@
+From 79f8f5db8b484b51ee8e18ad464fb789dd4cd3e5 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Fri, 20 Jan 2012 17:08:52 -0500
+Subject: [PATCH] build: Note we don't support srcdir != builddir
+
+---
+ configure.ac |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8dcd441..3105995 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11,6 +11,8 @@ AC_CONFIG_HEADERS([config.h])
+ AM_INIT_AUTOMAKE([1.11 -Wno-portability no-dist-gzip dist-xz])
+ AM_SILENT_RULES([yes])
+ 
++echo \#buildapi-variable-no-builddir >/dev/null
++
+ # Check for programs
+ AC_PROG_CC
+ AM_PROG_VALAC([0.11.7])
+-- 
+1.7.6.5
+
diff --git a/gnomeos/3.4/e-d-s-vala.patch b/gnomeos/3.4/e-d-s-vala.patch
new file mode 100644
index 0000000..8afef88
--- /dev/null
+++ b/gnomeos/3.4/e-d-s-vala.patch
@@ -0,0 +1,26 @@
+From d09173b7f9116dce51a19c557f26736f01d02da9 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Thu, 19 Jan 2012 15:21:09 -0500
+Subject: [PATCH] vala: Add missing --pkg libxml-2.0
+
+EDataServer-1.2.gir depends on libxml2, so we need to tell vapigen
+that as well.
+---
+ vala/Makefile.am |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/vala/Makefile.am b/vala/Makefile.am
+index 3c35ede..ed4a574 100644
+--- a/vala/Makefile.am
++++ b/vala/Makefile.am
+@@ -24,6 +24,7 @@ pkgconfigdir = ${libdir}/pkgconfig
+ libedataserver-1.2.vapi: $(top_builddir)/libedataserver/EDataServer-1.2.gir
+ 	$(VAPIGEN_V)$(VAPIGEN) \
+ 		--pkg gio-2.0 \
++		--pkg libxml-2.0 \
+ 		--library libedataserver-1.2 \
+ 		--metadatadir=$(srcdir) \
+ 		$< \
+-- 
+1.7.6.5
+
diff --git a/gnomeos/3.4/folks-builddir.patch b/gnomeos/3.4/folks-builddir.patch
new file mode 100644
index 0000000..ef78829
--- /dev/null
+++ b/gnomeos/3.4/folks-builddir.patch
@@ -0,0 +1,26 @@
+From acb681c2d0db4dd8b8b26dc0ba80d70cd5cbc325 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Thu, 19 Jan 2012 15:40:14 -0500
+Subject: [PATCH] build: Note that we don't support srcdir != builddir
+
+---
+ configure.ac |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index bb45b05..7853362 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,6 +46,9 @@ AM_INIT_AUTOMAKE([1.11 dist-bzip2 no-define
+                   no-dist-gzip tar-ustar -Wno-portability])
+ AM_MAINTAINER_MODE([enable])
+ 
++dnl http://people.gnome.org/~walters/docs/build-api.txt
++echo \#buildapi-variable-no-builddir >/dev/null
++
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+ AC_DISABLE_STATIC
+-- 
+1.7.6.5
+
diff --git a/gnomeos/3.4/folks-config-fatal-warnings.patch b/gnomeos/3.4/folks-config-fatal-warnings.patch
new file mode 100644
index 0000000..db91eb1
--- /dev/null
+++ b/gnomeos/3.4/folks-config-fatal-warnings.patch
@@ -0,0 +1,30 @@
+From b39dcc98ea5588fa7affe2272fdc0ecebc713b1c Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Fri, 20 Jan 2012 12:24:59 -0500
+Subject: [PATCH] build: Add --disable-fatal-warnings configure flag
+
+Useful for builders who aren't necessarily developers.
+---
+ configure.ac |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7ca2800..758ff63 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -472,7 +472,11 @@ AC_SUBST([CODE_COVERAGE_CFLAGS])
+ AC_SUBST([CODE_COVERAGE_LDFLAGS])
+ 
+ # Vala-related flags
+-AS_IF([test "x$enable_vala" = "xyes"],
++AC_ARG_ENABLE([fatal-warnings],
++              AS_HELP_STRING([--disable-fatal-warnings],
++                             [Make warnings from valac and g-ir-scanner non-fatal]),
++              [enable_fatal_warnings=$enableval], [enable_fatal_warnings=yes])
++AS_IF([test "x$enable_vala" = "xyes" && test "x$enable_fatal_warnings" = "xyes"],
+       [ERROR_INTROSPECTION_SCANNER_ARGS="\
+                         $ERROR_INTROSPECTION_SCANNER_ARGS --warn-error"
+        ERROR_VALAFLAGS="$ERROR_VALAFLAGS --fatal-warnings"])
+-- 
+1.7.6.5
+
diff --git a/gnomeos/3.4/folks-vala-0.14.patch b/gnomeos/3.4/folks-vala-0.14.patch
new file mode 100644
index 0000000..68e8e33
--- /dev/null
+++ b/gnomeos/3.4/folks-vala-0.14.patch
@@ -0,0 +1,36 @@
+From 785f5a87fde722b459f0dd7edd6788b825156586 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Thu, 19 Jan 2012 18:14:11 -0500
+Subject: [PATCH] Use vala 0.14 explicitly
+
+---
+ configure.ac |   13 ++++---------
+ 1 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7b56633..1d39805 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -242,15 +242,10 @@ if test \
+ fi
+ 
+ if test "x$enable_vala" = "xyes" ; then
+-        AM_PROG_VALAC([$VALA_REQUIRED])
+-        if test "x$VALAC" = "x"; then
+-              AC_MSG_ERROR([Vala requested but valac is not installed])
+-        fi
+-
+-        AC_PATH_PROG([VAPIGEN], [vapigen], [])
+-        if test "x$VAPIGEN" = "x"; then
+-              AC_MSG_ERROR([Vala must be built with --enable-vapigen])
+-        fi
++	VALAC=vala-0.14
++	AC_SUBST(VALAC)
++	VAPIGEN=valapigen-0.14
++	AC_SUBST(VAPIGEN)
+ 
+         # require GLib >= 2.24 so GLib.Array, etc. reffing is handled
+         # automatically
+-- 
+1.7.6.5
+
diff --git a/gnomeos/3.4/folks-vala-0.16.patch b/gnomeos/3.4/folks-vala-0.16.patch
new file mode 100644
index 0000000..db51d32
--- /dev/null
+++ b/gnomeos/3.4/folks-vala-0.16.patch
@@ -0,0 +1,142 @@
+From 6b1c7810953aa19a7ac6c9955398442c548abe85 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Fri, 20 Jan 2012 14:46:14 -0500
+Subject: [PATCH] Build with vala 0.15
+
+---
+ backends/key-file/kf-persona-store.vala |    6 +++---
+ folks/backend-store.vala                |   16 ++++++++--------
+ folks/object-cache.vala                 |    6 +++---
+ tests/folks/backend-loading.vala        |    6 +++---
+ tests/lib/eds/backend.vala              |    2 +-
+ tools/inspect/inspect.vala              |    2 +-
+ 6 files changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/backends/key-file/kf-persona-store.vala b/backends/key-file/kf-persona-store.vala
+index 0d2bb53..5f75d56 100644
+--- a/backends/key-file/kf-persona-store.vala
++++ b/backends/key-file/kf-persona-store.vala
+@@ -450,9 +450,9 @@ public class Folks.Backends.Kf.PersonaStore : Folks.PersonaStore
+            * Vala <= 0.10, it returned the character length). FIXME: We need to
+            * take this into account until we depend explicitly on
+            * Vala >= 0.11. */
+-          yield this.file.replace_contents_async (key_file_data,
+-              key_file_data.length, null, false, FileCreateFlags.PRIVATE,
+-              cancellable);
++          yield this.file.replace_contents_async (key_file_data.data,
++              null, false, FileCreateFlags.PRIVATE,
++              cancellable, null);
+         }
+       catch (Error e)
+         {
+diff --git a/folks/backend-store.vala b/folks/backend-store.vala
+index a00bf19..9d28f9b 100644
+--- a/folks/backend-store.vala
++++ b/folks/backend-store.vala
+@@ -537,10 +537,10 @@ public class Folks.BackendStore : Object {
+       debug ("Searching for modules in folder '%s' ..", dir.get_path ());
+ 
+       var attributes =
+-          FILE_ATTRIBUTE_STANDARD_NAME + "," +
+-          FILE_ATTRIBUTE_STANDARD_TYPE + "," +
+-          FILE_ATTRIBUTE_STANDARD_IS_SYMLINK + "," +
+-          FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE;
++          FileAttribute.STANDARD_NAME + "," +
++          FileAttribute.STANDARD_TYPE + "," +
++          FileAttribute.STANDARD_IS_SYMLINK + "," +
++          FileAttribute.STANDARD_CONTENT_TYPE;
+ 
+       GLib.List<FileInfo> infos;
+       try
+@@ -675,7 +675,7 @@ public class Folks.BackendStore : Object {
+         {
+           /* Query for the MIME type; if the file doesn't exist, we'll get an
+            * appropriate error back, so this also checks for existence. */
+-          file_info = yield file.query_info_async (FILE_ATTRIBUTE_STANDARD_TYPE,
++          file_info = yield file.query_info_async (FileAttribute.STANDARD_TYPE,
+               FileQueryInfoFlags.NONE, Priority.DEFAULT, null);
+         }
+       catch (Error error)
+@@ -766,9 +766,9 @@ public class Folks.BackendStore : Object {
+            * Vala <= 0.10, it returned the character length). FIXME: We need to
+            * take this into account until we depend explicitly on
+            * Vala >= 0.11. */
+-          yield this._config_file.replace_contents_async (key_file_data,
+-              key_file_data.length, null, false, FileCreateFlags.PRIVATE,
+-              null);
++          yield this._config_file.replace_contents_async (key_file_data.data,
++              null, false, FileCreateFlags.PRIVATE,
++              null, null);
+         }
+       catch (Error e)
+         {
+diff --git a/folks/object-cache.vala b/folks/object-cache.vala
+index c9adb85..52f518f 100644
+--- a/folks/object-cache.vala
++++ b/folks/object-cache.vala
+@@ -194,7 +194,7 @@ public abstract class Folks.ObjectCache<T> : Object
+ 
+       try
+         {
+-          yield this._cache_file.load_contents_async (cancellable, out data);
++          yield this._cache_file.load_contents_async (cancellable, out data, null);
+         }
+       catch (Error e)
+         {
+@@ -372,8 +372,8 @@ public abstract class Folks.ObjectCache<T> : Object
+           try
+             {
+               yield this._cache_file.replace_contents_async (
+-                  (string) data, data.length, null, false,
+-                  FileCreateFlags.PRIVATE, cancellable);
++                  data, null, false,
++                  FileCreateFlags.PRIVATE, cancellable, null);
+               break;
+             }
+           catch (Error e)
+diff --git a/tests/folks/backend-loading.vala b/tests/folks/backend-loading.vala
+index 1dbcddb..d8f02f8 100644
+--- a/tests/folks/backend-loading.vala
++++ b/tests/folks/backend-loading.vala
+@@ -59,9 +59,9 @@ public class BackendLoadingTests : Folks.TestCase
+         {
+           File backend_f = File.new_for_path (kf_path);
+           string data = kf.to_data ();
+-          backend_f.replace_contents (data,
+-              data.length, null, false, FileCreateFlags.PRIVATE,
+-              null);
++          backend_f.replace_contents (data.data,
++              null, false, FileCreateFlags.PRIVATE,
++              null, null);
+         }
+       catch (Error e)
+         {
+diff --git a/tests/lib/eds/backend.vala b/tests/lib/eds/backend.vala
+index 7bc0ea4..b004973 100644
+--- a/tests/lib/eds/backend.vala
++++ b/tests/lib/eds/backend.vala
+@@ -225,7 +225,7 @@ public class EdsTest.Backend
+ 
+               try
+                 {
+-                  file.load_contents (null, out photo_content);
++                  file.load_contents (null, out photo_content, null);
+ 
+                   var cp = new ContactPhoto ();
+                   cp.type = ContactPhotoType.INLINED;
+diff --git a/tools/inspect/inspect.vala b/tools/inspect/inspect.vala
+index c69356b..1e3eaed 100644
+--- a/tools/inspect/inspect.vala
++++ b/tools/inspect/inspect.vala
+@@ -299,7 +299,7 @@ public class Folks.Inspect.Client : Object
+     }
+ }
+ 
+-private abstract class Folks.Inspect.Command
++public abstract class Folks.Inspect.Command
+ {
+   protected Client client;
+ 
+-- 
+1.7.6.5
+
diff --git a/gnomeos/3.4/g-c-c-disable-docs.patch b/gnomeos/3.4/g-c-c-disable-docs.patch
new file mode 100644
index 0000000..3f2afc0
--- /dev/null
+++ b/gnomeos/3.4/g-c-c-disable-docs.patch
@@ -0,0 +1,47 @@
+From b9c16442af191dfb2df3f7a554946990c2519d99 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sat, 21 Jan 2012 11:10:42 -0500
+Subject: [PATCH] build: Add a --disable-documentation option
+
+Allows OS builders to bootstrap more easily.
+---
+ Makefile.am  |    6 +++++-
+ configure.ac |    4 ++++
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 4931964..05d5b3c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,8 +1,12 @@
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 
+-SUBDIRS = po shell panels help
++SUBDIRS = po shell panels
+ DIST_SUBDIRS = po help shell panels
+ 
++if ENABLE_DOCUMENTATION
++SUBDIRS += help
++endif
++
+ DISTCLEANFILES = \
+ 	gnome-doc-utils.make
+ 
+diff --git a/configure.ac b/configure.ac
+index a37af2a..c2cc6dc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,10 @@ AC_HEADER_STDC
+ LT_PREREQ([2.2])
+ LT_INIT
+ 
++AC_ARG_ENABLE([documentation],
++	AS_HELP_STRING([--enable-documentation], [enable man pages and HTML]),
++	[], [enable_documentation=yes])
++AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes)
+ # Use the GNOME documentation framework
+ GNOME_DOC_INIT
+ 
+-- 
+1.7.6.5
+
diff --git a/gnomeos/3.4/gdm-pam-auth.patch b/gnomeos/3.4/gdm-pam-auth.patch
new file mode 100644
index 0000000..931aab6
--- /dev/null
+++ b/gnomeos/3.4/gdm-pam-auth.patch
@@ -0,0 +1,72 @@
+From b37eee01220036d8899e91f334a77d2a4983f43a Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Fri, 20 Jan 2012 17:23:05 -0500
+Subject: [PATCH] gdm: Switch to use common- auth
+
+---
+ data/gdm           |   15 ++++-----------
+ data/gdm-autologin |   13 ++++---------
+ data/gdm-welcome   |   12 ++++--------
+ 3 files changed, 12 insertions(+), 28 deletions(-)
+
+diff --git a/data/gdm b/data/gdm
+index 58c397d..44d509b 100644
+--- a/data/gdm
++++ b/data/gdm
+@@ -1,12 +1,5 @@
+ #%PAM-1.0
+-auth       required    pam_env.so
+-auth       required    pam_succeed_if.so user != root quiet
+-auth       sufficient  pam_succeed_if.so user ingroup nopasswdlogin
+-auth       include     system-auth
+-account    required    pam_nologin.so
+-account    include     system-auth
+-password   include     system-auth
+-session    optional    pam_keyinit.so force revoke
+-session    include     system-auth
+-session    required    pam_loginuid.so
+-session    optional    pam_console.so
++auth       include     common-auth
++account    include     common-auth
++password   include     common-auth
++session    include     common-auth
+diff --git a/data/gdm-autologin b/data/gdm-autologin
+index c4e598a..44d509b 100644
+--- a/data/gdm-autologin
++++ b/data/gdm-autologin
+@@ -1,10 +1,5 @@
+ #%PAM-1.0
+-auth       required    pam_env.so
+-auth       required    pam_permit.so
+-account    required    pam_nologin.so
+-account    include     system-auth
+-password   include     system-auth
+-session    optional    pam_keyinit.so force revoke
+-session    include     system-auth
+-session    required    pam_loginuid.so
+-session    optional    pam_console.so
++auth       include     common-auth
++account    include     common-auth
++password   include     common-auth
++session    include     common-auth
+diff --git a/data/gdm-welcome b/data/gdm-welcome
+index b301f4f..44d509b 100644
+--- a/data/gdm-welcome
++++ b/data/gdm-welcome
+@@ -1,9 +1,5 @@
+ #%PAM-1.0
+-auth       required    pam_env.so
+-auth       required    pam_permit.so
+-account    required    pam_nologin.so
+-account    include     system-auth
+-password   include     system-auth
+-session    required    pam_loginuid.so
+-session    optional    pam_keyinit.so force revoke
+-session    include     system-auth
++auth       include     common-auth
++account    include     common-auth
++password   include     common-auth
++session    include     common-auth
+-- 
+1.7.6.5
+
diff --git a/gnomeos/3.4/gee-builddir.patch b/gnomeos/3.4/gee-builddir.patch
new file mode 100644
index 0000000..cbbc5ac
--- /dev/null
+++ b/gnomeos/3.4/gee-builddir.patch
@@ -0,0 +1,26 @@
+From 2b42fa58fda13909ca7ef1b0b6e339324648d3f2 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Thu, 19 Jan 2012 10:38:03 -0500
+Subject: [PATCH] build: Note that we don't support srcdir != builddir
+
+---
+ configure.ac |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c25cb8d..fab2de0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,6 +5,9 @@ AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE([check-news dist-bzip2])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
++dnl http://people.gnome.org/~walters/docs/build-api.txt
++echo \#buildapi-variable-no-builddir >/dev/null
++
+ # Checks for programs.
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+-- 
+1.7.6.5
+
diff --git a/gnomeos/3.4/gee-gir-version.patch b/gnomeos/3.4/gee-gir-version.patch
new file mode 100644
index 0000000..a9ba63e
--- /dev/null
+++ b/gnomeos/3.4/gee-gir-version.patch
@@ -0,0 +1,26 @@
+From a2e1aaedd48503f2f58fbe714a414d428cca4c70 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Fri, 20 Jan 2012 11:05:24 -0500
+Subject: [PATCH] assemblyinfo: Use correct .gir version for 0.6 branch
+ (should be 1.0)
+
+https://bugzilla.gnome.org/show_bug.cgi?id=666208
+---
+ gee/assemblyinfo.vala |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/gee/assemblyinfo.vala b/gee/assemblyinfo.vala
+index 8f3474b..1fdde6d 100644
+--- a/gee/assemblyinfo.vala
++++ b/gee/assemblyinfo.vala
+@@ -20,6 +20,6 @@
+  * 	Maciej Piechotka <uzytkownik2 gmail com>
+  */
+ 
+-[CCode (gir_namespace = "Gee", gir_version = "0.8")]
++[CCode (gir_namespace = "Gee", gir_version = "1.0")]
+ namespace Gee {}
+ 
+-- 
+1.7.6.5
+
diff --git a/gnomeos/3.4/gee-vala-0.15.patch b/gnomeos/3.4/gee-vala-0.15.patch
new file mode 100644
index 0000000..f6c6598
--- /dev/null
+++ b/gnomeos/3.4/gee-vala-0.15.patch
@@ -0,0 +1,51 @@
+From 5e35da9f6bbcb99790efb8934c9651e93f095d7c Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Fri, 20 Jan 2012 09:49:49 -0500
+Subject: [PATCH] Fix compilation with Vala 0.15
+
+---
+ gee/priorityqueue.vala   |    4 ++--
+ tests/testarraylist.vala |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/gee/priorityqueue.vala b/gee/priorityqueue.vala
+index 6c45238..e3e7a85 100644
+--- a/gee/priorityqueue.vala
++++ b/gee/priorityqueue.vala
+@@ -53,7 +53,7 @@ public class Gee.PriorityQueue<G> : Gee.AbstractQueue<G> {
+ 	private Type2Node<G>? _lm_head = null;
+ 	private Type2Node<G>? _lm_tail = null;
+ 	private Type1Node<G>? _p = null;
+-	private Type1Node<G>?[] _a = new Type1Node<G>[0];
++	private Type1Node<G>?[] _a = new Type1Node<G>?[0];
+ 	private NodePair<G>? _lp_head = null;
+ 	private NodePair<G>? _lp_tail = null;
+ 	private bool[] _b = new bool[0];
+@@ -316,7 +316,7 @@ public class Gee.PriorityQueue<G> : Gee.AbstractQueue<G> {
+ 		_lm_head = null;
+ 		_lm_tail = null;
+ 		_p = null;
+-		_a = new Type1Node<G>[0];
++		_a = new Type1Node<G>?[0];
+ 		_lp_head = null;
+ 		_lp_tail = null;
+ 		_b = new bool[0];
+diff --git a/tests/testarraylist.vala b/tests/testarraylist.vala
+index e5340c5..05bc328 100644
+--- a/tests/testarraylist.vala
++++ b/tests/testarraylist.vala
+@@ -148,9 +148,9 @@ public class ArrayListTests : ListTests {
+ 		assert (double_list.add (1.5d));
+ 		assert (double_list.add (2.0d));
+ 
+-		double[] double_array = double_list.to_array ();
++		double?[] double_array = double_list.to_array ();
+ 		index = 0;
+-		foreach (double element in double_list) {
++		foreach (double? element in double_list) {
+ 			assert (element == double_array[index++]);
+ 		}
+ 	}
+-- 
+1.7.6.5
+
diff --git a/gnomeos/3.4/gnome-bluetooth-applet-la-file.patch b/gnomeos/3.4/gnome-bluetooth-applet-la-file.patch
new file mode 100644
index 0000000..a2728b0
--- /dev/null
+++ b/gnomeos/3.4/gnome-bluetooth-applet-la-file.patch
@@ -0,0 +1,32 @@
+From ebee614641a9c3af11a2d860e75b1a564744b767 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sat, 21 Jan 2012 10:11:54 -0500
+Subject: [PATCH] applet: Delete gnome-bluetooth-applet.la file
+
+For operating system creators who don't ship .la files in /usr/lib,
+this file will still reference the (now non-existent)
+libgnome-bluetooth.la.
+
+This patch should be harmless for distributors who do still ship the
+.la files though.
+---
+ applet/Makefile-lib.am |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/applet/Makefile-lib.am b/applet/Makefile-lib.am
+index 7f75083..e01c386 100644
+--- a/applet/Makefile-lib.am
++++ b/applet/Makefile-lib.am
+@@ -13,6 +13,9 @@ libgnome_bluetooth_applet_la_LDFLAGS = -no-undefined
+ 
+ AM_CFLAGS = -I$(srcdir) -I$(top_srcdir)/lib $(LIBGNOMEBT_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
+ 
++install-data-hook:
++	rm $(DESTDIR)$(pkglibdir)/libgnome-bluetooth-applet.la
++
+ include $(INTROSPECTION_MAKEFILE)
+ INTROSPECTION_GIRS =
+ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+-- 
+1.7.6.5
+
diff --git a/gnomeos/3.4/gnome-bluetooth-disable-docs.patch b/gnomeos/3.4/gnome-bluetooth-disable-docs.patch
index 32f34f5..bf4b940 100644
--- a/gnomeos/3.4/gnome-bluetooth-disable-docs.patch
+++ b/gnomeos/3.4/gnome-bluetooth-disable-docs.patch
@@ -1,40 +1,38 @@
-From 9cd7957d9ba16d341e31e053ced6d932949cbdc0 Mon Sep 17 00:00:00 2001
+From 2cd4a37078f416ff848c62b9df2239e21406aab8 Mon Sep 17 00:00:00 2001
 From: Colin Walters <walters verbum org>
 Date: Wed, 18 Jan 2012 22:06:58 -0500
 Subject: [PATCH] build: Add --disable-documentation option
 
 This helps operating system builders.
 ---
- Makefile.am  |    9 +++++++--
+ Makefile.am  |    9 ++++++++-
  configure.ac |    5 +++++
- 2 files changed, 12 insertions(+), 2 deletions(-)
+ 2 files changed, 13 insertions(+), 1 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 9111350..a136218 100644
+index 9187597..64673bd 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -4,9 +4,14 @@ if WITH_MOBLIN
- MOBLIN_DIR = moblin
- endif
+@@ -1,6 +1,13 @@
+ DEF_SUBDIRS = icons lib applet wizard sendto docs po help
  
 -SUBDIRS = icons lib applet wizard sendto $(MOBLIN_DIR) docs po help
--
-+SUBDIRS = icons lib applet wizard sendto $(MOBLIN_DIR) docs po
- DIST_SUBDIRS = $(DEF_SUBDIRS) moblin
++SUBDIRS = icons lib applet wizard sendto docs po
++DIST_SUBDIRS = 
++
 +if ENABLE_DOCUMENTATION
 +SUBDIRS += help
 +else
 +DIST_SUBDIRS += help
 +endif
-+
+ 
  EXTRA_DIST = intltool-extract.in intltool-update.in intltool-merge.in ChangeLog.pre-2.27 gtk-doc.make gnome-doc-utils.make
  
- DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install \
 diff --git a/configure.ac b/configure.ac
-index 9d8a7f2..e43c79d 100644
+index 869e3ed..6f2b5be 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -182,6 +182,11 @@ GNOME_COMPILE_WARNINGS([maximum])
+@@ -146,6 +146,11 @@ GNOME_COMPILE_WARNINGS([maximum])
  GNOME_CXX_WARNINGS
  GNOME_MAINTAINER_MODE_DEFINES
  
diff --git a/gnomeos/3.4/libgee-compile.patch b/gnomeos/3.4/libgee-compile.patch
new file mode 100644
index 0000000..9be787d
--- /dev/null
+++ b/gnomeos/3.4/libgee-compile.patch
@@ -0,0 +1,25 @@
+From 2d4163a099a3c44721125105e0f8f81bfebb7e53 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Thu, 19 Jan 2012 18:45:55 -0500
+Subject: [PATCH] Make testarraylist compile again
+
+---
+ tests/testarraylist.vala |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/tests/testarraylist.vala b/tests/testarraylist.vala
+index b13ec30..42d02a5 100644
+--- a/tests/testarraylist.vala
++++ b/tests/testarraylist.vala
+@@ -131,7 +131,7 @@ public class ArrayListTests : BidirListTests {
+ 		assert (double_list.add (1.5d));
+ 		assert (double_list.add (2.0d));
+ 
+-		double[] double_array = double_list.to_array ();
++		double?[] double_array = double_list.to_array ();
+ 		index = 0;
+ 		foreach (double element in double_list) {
+ 			assert (element == double_array[index++]);
+-- 
+1.7.6.5
+
diff --git a/gnomeos/3.4/manifest.json b/gnomeos/3.4/manifest.json
index 339f3a8..29def05 100644
--- a/gnomeos/3.4/manifest.json
+++ b/gnomeos/3.4/manifest.json
@@ -329,7 +329,8 @@
 				 "--disable-doxygen-docs",
 				 "--disable-tests",
 				 "--with-system-pid-file=/run/dbus.pid"],
-                 "patches": ["dbus-xmlto-docs.patch"]},
+                 "patches": ["dbus-xmlto-docs.patch"],
+		 "setuid": ["/usr/libexec/dbus-daemon-launch-helper"]},
 
 		{"src": "fd:xorg/util/makedepend",
 		 "component": "devel",
@@ -378,6 +379,13 @@
 		{"src": "fd:xorg/driver/xf86-video-vesa",
 		 "patches": ["xorg-autogen.patch"]},
 
+		{"src": "fd:xcb/util",
+		 "component": "devel",
+		 "patches": ["xorg-autogen.patch"]},
+
+		{"src": "fd:startup-notification",
+		 "patches": ["startup-notification-autogen.patch"]},
+
 		{"src": "fd-dbus:dbus-glib",
 		 "config-opts": ["--disable-gtk-doc"]},
 
@@ -451,8 +459,7 @@
 		 "branch": "gtk-2-24"},
 
 		{"src": "gnome:gtk+",
-		 "name": "gtk3",
-		 "branch": "3b6665aad2c895fc8bc308fc47628001bbc0b401"},
+		 "name": "gtk3"},
 
 		{"src": "fd-p11:p11-kit"},
 
@@ -561,11 +568,14 @@
 		 "config-opts": ["--disable-documentation"]},
 
 		{"src": "gnome:gnome-bluetooth",
-		 "patches": ["gnome-bluetooth-disable-docs.patch"],
+		 "patches": ["gnome-bluetooth-disable-docs.patch",
+		             "gnome-bluetooth-applet-la-file.patch"],
 		 "config-opts": ["--disable-documentation"]},
 
 		{"src": "gnome:zenity"},
 
+		{"src": "gnome:metacity"},
+
 		{"src": "gnome:mutter",
 		 "config-opts": ["--enable-compile-warnings=maximum"]},
 
@@ -583,25 +593,20 @@
 		 	     "vala-tarballs-as-git-bootstrap.patch"]},
 
 		{"src": "gnome:vala",
-		 "name": "vala-0.14",
-		 "branch": "0.14.1",
-		 "config-opts": ["--enable-vapigen",
-		                 "--disable-unversioned"],
-		 "patches": ["vala-0.14-builddir.patch"]},
-
-		{"src": "gnome:vala",
 		 "name": "vala-0.16",
-		 "branch": "0.15.0",
 		 "config-opts": ["--enable-vapigen"],
 		 "patches": ["vala-builddir.patch"]},
 
 		{"src": "gnome:libgee",
-		 "branch": "0.6.2.1",
-		 "patches": ["gee-builddir.patch"]},
+		 "branch": "0.6",
+		 "patches": ["gee-builddir.patch",
+		             "gee-vala-0.15.patch",
+			     "gee-gir-version.patch"]},
 
 		{"src": "fd-telepathy:telepathy-glib",
-		 "branch": "telepathy-glib-0.17.4",
-		 "config-opts": ["--enable-vala-bindings"]},
+		 "branch": "telepathy-glib-0.17.3",
+		 "config-opts": ["--enable-vala-bindings"],
+		 "patches": ["telepathy-glib-builddir.patch"]},
 
 		{"src": "gnome:libgweather"},
 
@@ -620,26 +625,37 @@
 
 		{"src": "gnome:folks",
 		 "config-opts": ["--enable-eds-backend",
-		                 "VALAC=/usr/bin/valac-0.14",
-				 "VAPIGEN=/usr/bin/vapigen-0.14"],
-		 "patches": ["folks-builddir.patch"]},
+		                 "--disable-fatal-warnings"],
+		 "patches": ["folks-builddir.patch",
+		             "folks-vala-0.16.patch",
+			     "folks-config-fatal-warnings.patch"]},
 
-		{"src": "gnome:gnome-shell",
-		 "config-opts": ["--enable-compile-warnings=maximum"]},
+		{"src": "gnome:dconf",
+		 "patches": ["dconf-builddir.patch"]},
+
+		{"src": "gnome:cantarell-fonts"},
 
 		{"src": "fd:accountsservice"},
 
 		{"src": "gnome:gdm",
 		 "config-opts": ["--disable-documentation"],
-		 "patches": ["gdm-disable-documentation.patch"]},
+		 "patches": ["gdm-disable-documentation.patch",
+		             "gdm-pam-auth.patch"]},
 
-		{"src": "gnome:gnome-control-center"},
+		{"src": "fd-telepathy:telepathy-logger",
+		 "branch": "telepathy-logger-0.2.12",
+		 "patches": ["telepathy-logger-autogen.patch"]},
 
-		{"src": "gnome:dconf"},
+		{"src": "gnome:gnome-shell",
+		 "config-opts": ["--enable-compile-warnings=maximum"]},
 
-		{"src": "gnome:caribou",
-		 "config-opts": ["--disable-gtk2-module"]},
+		{"src": "gnome:libgtop"},
 
-		{"src": "gnome:cantarell-fonts"}
+		{"src": "gnome:clutter-gst"},
+
+		{"src": "gnome:gnome-control-center",
+		 "config-opts": ["--disable-cups",
+		                 "--disable-documentation"],
+		 "patches": ["g-c-c-disable-docs.patch"]}
 	]
 }
diff --git a/gnomeos/3.4/startup-notification-autogen.patch b/gnomeos/3.4/startup-notification-autogen.patch
new file mode 100644
index 0000000..9aa812d
--- /dev/null
+++ b/gnomeos/3.4/startup-notification-autogen.patch
@@ -0,0 +1,28 @@
+From 7e326e637e85af9bf9ea10e469fc88946b2b0d4e Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Fri, 20 Jan 2012 21:11:37 -0500
+Subject: [PATCH] autogen.sh: Honor NOCONFIGURE=1
+
+See http://people.gnome.org/~walters/docs/build-api.txt
+---
+ autogen.sh |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index 7c64c34..5d0f2f9 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -64,7 +64,9 @@ autoconf || echo "autoconf failed - version 2.5x is probably required"
+ 
+ cd $ORIGDIR
+ 
+-$srcdir/configure --enable-maintainer-mode "$@"
++if test -z "$NOCONFIGURE"; then
++    $srcdir/configure --enable-maintainer-mode "$@"
++fi
+ 
+ echo 
+ echo "Now type 'make' to compile $PROJECT."
+-- 
+1.7.6.5
+
diff --git a/gnomeos/3.4/telepathy-glib-0.16.patch b/gnomeos/3.4/telepathy-glib-0.16.patch
new file mode 100644
index 0000000..8607756
--- /dev/null
+++ b/gnomeos/3.4/telepathy-glib-0.16.patch
@@ -0,0 +1,22 @@
+From fa0949cfb146f4d412e035923340ea4265dac4db Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Fri, 20 Jan 2012 13:11:31 -0500
+Subject: [PATCH] Install telepathy-glib.vapi to vala-0.16 directory
+
+---
+ vala/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/vala/Makefile.am b/vala/Makefile.am
+index faefefa..2d6dbb7 100644
+--- a/vala/Makefile.am
++++ b/vala/Makefile.am
+@@ -1,4 +1,4 @@
+-vapidir = $(datarootdir)/vala/vapi
++vapidir = $(datarootdir)/vala-0.16/vapi
+ vapi_DATA = \
+ 	telepathy-glib.vapi \
+ 	$(NULL)
+-- 
+1.7.6.5
+
diff --git a/gnomeos/3.4/telepathy-glib-builddir.patch b/gnomeos/3.4/telepathy-glib-builddir.patch
new file mode 100644
index 0000000..6cccbc3
--- /dev/null
+++ b/gnomeos/3.4/telepathy-glib-builddir.patch
@@ -0,0 +1,26 @@
+From c80f8fbda32f8bd3d2535686775493de8d0f60d1 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Fri, 20 Jan 2012 15:59:01 -0500
+Subject: [PATCH] configure: Note we don't support srcdir != builddir
+
+---
+ configure.ac |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a29efdd..69cb0b2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -45,6 +45,9 @@ AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE([1.11 -Wno-portability])
+ AM_CONFIG_HEADER(config.h)
+ 
++dnl vapigen fails to locate .metadata file when srcdir != builddir
++echo \#buildapi-variable-no-builddir >/dev/null
++
+ AM_SILENT_RULES
+ 
+ dnl check for tools
+-- 
+1.7.6.5
+
diff --git a/gnomeos/3.4/telepathy-logger-autogen.patch b/gnomeos/3.4/telepathy-logger-autogen.patch
new file mode 100644
index 0000000..1420cb4
--- /dev/null
+++ b/gnomeos/3.4/telepathy-logger-autogen.patch
@@ -0,0 +1,35 @@
+From d14132c39fc1fe14d2ba50824f1ffb7f279af0db Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Fri, 20 Jan 2012 23:26:32 -0500
+Subject: [PATCH] autogen.sh: Honor NOCONFIGURE=1
+
+See http://people.gnome.org/~walters/docs/build-api.txt
+---
+ autogen.sh |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index 58ee191..f1301f1 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -23,13 +23,13 @@ run_configure=true
+ for arg in $*; do
+     case $arg in
+         --no-configure)
+-            run_configure=false
+-            ;;
++	    run_configure=false
++	    ;;
+         *)
+-            ;;
++	    ;;
+     esac
+ done
+ 
+-if test $run_configure = true; then
++if test -z "$NOCONFIGURE" && test $run_configure = true; then
+     ./configure "$@"
+ fi
+-- 
+1.7.6.5
+
diff --git a/gnomeos/3.4/vala-0.14-builddir.patch b/gnomeos/3.4/vala-0.14-builddir.patch
new file mode 100644
index 0000000..ba7f014
--- /dev/null
+++ b/gnomeos/3.4/vala-0.14-builddir.patch
@@ -0,0 +1,27 @@
+From b6f9227ed3eba3f3fbbcfc6f7c42de6c6c019a7b Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Thu, 19 Jan 2012 16:14:05 -0500
+Subject: [PATCH] build: Note we don't support srcdir != builddir
+
+Only when built from git.
+---
+ configure.ac |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e17bb22..b14aa9d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,6 +6,9 @@ AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE([1.11 dist-bzip2])
+ AM_MAINTAINER_MODE([enable])
+ 
++dnl http://people.gnome.org/~walters/docs/build-api.txt
++echo \#buildapi-variable-no-builddir >/dev/null
++
+ PACKAGE_SUFFIX=-0.14
+ AC_SUBST(PACKAGE_SUFFIX)
+ AC_DEFINE_UNQUOTED(PACKAGE_SUFFIX, "$PACKAGE_SUFFIX", [Define to the suffix of this package])
+-- 
+1.7.6.5
+
diff --git a/gnomeos/3.4/vala-builddir.patch b/gnomeos/3.4/vala-builddir.patch
new file mode 100644
index 0000000..c8d0ec2
--- /dev/null
+++ b/gnomeos/3.4/vala-builddir.patch
@@ -0,0 +1,26 @@
+From e82f2019905dbcb3402bf821cdc0fc3a305cca4c Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Thu, 19 Jan 2012 10:31:06 -0500
+Subject: [PATCH] build: Note that we don't support srcdir != builddir
+
+---
+ configure.ac |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fe30ce0..2ddd31f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,6 +6,9 @@ AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE([1.11 dist-bzip2])
+ AM_MAINTAINER_MODE([enable])
+ 
++dnl http://people.gnome.org/~walters/docs/build-api.txt
++echo \#buildapi-variable-no-builddir >/dev/null
++
+ PACKAGE_SUFFIX=-0.16
+ AC_SUBST(PACKAGE_SUFFIX)
+ AC_DEFINE_UNQUOTED(PACKAGE_SUFFIX, "$PACKAGE_SUFFIX", [Define to the suffix of this package])
+-- 
+1.7.6.5
+
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]