diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2008-03-20 16:23:30 +0000 |
|---|---|---|
| committer | Philipp Zabel <philipp.zabel@gmail.com> | 2008-03-20 16:23:30 +0000 |
| commit | d5a54170c942d3d95eebb37fdeb3adf6cf881f94 (patch) | |
| tree | b8fed2b94d6f83e9338ca43d7478aeff8c415c2c | |
| parent | 3f1c506d76ed55811c3dd03d445238dfe6fecc4a (diff) | |
| parent | 259df112c2a0cbfcf77c8af4a94e741dcdb2c2fe (diff) | |
merge of '411e1889fa68a7d9f1fbfbfd00522a1e50051dcb'
and 'c1f2a1f7dbe3e69fcd7448c9758a3a79555c74b9'
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 1 | ||||
| -rw-r--r-- | packages/gtk+/gtk+.inc | 1 | ||||
| -rw-r--r-- | packages/gtk+/gtk+_2.12.0.bb | 2 | ||||
| -rw-r--r-- | packages/gtk+/gtk+_2.12.3.bb | 2 | ||||
| -rw-r--r-- | packages/pango/files/pkgconfig_fixes.patch (renamed from packages/pango/pango-1.18.3/pkgconfig_fixes.patch) | 0 | ||||
| -rw-r--r-- | packages/pango/pango_1.8.2.bb | 3 |
6 files changed, 6 insertions, 3 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index a26c53173d..e326118a1a 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -3,5 +3,6 @@ PREFERRED_VERSION_dbus = "1.1.20" PREFERRED_VERSION_glib-2.0 = "2.16.1" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_libtool = "1.5.10" +PREFERRED_VERSION_pango = "1.18.3" PREFERRED_VERSION_pulseaudio = "0.9.9" PREFERRED_VERSION_udev = "118" diff --git a/packages/gtk+/gtk+.inc b/packages/gtk+/gtk+.inc index 23a8b9bc70..2505c344bb 100644 --- a/packages/gtk+/gtk+.inc +++ b/packages/gtk+/gtk+.inc @@ -23,6 +23,7 @@ FILES_${PN}-dev += " \ ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \ ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \ ${libdir}/gtk-2.0/${LIBV}/engines/*.la \ + ${libdir}/gtk-2.0/${LIBV}/printbackends/*.la \ ${bindir}/gdk-pixbuf-csource \ ${bindir}/gtk-builder-convert" diff --git a/packages/gtk+/gtk+_2.12.0.bb b/packages/gtk+/gtk+_2.12.0.bb index 57ba24e796..61d6a81aa3 100644 --- a/packages/gtk+/gtk+_2.12.0.bb +++ b/packages/gtk+/gtk+_2.12.0.bb @@ -1,6 +1,6 @@ require gtk+.inc -PR = "r1" +PR = "r2" DEPENDS += "cairo" diff --git a/packages/gtk+/gtk+_2.12.3.bb b/packages/gtk+/gtk+_2.12.3.bb index 689071d776..3d3bd0c8cf 100644 --- a/packages/gtk+/gtk+_2.12.3.bb +++ b/packages/gtk+/gtk+_2.12.3.bb @@ -1,6 +1,6 @@ require gtk+.inc -PR = "r0" +PR = "r1" DEPENDS += "cairo" diff --git a/packages/pango/pango-1.18.3/pkgconfig_fixes.patch b/packages/pango/files/pkgconfig_fixes.patch index f021591a91..f021591a91 100644 --- a/packages/pango/pango-1.18.3/pkgconfig_fixes.patch +++ b/packages/pango/files/pkgconfig_fixes.patch diff --git a/packages/pango/pango_1.8.2.bb b/packages/pango/pango_1.8.2.bb index c80f7326a3..477a6f27da 100644 --- a/packages/pango/pango_1.8.2.bb +++ b/packages/pango/pango_1.8.2.bb @@ -11,7 +11,8 @@ PR = "r0" FULL_OPTIMIZATION_arm = "-O2" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/pango-${PV}.tar.bz2 \ - file://no-tests.patch;patch=1" + file://no-tests.patch;patch=1 \ + file://pkgconfig_fixes.patch;patch=1" inherit autotools pkgconfig |