diff options
| author |   Ross Burton <ross.burton@intel.com> | 2013-05-23 14:40:59 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-04 15:53:46 +0100 |
| commit | 30b32addd189e7acce73965c9176227d5f392ab9 (patch) | |
| tree | b96c0bfd2630e73566f8817dd0842fbf6f0ddba0 /meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch | |
| parent | 46159f632513de1f14d03e425799a0c193532298 (diff) | |
| download | openembedded-core-contrib-30b32addd189e7acce73965c9176227d5f392ab9.tar.gz | |
gdk-pixbuf: upgrade to 2.28.1
Something along the lines of pngversion.patch was merged upstream, so drop that
patch.
Also use the new trim_version() function for a future-proof SRC_URI.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch')
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch | 23 |
1 files changed, 0 insertions, 23 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 deleted file mode 100644 index 2e7d5afe8f..0000000000 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch +++ /dev/null @@ -1,23 +0,0 @@ -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) |