From efe02ada3602d032629c26431173d5801c9e5af3 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 14 Dec 2012 13:44:20 +0200 Subject: [PATCH] gdk-pixbuf: update to upstream version 2.26.5 Signed-off-by: Marko Lindqvist Signed-off-by: Saul Wold --- .../gdk-pixbuf-2.24.1/configure_nm.patch | 21 ------------------- .../configure_fix.patch | 0 .../extending-libinstall-dependencies.patch | 0 .../hardcoded_libtool.patch | 0 ...-pixbuf_2.24.1.bb => gdk-pixbuf_2.26.5.bb} | 10 ++++----- 5 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.1/configure_nm.patch rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf-2.24.1 => gdk-pixbuf-2.26.5}/configure_fix.patch (100%) rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf-2.24.1 => gdk-pixbuf-2.26.5}/extending-libinstall-dependencies.patch (100%) rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf-2.24.1 => gdk-pixbuf-2.26.5}/hardcoded_libtool.patch (100%) rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.24.1.bb => gdk-pixbuf_2.26.5.bb} (95%) diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.1/configure_nm.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.1/configure_nm.patch deleted file mode 100644 index 54f7c3ad0d..0000000000 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.1/configure_nm.patch +++ /dev/null @@ -1,21 +0,0 @@ -Pick up ${NM} from the environment. - -Upstream-Status: Pending -https://bugzilla.gnome.org/show_bug.cgi?id=671516 - -Signed-off-by: James Limbouris - -Index: gdk-pixbuf-2.24.0/configure.ac -=================================================================== -diff -uNr gdk-pixbuf-2.24.0/configure.ac gdk-pixbuf-2.24.0.mod/configure.ac ---- gdk-pixbuf-2.24.0/configure.ac 2011-08-27 11:27:52.000000000 +0800 -+++ gdk-pixbuf-2.24.0.mod/configure.ac 2012-02-28 14:48:36.481126410 +0800 -@@ -147,7 +147,7 @@ - AC_SYS_LARGEFILE - - AM_PROG_AS --AC_PATH_PROG(NM, nm, nm) -+AC_CHECK_TOOLS(NM, [$NM nm], nm) - - AC_MSG_CHECKING([for some Win32 platform]) - AS_CASE(["$host"], diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.1/configure_fix.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/configure_fix.patch similarity index 100% rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.1/configure_fix.patch rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/configure_fix.patch diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.1/extending-libinstall-dependencies.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/extending-libinstall-dependencies.patch similarity index 100% rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.1/extending-libinstall-dependencies.patch rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/extending-libinstall-dependencies.patch diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.1/hardcoded_libtool.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/hardcoded_libtool.patch similarity index 100% rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.1/hardcoded_libtool.patch rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/hardcoded_libtool.patch diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb similarity index 95% rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb index 33a43becaa..5a9cd9b585 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb @@ -11,17 +11,16 @@ SECTION = "libs" DEPENDS = "libpng glib-2.0 jpeg" DEPENDS_append_linuxstdbase = " virtual/libx11" -SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${PV}.tar.xz \ - file://configure_nm.patch \ +SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.26/gdk-pixbuf-${PV}.tar.xz \ file://hardcoded_libtool.patch \ file://configure_fix.patch \ file://extending-libinstall-dependencies.patch \ " -SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412" -SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1" +SRC_URI[md5sum] = "339329e6d619ee3e1cb93979111b04c0" +SRC_URI[sha256sum] = "77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84" -PR = "r7" +PR = "r0" inherit autotools pkgconfig gettext @@ -43,6 +42,7 @@ FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}" ALLOW_EMPTY_${PN}-xlib = "1" FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ + ${bindir}/gdk-pixbuf-pixdata \ ${libdir}/lib*.so.*" FILES_${PN}-dev += " \ -- 2.40.1