From 9c186e63e71ea79609d460a03df8327b699c7dbf Mon Sep 17 00:00:00 2001 From: Daniel Narvaez Date: Fri, 23 Nov 2012 17:40:21 +0000 Subject: Add metacity We need a patch in the latest version for journal --- diff --git a/config/deps/sugar-buildtime-3.4.json b/config/deps/sugar-buildtime-3.4.json index 4f470dd..80bb4cb 100644 --- a/config/deps/sugar-buildtime-3.4.json +++ b/config/deps/sugar-buildtime-3.4.json @@ -42,5 +42,9 @@ "checker": "pkgconfig" }, { "check": "icon-naming-utils", "checker": "pkgconfig" }, + { "check": "gsettings-desktop-schemas", + "checker": "pkgconfig" }, + { "check": "libcanberra-gtk", + "checker": "pkgconfig" }, { "check": "tar", "checker": "binary" }] diff --git a/config/deps/sugar-buildtime-3.6.json b/config/deps/sugar-buildtime-3.6.json index fc8d5cd..a1a5f6b 100644 --- a/config/deps/sugar-buildtime-3.6.json +++ b/config/deps/sugar-buildtime-3.6.json @@ -46,5 +46,9 @@ "checker": "pkgconfig" }, { "check": "icon-naming-utils", "checker": "pkgconfig" }, + { "check": "gsettings-desktop-schemas", + "checker": "pkgconfig" }, + { "check": "libcanberra-gtk", + "checker": "pkgconfig" }, { "check": "tar", "checker": "binary"}] diff --git a/config/modules/system-3.4.json b/config/modules/system-3.4.json index 9bdde2a..0fd5978 100644 --- a/config/modules/system-3.4.json +++ b/config/modules/system-3.4.json @@ -33,4 +33,8 @@ "out-of-source": false }, { "name": "libxklavier", "repo": "git://anongit.freedesktop.org/libxklavier", - "branch": "libxklavier-5.3" }] + "branch": "libxklavier-5.3" }, + { "name": "metacity", + "repo": "git://git.gnome.org/metacity", + "branch": "METACITY_2_34_13", + "options": ["--disable-themes-documentation"] }] diff --git a/config/modules/system-3.6.json b/config/modules/system-3.6.json index 7815e66..41be24f 100644 --- a/config/modules/system-3.6.json +++ b/config/modules/system-3.6.json @@ -6,4 +6,9 @@ "branch": "GOBJECT_INTROSPECTION_1_34_1_1" }, { "name": "pygobject", "repo": "git://github.com/dnarvaez/pygobject.git", - "branch": "pygobject-3-4" }] + "branch": "pygobject-3-4" }, + { "name": "metacity", + "repo": "git://git.gnome.org/metacity", + "branch": "METACITY_2_34_13", + "options": ["--disable-themes-documentation"] }] + diff --git a/config/packages/deps-3.4.json b/config/packages/deps-3.4.json index d73c98a..8db174a 100644 --- a/config/packages/deps-3.4.json +++ b/config/packages/deps-3.4.json @@ -217,6 +217,12 @@ "tar": { "fedora": "tar", "ubuntu": "tar" }, + "gsettings-desktop-schemas": + { "fedora": "gsettings-desktop-schemas-devel", + "ubuntu": "gsettings-desktop-schemas-dev" }, + "libcanberra-gtk": + { "fedora": "libcanberra-devel", + "ubuntu": "libcanberra-gtk-dev" }, "xrdb": { "fedora": "xorg-x11-server-utils", "ubuntu": "x11-xserver-utils" } diff --git a/config/packages/deps-3.6.json b/config/packages/deps-3.6.json index 1d3386f..4c7ae12 100644 --- a/config/packages/deps-3.6.json +++ b/config/packages/deps-3.6.json @@ -236,6 +236,12 @@ "autodetect gstreamer": { "fedora": "gstreamer1-plugins-good", "ubuntu": "gstreamer1.0-plugins-good" }, + "gsettings-desktop-schemas": + { "fedora": "gsettings-desktop-schemas-devel", + "ubuntu": "gsettings-desktop-schemas-dev" }, + "libcanberra-gtk": + { "fedora": "libcanberra-devel", + "ubuntu": "libcanberra-gtk-dev" }, "playback gstreamer": { "fedora": "gstreamer1-plugins-base", "ubuntu": "gstreamer1.0-plugins-base" } diff --git a/devbot/build.py b/devbot/build.py index 78ad400..d6f42fb 100644 --- a/devbot/build.py +++ b/devbot/build.py @@ -82,9 +82,12 @@ def build_autotools(module): jobs = multiprocessing.cpu_count() * 2 - command.run([autogen, - "--prefix", config.install_dir, - "--libdir", config.lib_dir]) + args = [autogen, + "--prefix", config.install_dir, + "--libdir", config.lib_dir] + args.extend(module.options) + + command.run(args) command.run(["make", "-j", "%d" % jobs]) command.run(["make", "install"]) diff --git a/devbot/config.py b/devbot/config.py index 8fbb930..aabacb3 100644 --- a/devbot/config.py +++ b/devbot/config.py @@ -25,6 +25,7 @@ class Module: self.repo = info["repo"] self.branch = info.get("branch", "master") self.auto_install = info.get("auto-install", False) + self.options = info.get("options", []) if get_pref("BUILD_IN_SOURCE"): self.out_of_source = False -- cgit v0.9.1