summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2012-12-14 13:44:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-19 17:54:54 +0000
commit062604e9df5415887baee21ba82367fad52b5029 (patch)
treeedc7fa2f640b17df567b91e6e8e248e70a3f21a6 /meta/recipes-gnome
parent606561953a5fafa735ffe34311dc490f6ee9c554 (diff)
downloadpoky-062604e9df5415887baee21ba82367fad52b5029.tar.gz
gdk-pixbuf: update to upstream version 2.26.5
(From OE-Core rev: efe02ada3602d032629c26431173d5801c9e5af3) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.1/configure_nm.patch21
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/configure_fix.patch (renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.1/configure_fix.patch)0
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/extending-libinstall-dependencies.patch (renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.1/extending-libinstall-dependencies.patch)0
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/hardcoded_libtool.patch (renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.1/hardcoded_libtool.patch)0
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb (renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb)10
5 files changed, 5 insertions, 26 deletions
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 @@
1Pick up ${NM} from the environment.
2
3Upstream-Status: Pending
4https://bugzilla.gnome.org/show_bug.cgi?id=671516
5
6Signed-off-by: James Limbouris <james@digitalmatter.com.au>
7
8Index: gdk-pixbuf-2.24.0/configure.ac
9===================================================================
10diff -uNr gdk-pixbuf-2.24.0/configure.ac gdk-pixbuf-2.24.0.mod/configure.ac
11--- gdk-pixbuf-2.24.0/configure.ac 2011-08-27 11:27:52.000000000 +0800
12+++ gdk-pixbuf-2.24.0.mod/configure.ac 2012-02-28 14:48:36.481126410 +0800
13@@ -147,7 +147,7 @@
14 AC_SYS_LARGEFILE
15
16 AM_PROG_AS
17-AC_PATH_PROG(NM, nm, nm)
18+AC_CHECK_TOOLS(NM, [$NM nm], nm)
19
20 AC_MSG_CHECKING([for some Win32 platform])
21 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
index b141690387..b141690387 100644
--- 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
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
index edbdced43a..edbdced43a 100644
--- 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
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
index ecca62a712..ecca62a712 100644
--- 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
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
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"
11DEPENDS = "libpng glib-2.0 jpeg" 11DEPENDS = "libpng glib-2.0 jpeg"
12DEPENDS_append_linuxstdbase = " virtual/libx11" 12DEPENDS_append_linuxstdbase = " virtual/libx11"
13 13
14SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${PV}.tar.xz \ 14SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.26/gdk-pixbuf-${PV}.tar.xz \
15 file://configure_nm.patch \
16 file://hardcoded_libtool.patch \ 15 file://hardcoded_libtool.patch \
17 file://configure_fix.patch \ 16 file://configure_fix.patch \
18 file://extending-libinstall-dependencies.patch \ 17 file://extending-libinstall-dependencies.patch \
19 " 18 "
20 19
21SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412" 20SRC_URI[md5sum] = "339329e6d619ee3e1cb93979111b04c0"
22SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1" 21SRC_URI[sha256sum] = "77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84"
23 22
24PR = "r7" 23PR = "r0"
25 24
26inherit autotools pkgconfig gettext 25inherit autotools pkgconfig gettext
27 26
@@ -43,6 +42,7 @@ FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}"
43ALLOW_EMPTY_${PN}-xlib = "1" 42ALLOW_EMPTY_${PN}-xlib = "1"
44 43
45FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ 44FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
45 ${bindir}/gdk-pixbuf-pixdata \
46 ${libdir}/lib*.so.*" 46 ${libdir}/lib*.so.*"
47 47
48FILES_${PN}-dev += " \ 48FILES_${PN}-dev += " \