diff options
| author | Mike Westerhof <mwester@dls.net> | 2008-10-07 14:10:25 +0000 |
|---|---|---|
| committer | Mike Westerhof <mwester@dls.net> | 2008-10-07 14:10:25 +0000 |
| commit | 955f442cc19016e8c01591bf79503812f0b66549 (patch) | |
| tree | 02a69fe119e864340cb23eafcbd4979cbf513169 /conf | |
| parent | 8e7b12439e33c351d8f5744898018509fd37cfe5 (diff) | |
| parent | 7db59217ec8f6b541ffc22516e3dd4a14b8759d1 (diff) | |
merge of '7d34cad8c1cc77f4e891350dd5960331ff47128c'
and 'f8b5444079bbbbe46a1effb15957cc79e8753dca'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 7ccbd3248e..16753863b5 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -48,7 +48,7 @@ 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-gsm0710muxd ?= "3ff86b129640b647ccba3d86eb243d864671b039" SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" 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+" |