diff options
| -rw-r--r-- | meta/recipes-core/libxml/libxml2.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-core/libxml/libxml2_2.7.8.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+_2.12.7.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+_2.16.6.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+_2.22.1.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc index dfe6a9ad28..cf789b27ce 100644 --- a/meta/recipes-core/libxml/libxml2.inc +++ b/meta/recipes-core/libxml/libxml2.inc | |||
| @@ -34,7 +34,7 @@ export LDFLAGS += "-ldl" | |||
| 34 | python populate_packages_prepend () { | 34 | python populate_packages_prepend () { |
| 35 | # autonamer would call this libxml2-2, but we don't want that | 35 | # autonamer would call this libxml2-2, but we don't want that |
| 36 | if bb.data.getVar('DEBIAN_NAMES', d, 1): | 36 | if bb.data.getVar('DEBIAN_NAMES', d, 1): |
| 37 | bb.data.setVar('PKG_libxml2', 'libxml2', d) | 37 | bb.data.setVar('PKG_libxml2', '${MLPREFIX}libxml2', d) |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" | 40 | PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" |
diff --git a/meta/recipes-core/libxml/libxml2_2.7.8.bb b/meta/recipes-core/libxml/libxml2_2.7.8.bb index 616fd09f93..3909839d46 100644 --- a/meta/recipes-core/libxml/libxml2_2.7.8.bb +++ b/meta/recipes-core/libxml/libxml2_2.7.8.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require libxml2.inc | 1 | require libxml2.inc |
| 2 | 2 | ||
| 3 | PR = "r0" | 3 | PR = "r1" |
| 4 | 4 | ||
| 5 | SRC_URI[md5sum] = "8127a65e8c3b08856093099b52599c86" | 5 | SRC_URI[md5sum] = "8127a65e8c3b08856093099b52599c86" |
| 6 | SRC_URI[sha256sum] = "cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec" | 6 | SRC_URI[sha256sum] = "cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec" |
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb index 7de748c0b9..00c4ee8eae 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require gtk+.inc | 1 | require gtk+.inc |
| 2 | 2 | ||
| 3 | PR = "r11" | 3 | PR = "r12" |
| 4 | 4 | ||
| 5 | SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ | 5 | SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ |
| 6 | file://xsettings.patch \ | 6 | file://xsettings.patch \ |
| @@ -47,5 +47,5 @@ python populate_packages_prepend () { | |||
| 47 | do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') | 47 | do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') |
| 48 | 48 | ||
| 49 | if (bb.data.getVar('DEBIAN_NAMES', d, 1)): | 49 | if (bb.data.getVar('DEBIAN_NAMES', d, 1)): |
| 50 | bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) | 50 | bb.data.setVar('PKG_${PN}', '${MLPREFIX}libgtk-2.0', d) |
| 51 | } | 51 | } |
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb index 18f61e762b..09b917f13f 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require gtk+.inc | 1 | require gtk+.inc |
| 2 | 2 | ||
| 3 | PR = "r7" | 3 | PR = "r8" |
| 4 | 4 | ||
| 5 | SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \ | 5 | SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \ |
| 6 | file://xsettings.patch \ | 6 | file://xsettings.patch \ |
| @@ -47,5 +47,5 @@ python populate_packages_prepend () { | |||
| 47 | do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') | 47 | do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') |
| 48 | 48 | ||
| 49 | if (bb.data.getVar('DEBIAN_NAMES', d, 1)): | 49 | if (bb.data.getVar('DEBIAN_NAMES', d, 1)): |
| 50 | bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) | 50 | bb.data.setVar('PKG_${PN}', '${MLPREFIX}libgtk-2.0', d) |
| 51 | } | 51 | } |
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb index 55620d2930..ba90e0ee5f 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb | |||
| @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ | |||
| 4 | file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \ | 4 | file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \ |
| 5 | file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ | 5 | file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ |
| 6 | file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" | 6 | file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" |
| 7 | PR = "r2" | 7 | PR = "r3" |
| 8 | 8 | ||
| 9 | SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \ | 9 | SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \ |
| 10 | file://xsettings.patch \ | 10 | file://xsettings.patch \ |
| @@ -50,5 +50,5 @@ python populate_packages_prepend () { | |||
| 50 | do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') | 50 | do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') |
| 51 | 51 | ||
| 52 | if (bb.data.getVar('DEBIAN_NAMES', d, 1)): | 52 | if (bb.data.getVar('DEBIAN_NAMES', d, 1)): |
| 53 | bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) | 53 | bb.data.setVar('PKG_${PN}', '${MLPREFIX}libgtk-2.0', d) |
| 54 | } | 54 | } |
diff --git a/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb b/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb index 33c8a1e782..ac7dfb116d 100644 --- a/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb +++ b/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb | |||
| @@ -18,14 +18,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=90b90b60eb30f65fc9c2673d7cf59e24" | |||
| 18 | DEPENDS += "virtual/libx11 libxrender freetype fontconfig" | 18 | DEPENDS += "virtual/libx11 libxrender freetype fontconfig" |
| 19 | PROVIDES = "xft" | 19 | PROVIDES = "xft" |
| 20 | 20 | ||
| 21 | PR = "r1" | 21 | PR = "r2" |
| 22 | PE = "1" | 22 | PE = "1" |
| 23 | 23 | ||
| 24 | XORG_PN = "libXft" | 24 | XORG_PN = "libXft" |
| 25 | 25 | ||
| 26 | python () { | 26 | python () { |
| 27 | if bb.data.getVar('DEBIAN_NAMES', d, 1): | 27 | if bb.data.getVar('DEBIAN_NAMES', d, 1): |
| 28 | bb.data.setVar('PKG_${PN}', 'libxft2', d) | 28 | bb.data.setVar('PKG_${PN}', '${MLPREFIX}libxft2', d) |
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | FILES_${PN} = "${libdir}/lib*${SOLIBS}" | 31 | FILES_${PN} = "${libdir}/lib*${SOLIBS}" |
