From 52d201857b3fced9194ddefdc957026de2b4a255 Mon Sep 17 00:00:00 2001
From: Philippe De Swert <philippedeswert@scarlet.be>
Date: Tue, 17 Apr 2007 20:42:00 +0000
Subject: poppler: fix bug #2121 packages/poppler/poppler.inc * added extra
 --disable-qt4 and bumped PR packages/poppler/poppler_0.5.4.bb * bumping PR
 accordinly Thanks to Sergey Lapin for the patch

---
 packages/poppler/poppler.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/poppler/poppler.inc')

diff --git a/packages/poppler/poppler.inc b/packages/poppler/poppler.inc
index 14ae8220a8..c33d6f0ea1 100644
--- a/packages/poppler/poppler.inc
+++ b/packages/poppler/poppler.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
 DEPENDS = "fontconfig jpeg zlib gtk+ cairo"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
 
@@ -9,7 +9,7 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = " --enable-xpdf-headers \
 		 --disable-gtk-test \
-		 --disable-poppler-qt \
+		 --disable-poppler-qt --disable-poppler-qt4 \
 		 --enable-zlib \
 	       "
 
-- 
cgit v1.2.3


From c00723de0b20bbd6b1674442834d10bb68d78752 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 8 Jul 2007 18:46:31 +0000
Subject: poppler: add recent cvs version since 0.5.9 release doesn't build

---
 packages/poppler/poppler.inc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'packages/poppler/poppler.inc')

diff --git a/packages/poppler/poppler.inc b/packages/poppler/poppler.inc
index c33d6f0ea1..e01057cb4e 100644
--- a/packages/poppler/poppler.inc
+++ b/packages/poppler/poppler.inc
@@ -1,23 +1,23 @@
 DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
 DEPENDS = "fontconfig jpeg zlib gtk+ cairo"
 LICENSE = "GPL"
-PR = "r1"
 
 SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = " --enable-xpdf-headers \
-		 --disable-gtk-test \
-		 --disable-poppler-qt --disable-poppler-qt4 \
-		 --enable-zlib \
-	       "
+EXTRA_OECONF = "\
+  --enable-xpdf-headers \
+  --disable-gtk-test \
+  --disable-poppler-qt \
+  --disable-poppler-qt4 \
+  --enable-zlib \
+"
 
-#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
+# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
 require poppler-fpu.inc
 EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}"
 
-
 do_stage() {
 	autotools_stage_all
 }
-- 
cgit v1.2.3