From: Philippe De Swert <philippedeswert@gmail.com>
Date: Mon, 28 Mar 2011 18:33:26 +0000 (+0300)
Subject: poppler 0.12.3: remove `DEFAULT_PREFERENCE = "-1"`
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb63320bc4c955c51619d73cfc622001d602911a;p=openembedded.git

poppler 0.12.3: remove `DEFAULT_PREFERENCE = "-1"`

Version 0.12.3 has been used in Ȧngström, minimal-{,uclibc} and SHR for over six months.

Signed-off-by: Philippe De Swert <philippedeswert@gmail.com>
Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
---

diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index ce4ea829dc..35a4ecd23b 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -38,9 +38,6 @@ PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}"
 
 PREFERRED_VERSION_tslib = "1.0+git%"
 
-# epdf needs > 0.12, but recipes have D_P = -1
-PREFERRED_VERSION_poppler = "0.12.3"
-
 # git version fails to build
 PREFERRED_VERSION_mupdf = "0.6"
 
diff --git a/recipes/poppler/poppler_0.12.3.bb b/recipes/poppler/poppler_0.12.3.bb
index 8b9fccae61..ce1952e1ed 100644
--- a/recipes/poppler/poppler_0.12.3.bb
+++ b/recipes/poppler/poppler_0.12.3.bb
@@ -2,11 +2,6 @@ require poppler.inc
 
 DEPENDS += "lcms"
 
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_angstrom = "1"
-DEFAULT_PREFERENCE_minimal = "1"
-DEFAULT_PREFERENCE_minimal-uclibc = "1"
-
 EXTRA_OECONF_append = " --disable-abiword-output "
 
 RDEPENDS_${PN} = "poppler-data"