diff options
Diffstat (limited to 'meta-gnome/recipes-gnome/evince/evince')
-rw-r--r-- | meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch | 33 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch | 25 |
2 files changed, 58 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch b/meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch new file mode 100644 index 000000000..ebc8976b3 --- /dev/null +++ b/meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 00b5e55c90477eeac02bec58f032cb6916a1eb5c Mon Sep 17 00:00:00 2001 | ||
2 | From: Hib Eris <hib@hiberis.nl> | ||
3 | Date: Mon, 20 Feb 2012 21:36:16 +0100 | ||
4 | Subject: [PATCH] tiff: fix compile warning | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | |||
11 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
12 | --- | ||
13 | backend/tiff/tiff2ps.c | 4 ++-- | ||
14 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/backend/tiff/tiff2ps.c b/backend/tiff/tiff2ps.c | ||
17 | index c0dc0bf..fc63c2e 100644 | ||
18 | --- a/backend/tiff/tiff2ps.c | ||
19 | +++ b/backend/tiff/tiff2ps.c | ||
20 | @@ -1127,8 +1127,8 @@ PS_Lvl2page(TIFF2PSContext* ctx, TIFF* tif, uint32 w, uint32 h) | ||
21 | } | ||
22 | buf_data = (unsigned char *)_TIFFmalloc(chunk_size); | ||
23 | if (!buf_data) { | ||
24 | - TIFFError(ctx->filename, "Can't alloc %u bytes for %s.", | ||
25 | - chunk_size, tiled_image ? "tiles" : "strips"); | ||
26 | + TIFFError(ctx->filename, "Can't alloc %u bytes for %s.", | ||
27 | + (uint) chunk_size, tiled_image ? "tiles" : "strips"); | ||
28 | return(FALSE); | ||
29 | } | ||
30 | |||
31 | -- | ||
32 | 1.7.6.5 | ||
33 | |||
diff --git a/meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch b/meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch new file mode 100644 index 000000000..6f5420a52 --- /dev/null +++ b/meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Index: evince-2.30.0/gnome-doc-utils.make | ||
2 | =================================================================== | ||
3 | --- evince-2.30.0.orig/gnome-doc-utils.make 2010-03-29 11:52:47.000000000 -0700 | ||
4 | +++ evince-2.30.0/gnome-doc-utils.make 2010-08-17 15:20:22.597646001 -0700 | ||
5 | @@ -132,13 +132,12 @@ _DOC_ABS_SRCDIR = @abs_srcdir@ | ||
6 | |||
7 | _xml2po ?= `which xml2po` | ||
8 | _xml2po_mode = $(if $(DOC_ID),mallard,docbook) | ||
9 | - | ||
10 | -_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` | ||
11 | -_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` | ||
12 | -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` | ||
13 | -_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl | ||
14 | -_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl | ||
15 | -_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl | ||
16 | +_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` | ||
17 | +_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` | ||
18 | +_malrng ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils` | ||
19 | +_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl | ||
20 | +_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl | ||
21 | +_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl | ||
22 | |||
23 | if ENABLE_SK | ||
24 | _ENABLE_SK = true | ||
25 | |||