[oe-commits] org.oe.dev poppler: fix bug #2121

[philippe commit]

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

Author: philippe at openembedded.org
Branch: org.openembedded.dev
Revision: e3cc176fbc6f4c818a4d9e9150863a50f9c7c6ec
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e3cc176fbc6f4c818a4d9e9150863a50f9c7c6ec
Files:
1
packages/poppler/poppler.inc
packages/poppler/poppler_0.5.4.bb
Diffs:

#
# mt diff -racb47f746a187de7a43e4a48253665626adbb920 -re3cc176fbc6f4c818a4d9e9150863a50f9c7c6ec
#
# 
# 
# patch "packages/poppler/poppler.inc"
#  from [1d05bd34565da7977c70a3bf10f251465a57554f]
#    to [ecb447386fd5cd0ec22a5a76367952a9268e8ae2]
# 
# patch "packages/poppler/poppler_0.5.4.bb"
#  from [7b73955e77f54420d2adf35bfa5adb0bc6ebaf24]
#    to [d9062908e84dc810b531c5a1f607a926cbbfa6eb]
# 
============================================================
--- packages/poppler/poppler.inc	1d05bd34565da7977c70a3bf10f251465a57554f
+++ packages/poppler/poppler.inc	ecb447386fd5cd0ec22a5a76367952a9268e8ae2
@@ -1,7 +1,7 @@ LICENSE = "GPL"
 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 @@ EXTRA_OECONF = " --enable-xpdf-headers \
 
 EXTRA_OECONF = " --enable-xpdf-headers \
 		 --disable-gtk-test \
-		 --disable-poppler-qt \
+		 --disable-poppler-qt --disable-poppler-qt4 \
 		 --enable-zlib \
 	       "
 
============================================================
--- packages/poppler/poppler_0.5.4.bb	7b73955e77f54420d2adf35bfa5adb0bc6ebaf24
+++ packages/poppler/poppler_0.5.4.bb	d9062908e84dc810b531c5a1f607a926cbbfa6eb
@@ -1,2 +1,2 @@ require poppler.inc
 require poppler.inc
+PR = "r2"
-PR = "r1"