diff options
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch | 23 | ||||
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb | 1 |
2 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch new file mode 100644 index 0000000000..2e7d5afe8f --- /dev/null +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch @@ -0,0 +1,23 @@ +We now have libpng 1.6. If we build libpng12 as well as libpng 1.6, the 1.2 version gets +preferred which is not desirable and does not give deterministic builds. + +We really do want to use libpng since the item in DEPENDS will provide this so +manipulate the search list so the one we DEPEND on gets chosen. + +RP 2013/4/13 + +Upstream-Status: Pending [worth discussing at least] + +Index: gdk-pixbuf-2.26.5/configure.ac +=================================================================== +--- gdk-pixbuf-2.26.5.orig/configure.ac 2013-03-26 15:45:16.594820303 +0000 ++++ gdk-pixbuf-2.26.5/configure.ac 2013-04-13 10:15:19.241433789 +0000 +@@ -588,7 +588,7 @@ + + dnl Test for libpng + if test x$with_libpng != xno && test -z "$LIBPNG"; then +- for l in libpng15 libpng14 libpng12 libpng13 libpng10 libpng ; do ++ for l in libpng libpng15 libpng14 libpng12 libpng13 libpng10 ; do + AC_MSG_CHECKING(for $l) + if $PKG_CONFIG --exists $l ; then + AC_MSG_RESULT(yes) diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb index cc2ea50e57..b35f7c666a 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb @@ -15,6 +15,7 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.26/gdk-pixbuf-${ file://hardcoded_libtool.patch \ file://configure_fix.patch \ file://extending-libinstall-dependencies.patch \ + file://pngversion.patch \ " SRC_URI[md5sum] = "339329e6d619ee3e1cb93979111b04c0" |