diff options
| author | Phil Blundell <philb@gnu.org> | 2008-10-27 13:20:12 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2008-10-27 13:20:12 +0000 |
| commit | 8c5d1369cd19f7e6132746d1495c8367a81cb512 (patch) | |
| tree | eff7c3c6f5ca176457189c7ff742b9696b1ebe03 | |
| parent | 468cefb618f191a1d7a2ef778955553996a4afb5 (diff) | |
| parent | 95b53f12c51274c1f52ae23425cc0f7dccfbbdaf (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | conf/machine/qemuarm.conf | 1 | ||||
| -rw-r--r-- | packages/gtk+/gtk+.inc | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf index 4306a6b22d..de76527167 100644 --- a/conf/machine/qemuarm.conf +++ b/conf/machine/qemuarm.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te" require conf/machine/include/qemu.inc require conf/machine/include/tune-arm926ejs.inc diff --git a/packages/gtk+/gtk+.inc b/packages/gtk+/gtk+.inc index 1a687c1fe9..0e7dcf7299 100644 --- a/packages/gtk+/gtk+.inc +++ b/packages/gtk+/gtk+.inc @@ -4,7 +4,8 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" LICENSE = "LGPL" PRIORITY = "optional" -DEPENDS = "glib-2.0 tiff pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cups" +DEPENDS = "glib-2.0 tiff pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cups \ + libxrandr libxdamage libxrender libxcomposite" inherit autotools pkgconfig |