diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2013-05-29 13:27:01 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-06-20 12:27:58 +0200 |
commit | 7e1b1b392c8d372e50af3f0982aea9709cb077e7 (patch) | |
tree | 25e141362065ac7dbef9a285a6a147d728867713 /meta-oe/recipes-support | |
parent | bd58f947f6cf8b332a53abcc45503b3479b284bc (diff) | |
download | meta-openembedded-7e1b1b392c8d372e50af3f0982aea9709cb077e7.tar.gz |
poppler: update to 0.22.4
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r-- | meta-oe/recipes-support/poppler/poppler/0001-splash-Splash.cc-add-cast-to-fix-build-for-enable-fi.patch | 42 | ||||
-rw-r--r-- | meta-oe/recipes-support/poppler/poppler_0.22.4.bb (renamed from meta-oe/recipes-support/poppler/poppler_0.22.3.bb) | 7 |
2 files changed, 2 insertions, 47 deletions
diff --git a/meta-oe/recipes-support/poppler/poppler/0001-splash-Splash.cc-add-cast-to-fix-build-for-enable-fi.patch b/meta-oe/recipes-support/poppler/poppler/0001-splash-Splash.cc-add-cast-to-fix-build-for-enable-fi.patch deleted file mode 100644 index 291c7ee17..000000000 --- a/meta-oe/recipes-support/poppler/poppler/0001-splash-Splash.cc-add-cast-to-fix-build-for-enable-fi.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 8bd7428c28750f682fe3cc1a35291e5696c17638 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Sun, 12 May 2013 18:00:06 +0200 | ||
4 | Subject: [PATCH] splash/Splash.cc: add cast to fix build for | ||
5 | --enable-fixedpoint | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | | Splash.cc:1497:30: error: conversion from 'SplashCoord {aka FixedPoint}' to 'Guchar {aka unsigned char}' is ambiguous | ||
11 | | Splash.cc:1497:30: note: candidates are: | ||
12 | | In file included from SplashMath.h:27:0, | ||
13 | | from Splash.cc:44: | ||
14 | | ../goo/FixedPoint.h:45:3: note: FixedPoint::operator int() | ||
15 | | ../goo/FixedPoint.h:43:3: note: FixedPoint::operator double() | ||
16 | | ../goo/FixedPoint.h:41:3: note: FixedPoint::operator float() | ||
17 | |||
18 | Upstream-Status: Submitted [1] | ||
19 | |||
20 | [1] http://lists.freedesktop.org/archives/poppler/2013-May/010247.html | ||
21 | |||
22 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
23 | --- | ||
24 | splash/Splash.cc | 2 +- | ||
25 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
26 | |||
27 | diff --git a/splash/Splash.cc b/splash/Splash.cc | ||
28 | index cd0ec72..6630370 100644 | ||
29 | --- a/splash/Splash.cc | ||
30 | +++ b/splash/Splash.cc | ||
31 | @@ -1494,7 +1494,7 @@ inline void Splash::drawAALine(SplashPipe *pipe, int x0, int x1, int y) { | ||
32 | #endif | ||
33 | |||
34 | if (t != 0) { | ||
35 | - pipe->shape = aaGamma[t]; | ||
36 | + pipe->shape = (int)aaGamma[t]; | ||
37 | (this->*pipe->run)(pipe); | ||
38 | updateModX(x); | ||
39 | updateModY(y); | ||
40 | -- | ||
41 | 1.7.4.4 | ||
42 | |||
diff --git a/meta-oe/recipes-support/poppler/poppler_0.22.3.bb b/meta-oe/recipes-support/poppler/poppler_0.22.4.bb index c8ff8a481..f1f4561c7 100644 --- a/meta-oe/recipes-support/poppler/poppler_0.22.3.bb +++ b/meta-oe/recipes-support/poppler/poppler_0.22.4.bb | |||
@@ -2,14 +2,11 @@ DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code bas | |||
2 | LICENSE = "GPLv2" | 2 | LICENSE = "GPLv2" |
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
4 | 4 | ||
5 | PR = "r2" | ||
6 | |||
7 | SRC_URI = " \ | 5 | SRC_URI = " \ |
8 | http://poppler.freedesktop.org/${PN}-${PV}.tar.gz \ | 6 | http://poppler.freedesktop.org/${PN}-${PV}.tar.gz \ |
9 | file://0001-splash-Splash.cc-add-cast-to-fix-build-for-enable-fi.patch \ | ||
10 | " | 7 | " |
11 | SRC_URI[md5sum] = "be915388eaad6865cee5a156c8119ec1" | 8 | SRC_URI[md5sum] = "49d55921ce795778c7231fe9f2fe923b" |
12 | SRC_URI[sha256sum] = "916a931cbef951366014f13d5f4a574657ccc064ac41051df96dd58e22934431" | 9 | SRC_URI[sha256sum] = "4f438f34e63265e2da8427f3423f940ff41c26088922a9f5d976f795c1dce13b" |
13 | 10 | ||
14 | DEPENDS = "fontconfig jpeg zlib gtk+ cairo tiff lcms" | 11 | DEPENDS = "fontconfig jpeg zlib gtk+ cairo tiff lcms" |
15 | 12 | ||