[oe-commits] Martin Jansa : emacs: fix build with libpng-1.5 from oe-core

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 44eea8e0790ca6a2d19ab372aa4eb2b74dad2602
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=44eea8e0790ca6a2d19ab372aa4eb2b74dad2602

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sat Dec 22 16:34:16 2012 +0100

emacs: fix build with libpng-1.5 from oe-core

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-support/emacs/emacs.inc     |    2 +-
 meta-oe/recipes-support/emacs/emacs_23.4.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc
index b7a7b75..e2a7e97 100644
--- a/meta-oe/recipes-support/emacs/emacs.inc
+++ b/meta-oe/recipes-support/emacs/emacs.inc
@@ -109,7 +109,7 @@ do_compile_prepend() {
 		${STAGING_DIR_TARGET}/${libdir}/libjpeg.so.* \
 		${STAGING_DIR_TARGET}/${libdir}/liblzma.so.* \
 		${STAGING_DIR_TARGET}/${libdir}/libpixman-1.so.* \
-		${STAGING_DIR_TARGET}/${libdir}/libpng12.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libpng1*.so.* \
 		${STAGING_DIR_TARGET}/${libdir}/librsvg-2.so.* \
 		${STAGING_DIR_TARGET}/${libdir}/libstdc++.so.* \
 		${STAGING_DIR_TARGET}/${libdir}/libtiff.so.* \
diff --git a/meta-oe/recipes-support/emacs/emacs_23.4.bb b/meta-oe/recipes-support/emacs/emacs_23.4.bb
index 5ad5644..cb0368e 100644
--- a/meta-oe/recipes-support/emacs/emacs_23.4.bb
+++ b/meta-oe/recipes-support/emacs/emacs_23.4.bb
@@ -1,6 +1,6 @@
 require emacs.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
            file://use-qemu.patch \