7 files changed, 40 insertions, 5 deletions
diff --git a/packages/poppler/poppler-data_0.1.bb b/packages/poppler/poppler-data_0.1.bb
index ca22e4dba0..e145cb07ee 100644
--- a/packages/poppler/poppler-data_0.1.bb
+++ b/packages/poppler/poppler-data_0.1.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
 LICENSE = "Adobe"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
 
diff --git a/packages/poppler/poppler.inc b/packages/poppler/poppler.inc
index e01057cb4e..0e9b61cd30 100644
--- a/packages/poppler/poppler.inc
+++ b/packages/poppler/poppler.inc
@@ -21,3 +21,8 @@ EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}"
 do_stage() {
 	autotools_stage_all
 }
+
+PACKAGES =+ "libpoppler libpoppler-glib"
+FILES_libpoppler = "${libdir}/libpoppler.so.*"
+FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*"
+
diff --git a/packages/poppler/poppler/.mtn2git_empty b/packages/poppler/poppler/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/poppler/poppler/.mtn2git_empty
diff --git a/packages/poppler/poppler/fix-splash.patch b/packages/poppler/poppler/fix-splash.patch
new file mode 100644
index 0000000000..001c4ce301
--- /dev/null
+++ b/packages/poppler/poppler/fix-splash.patch
@@ -0,0 +1,28 @@
+--- poppler/splash/SplashMath.h	2007/04/25 19:59:10	1.3
++++ poppler/splash/SplashMath.h	2007/06/01 18:34:48	1.4
+@@ -8,7 +8,7 @@
+ #define SPLASHMATH_H
+ 
+ #if USE_FIXEDPOINT
+-#include "FixedPoint.h"
++#include "goo/FixedPoint.h"
+ #else
+ #include <math.h>
+ #endif
+--- poppler/splash/SplashFTFont.cc	2007/04/25 19:59:10	1.8
++++ poppler/splash/SplashFTFont.cc	2007/06/01 18:34:48	1.9
+@@ -127,10 +127,10 @@
+   matrix.yx = (FT_Fixed)((mat[1] / size).getRaw());
+   matrix.xy = (FT_Fixed)((mat[2] / size).getRaw());
+   matrix.yy = (FT_Fixed)((mat[3] / size).getRaw());
+-  textMatrix.xx = (FT_Fixed)((textMat[0] / (size * textScale)).getRaw());
+-  textMatrix.yx = (FT_Fixed)((textMat[1] / (size * textScale)).getRaw());
+-  textMatrix.xy = (FT_Fixed)((textMat[2] / (size * textScale)).getRaw());
+-  textMatrix.yy = (FT_Fixed)((textMat[3] / (size * textScale)).getRaw());
++  textMatrix.xx = (FT_Fixed)((textMat[0] / (textScale * size)).getRaw());
++  textMatrix.yx = (FT_Fixed)((textMat[1] / (textScale * size)).getRaw());
++  textMatrix.xy = (FT_Fixed)((textMat[2] / (textScale * size)).getRaw());
++  textMatrix.yy = (FT_Fixed)((textMat[3] / (textScale * size)).getRaw());
+ #else
+   matrix.xx = (FT_Fixed)((mat[0] / size) * 65536);
+   matrix.yx = (FT_Fixed)((mat[1] / size) * 65536);
diff --git a/packages/poppler/poppler0.6_cvs.bb b/packages/poppler/poppler0.6_cvs.bb
index ca4b8d6a03..15f94a775a 100644
--- a/packages/poppler/poppler0.6_cvs.bb
+++ b/packages/poppler/poppler0.6_cvs.bb
@@ -1,6 +1,6 @@
 require poppler.inc
 PV = "0.5.9+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/poppler;module=poppler"
 S = "${WORKDIR}/poppler"
diff --git a/packages/poppler/poppler_0.5.4.bb b/packages/poppler/poppler_0.5.4.bb
index 92c25bc0ac..754eccf435 100644
--- a/packages/poppler/poppler_0.5.4.bb
+++ b/packages/poppler/poppler_0.5.4.bb
@@ -1,2 +1,2 @@
 require poppler.inc
-PR = "r2"
+PR = "r3"
diff --git a/packages/poppler/poppler_0.5.9.bb b/packages/poppler/poppler_0.5.9.bb
index 347d9ae303..2fc2200afc 100644
--- a/packages/poppler/poppler_0.5.9.bb
+++ b/packages/poppler/poppler_0.5.9.bb
@@ -1,5 +1,7 @@
 require poppler.inc
 
-# does not build, use cvs for now and eventually try to bump to 0.6.0 (or 1.0)
-DEFAULT_PREFERENCE = "-1"
+PR = "r1"
+
+SRC_URI += "file://fix-splash.patch;patch=1"
+EXTRA_OECONF_append = " --disable-abiword-output "