diff options
| -rw-r--r-- | meta/recipes-graphics/pango/pango.inc | 11 | ||||
| -rw-r--r-- | meta/recipes-graphics/pango/pango_1.28.4.bb | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index ff3f5dd549..a8e99e2f6d 100644 --- a/meta/recipes-graphics/pango/pango.inc +++ b/meta/recipes-graphics/pango/pango.inc | |||
| @@ -10,13 +10,13 @@ SECTION = "libs" | |||
| 10 | LICENSE = "LGPL" | 10 | LICENSE = "LGPL" |
| 11 | 11 | ||
| 12 | X11DEPENDS = "virtual/libx11 libxft" | 12 | X11DEPENDS = "virtual/libx11 libxft" |
| 13 | DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo qemu-native ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" | 13 | DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" |
| 14 | 14 | ||
| 15 | PACKAGES_DYNAMIC = "pango-module-*" | 15 | PACKAGES_DYNAMIC = "pango-module-*" |
| 16 | 16 | ||
| 17 | RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc" | 17 | RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc" |
| 18 | 18 | ||
| 19 | inherit gnome qemu | 19 | inherit gnome |
| 20 | 20 | ||
| 21 | EXTRA_AUTORECONF = "" | 21 | EXTRA_AUTORECONF = "" |
| 22 | 22 | ||
| @@ -33,12 +33,9 @@ LIBV = "1.6.0" | |||
| 33 | 33 | ||
| 34 | postinst_prologue() { | 34 | postinst_prologue() { |
| 35 | if [ "x$D" != "x" ]; then | 35 | if [ "x$D" != "x" ]; then |
| 36 | if [ ! -f "$D${sysconfdir}/pango/pango.modules" ]; then | 36 | exit 1 |
| 37 | mkdir -p $D${sysconfdir}/pango | ||
| 38 | PSEUDO_RELOADED=YES ${@qemu_target_binary(d)} -L $D $D${bindir}/pango-querymodules > "$D${sysconfdir}/pango/pango.modules" | ||
| 39 | fi | ||
| 40 | exit 0 | ||
| 41 | fi | 37 | fi |
| 38 | |||
| 42 | } | 39 | } |
| 43 | 40 | ||
| 44 | python populate_packages_prepend () { | 41 | python populate_packages_prepend () { |
diff --git a/meta/recipes-graphics/pango/pango_1.28.4.bb b/meta/recipes-graphics/pango/pango_1.28.4.bb index 33eac217f3..68ab700c8c 100644 --- a/meta/recipes-graphics/pango/pango_1.28.4.bb +++ b/meta/recipes-graphics/pango/pango_1.28.4.bb | |||
| @@ -2,7 +2,7 @@ require pango.inc | |||
| 2 | 2 | ||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" |
| 4 | 4 | ||
| 5 | PR = "r4" | 5 | PR = "r1" |
| 6 | 6 | ||
| 7 | SRC_URI += "file://no-tests.patch" | 7 | SRC_URI += "file://no-tests.patch" |
| 8 | 8 | ||
