Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rwxr-xr-xscripts/check-system4
m---------scripts/jhbuild0
-rw-r--r--scripts/sugar.modules4
-rw-r--r--scripts/system.modules27
5 files changed, 33 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 0ad7a6e..25e0417 100644
--- a/Makefile
+++ b/Makefile
@@ -73,6 +73,8 @@ clean:
rm -rf source/sugar-base
rm -rf source/sugar-toolkit-gtk3
rm -rf source/sugar-fructose
+ rm -rf source/at-spi2-core
+ rm -rf source/at-spi2-atk
rm -rf source/gstreamer
rm -rf source/gst-plugins-base
rm -rf source/gst-plugins-good
diff --git a/scripts/check-system b/scripts/check-system
index e309bc3..e7df307 100755
--- a/scripts/check-system
+++ b/scripts/check-system
@@ -270,6 +270,10 @@ checks = \
"checker": "binary",
"packages": { "fedora": "flex",
"ubuntu": "flex" } },
+ { "check": "xtst",
+ "checker": "pkgconfig",
+ "packages": { "fedora": "libXtst-devel",
+ "ubuntu": "libxtst-dev" } },
{ "check": "bison",
"checker": "binary",
"packages": { "fedora": "bison",
diff --git a/scripts/jhbuild b/scripts/jhbuild
-Subproject 9c80d873c17de8564e75fd980a3d455b314fde2
+Subproject d2e266da3d9b0437964ac59d4253480f7990fca
diff --git a/scripts/sugar.modules b/scripts/sugar.modules
index 9ed46e4..3b6dd68 100644
--- a/scripts/sugar.modules
+++ b/scripts/sugar.modules
@@ -13,13 +13,13 @@
</dependencies>
</autotools>
<autotools id="sugar-toolkit-gtk3" supports-non-srcdir-builds="no">
- <branch module="sugar-toolkit-gtk3/sugar-toolkit-gtk3.git" checkoutdir="sugar-toolkit-gtk3"/>
+ <branch module="~manuq/sugar-toolkit-gtk3/manuqs-sugar-toolkit-gtk3.git" checkoutdir="sugar-toolkit-gtk3"/>
<dependencies>
<dep package="sugar-datastore"/>
</dependencies>
</autotools>
<autotools id="sugar" supports-non-srcdir-builds="no">
- <branch module="sugar/mainline.git" checkoutdir="sugar"/>
+ <branch module="~manuq/sugar/manuqs-erikos-shell-port.git" checkoutdir="sugar"/>
<dependencies>
<dep package="sugar-base"/>
<dep package="sugar-toolkit"/>
diff --git a/scripts/system.modules b/scripts/system.modules
index 8963099..eea3521 100644
--- a/scripts/system.modules
+++ b/scripts/system.modules
@@ -4,9 +4,31 @@
<repository type="git" name="git.gnome.org" href="git://git.gnome.org"/>
<repository type="git" name="github.com/dnarvaez" href="git://github.com/dnarvaez"/>
<repository type="git" name="gstreamer.freedesktop.org" href="git://anongit.freedesktop.org/gstreamer/"/>
-
+ <autotools id="gtk+">
+ <branch repo="git.gnome.org"/>
+ <dependencies>
+ <dep package="atk"/>
+ </dependencies>
+ </autotools>
+ <autotools id="atk">
+ <branch repo="git.gnome.org"/>
+ <dependencies>
+ <dep package="at-spi2-atk"/>
+ </dependencies>
+ </autotools>
+ <autotools id="at-spi2-atk" supports-non-srcdir-builds="no">
+ <branch repo="git.gnome.org"/>
+ <dependencies>
+ <dep package="at-spi2-core"/>
+ </dependencies>
+ </autotools>
+ <autotools id="at-spi2-core" supports-non-srcdir-builds="no">
+ <branch repo="git.gnome.org"/>
+ <dependencies>
+ </dependencies>
+ </autotools>
<autotools id="pygobject">
- <branch repo="git.gnome.org" revision="4df676e10a5ea595a0d491af10268f557dd722d7"/>
+ <branch repo="git.gnome.org"/>
<dependencies>
<dep package="glib"/>
<dep package="gobject-introspection"/>
@@ -40,6 +62,7 @@
<metamodule id="meta-system">
<dependencies>
<dep package="pygobject"/>
+ <dep package="gtk+"/>
<dep package="gst-plugins-good"/>
</dependencies>
</metamodule>