4 files changed, 27 insertions, 16 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 99bc7bae3b..872e6720dc 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -13306,9 +13306,9 @@ sha256=dd170431235cc419cbe6c40362640927a78dc93e082623709abe1310fe804481
 md5=e1f1af8c2add8310d0bbcddc9af523b8
 sha256=dd170431235cc419cbe6c40362640927a78dc93e082623709abe1310fe804481
 
-[http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M3-200711012000/swt-3.4M3-gtk-linux-x86.zip]
-md5=9473375f7615814025a5b66ee6a8400d
-sha256=b9eaecd9edc58291c5b2c0d8de6a1ce0677b442d63edccd52dd3080da0bc55dc
+[http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/swt-3.4-gtk-linux-x86.zip]
+md5=b6bf01aa408377f2fe5f617a4dea1876
+sha256=c913105c740fe9cbbf7ab49f663acf5640b812995c2f9c716294f6b44a3185c4
 
 [http://sylpheed.good-day.net/sylpheed/v2.2/sylpheed-2.2.9.tar.bz2]
 md5=45e9e89775613b0afb732fbc11c73d26
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index b9d882d5d6..ff6aa1f6a3 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -185,7 +185,7 @@ PREFERRED_PROVIDER_classpath = "classpath"
 PREFERRED_VERSION_classpath = "0.97.2"
 
 PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
-PREFERRED_VERSION_swt3.4-gtk-hildon = "3.3+3.4M5"
+PREFERRED_VERSION_swt3.4-gtk-hildon = "3.4"
 
 # Does not compile with the CodeSourcery compiler .. :(
 #PREFERRED_VERSION_kaffe = "1.1.8+cvs20080120"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7ccbd3248e..72a7c625c8 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -43,13 +43,14 @@ SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
-SRCREV_pn-frameworkd ?= "86a660108f988f5611cc796d33911cca8836004e"
+SRCREV_pn-frameworkd ?= "5a292ced8330ace191d66fc1b655e921fa442fdf"
 SRCREV_pn-fso-gpsd ?= "fd1cd578d6ba9fa13aadceb59a9b46345108583b"
 SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
-SRCREV_pn-gnuradio ?= "6377"
+SRCREV_pn-gnuradio ?= "9721"
 SRCREV_pn-gpe-contacts ?= "9312"
+SRCREV_pn-gpe-sketchbook ?= "9547"
 SRCREV_pn-gsm0710muxd ?= "3ff86b129640b647ccba3d86eb243d864671b039"
 SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
 SRCREV_pn-gtkhtml2 ?= "1158"
@@ -80,8 +81,8 @@ SRCREV_pn-lightmediascanner ?= "68"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1066"
-SRCREV_pn-linux-openmoko ?= "968c41d0c32099d78927849a71e2ef3143cc05e7"
-SRCREV_pn-linux-openmoko-devel ?= "e20ce2bd6fc6e711eed58a580ae117cb574abe96"
+SRCREV_pn-linux-openmoko ?= "a2ef813d2f439a3e9f377d33a2e5baad098afb7e"
+SRCREV_pn-linux-openmoko-devel ?= "04f54c7001fb609e11ff4b2b4575c04188dbefef"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "118"
@@ -90,8 +91,8 @@ SRCREV_pn-matchbox-keyboard ?= "1910"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
-SRCREV_pn-mickeydbus ?= "d1f32060474767582dd4248d5e5c2adc63931d5a"
-SRCREV_pn-mickeyterm ?= "d1f32060474767582dd4248d5e5c2adc63931d5a"
+SRCREV_pn-mickeydbus ?= "19de58bbe1c80a547be35f86d315ac78a75cea2a"
+SRCREV_pn-mickeyterm ?= "19de58bbe1c80a547be35f86d315ac78a75cea2a"
 SRCREV_pn-moko-gtk-engine ?= "3612"
 SRCREV_pn-mpd-alsa ?= "6952"
 SRCREV_pn-mplayer ?= "27659"
@@ -178,7 +179,7 @@ SRCREV_pn-sphyrna-python ?= "45"
 SRCREV_pn-starling ?= "9574"
 SRCREV_pn-tichy ?= "168"
 SRCREV_pn-tmut ?= "60"
-SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
+SRCREV_pn-u-boot-openmoko ?= "414367bf5b65942947dd5d569c27d2a8e8e5e562"
 SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
@@ -190,12 +191,12 @@ SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-xoo ?= "1971"
 SRCREV_pn-xserver-kdrive-glamo ?= "4067470ea4d569bae7b4161ca998645a0c9b96e7"
-SRCREV_pn-zhone ?= "11392b1d2ee3a0622dc324e1805699e4301249c4"
+SRCREV_pn-zhone ?= "2cccdc592d10c15509d974dfbba493e95a776530"
 
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "36204"
+EFL_SRCREV ?= "36540"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eet-native ?= "${EFL_SRCREV}"
@@ -239,8 +240,7 @@ SRCREV_pn-python-etk ?= "${EFL_SRCREV}"
 
 # Enlightenment Applications
 SRCREV_pn-edje-editor ?= "${EFL_SRCREV}"
-#SRCREV_pn-edje-player ?= "${EFL_SRCREV}"
-SRCREV_pn-edje-player ?= "36296"
+SRCREV_pn-edje-player ?= "${EFL_SRCREV}"
 SRCREV_pn-edje-viewer ?= "${EFL_SRCREV}"
 SRCREV_pn-emphasis ?= "${EFL_SRCREV}"
 SRCREV_pn-ephoto ?= "${EFL_SRCREV}"
@@ -254,6 +254,12 @@ SRCREV_pn-e-utils ?= "${EFL_SRCREV}"
 SRCREV_pn-e-wm ?= "${EFL_SRCREV}"
 SRCREV_pn-enna ?= "${EFL_SRCREV}"
 SRCREV_pn-exquisite ?= "${EFL_SRCREV}"
+SRCREV_pn-exquisite-theme-illume ?= "${EFL_SRCREV}"
 SRCREV_pn-rage ?= "${EFL_SRCREV}"
-
 SRCREV_pn-illume ?= "${EFL_SRCREV}"
+SRCREV_pn-illume-theme-illume ?= "${EFL_SRCREV}"
+
+# Enlightenment ST
+SRCREV_pn-alarm ?= "${EFL_SRCREV}"
+SRCREV_pn-waker ?= "${EFL_SRCREV}"
+SRCREV_pn-elementary ?= "${EFL_SRCREV}"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 4df461910c..71d5fd7b3c 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -152,6 +152,11 @@ IGNORE_STRIP_ERRORS = ""
 
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.20"
 
+# New pango and older glib-2.0 versions don't mix,
+# so specify exactly what we would like to build.
+PREFERRED_VERSION_pango    ?= 1.20.5
+PREFERRED_VERSION_glib-2.0 ?= 2.16.1
+
 # we don't ship gtk-directfb by default
 PREFERRED_PROVIDER_gtk+                   ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-ani  ?= "gtk+"