Fix build against poppler-0.16 with PLD linux patch (bug #349921).

(Portage version: 2.1.9.35/cvs/Linux x86_64)

3 files changed, 40 insertions, 5 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index a59491a333aa..d88ad25f6ed8 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/tracker
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.92 2011/01/23 23:06:19 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.93 2011/01/28 12:08:28 pacho Exp $
+
+  28 Jan 2011; Pacho Ramos <pacho@gentoo.org> tracker-0.8.17.ebuild,
+  +files/tracker-0.8.17-poppler-0.16.patch:
+  Fix build against poppler-0.16 with PLD linux patch (bug #349921).
 
 *tracker-0.9.35 (23 Jan 2011)
 
diff --git a/app-misc/tracker/files/tracker-0.8.17-poppler-0.16.patch b/app-misc/tracker/files/tracker-0.8.17-poppler-0.16.patch
new file mode 100644
index 000000000000..224775642bf4
--- /dev/null
+++ b/app-misc/tracker/files/tracker-0.8.17-poppler-0.16.patch
@@ -0,0 +1,28 @@
+--- tracker-0.8.17/configure.ac~	2010-09-02 16:26:20.000000000 +0200
++++ tracker-0.8.17/configure.ac	2010-12-29 11:51:10.848878668 +0100
+@@ -1150,6 +1150,11 @@
+ 	      [enable_poppler_glib=auto])
+ 
+ if test "x$enable_poppler_glib" != "xno" ; then
++   PKG_CHECK_EXISTS([poppler-glib >= 0.16], [have_poppler_0_16_0=yes])
++   if test "x$have_poppler_0_16_0" = "xyes"; then
++	   AC_DEFINE([HAVE_POPPLER_0_16_0], [1], [Define to 1 if you have Poppler version 0.16.0 or higher.])
++   fi
++
+    PKG_CHECK_MODULES(POPPLER_GLIB,
+    		     [poppler-glib >= $POPPLER_GLIB_REQUIRED],
+ 		     [have_poppler_glib=yes],
+--- tracker-0.8.17/src/tracker-extract/tracker-extract-pdf.c~	2010-09-02 14:51:00.000000000 +0200
++++ tracker-0.8.17/src/tracker-extract/tracker-extract-pdf.c	2010-12-29 11:55:36.165545335 +0100
+@@ -243,7 +243,11 @@
+ 		rect.x1 = rect.y1 = 0;
+ 		poppler_page_get_size (page, &rect.x2, &rect.y2);
+ 
++#if defined (HAVE_POPPLER_0_16_0)
++		text = poppler_page_get_selected_text (page, POPPLER_SELECTION_WORD, &rect);
++#else
+ 		text = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect);
++#endif
+ 		t = tracker_text_normalize (text, n_words - words, &normalized_words);
+ 
+ 		words += normalized_words;
diff --git a/app-misc/tracker/tracker-0.8.17.ebuild b/app-misc/tracker/tracker-0.8.17.ebuild
index f43d9fcd08a1..2b5cc1e0ff8c 100644
--- a/app-misc/tracker/tracker-0.8.17.ebuild
+++ b/app-misc/tracker/tracker-0.8.17.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.8.17.ebuild,v 1.9 2010/12/22 22:52:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.8.17.ebuild,v 1.10 2011/01/28 12:08:28 pacho Exp $
 
-EAPI="2"
+EAPI="3"
 GCONF_DEBUG="no"
 
 inherit autotools eutils gnome2 linux-info virtualx
 
 DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="http://www.tracker-project.org/"
+HOMEPAGE="http://projects.gnome.org/tracker/"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -171,6 +171,9 @@ src_prepare() {
 	# Build with upower instead of devicekit-power
 	epatch "${FILESDIR}/${PN}-0.8.17-use-upower.patch"
 
+	# Fix build against poppler-0.16
+	epatch "${FILESDIR}/${PN}-0.8.17-poppler-0.16.patch"
+
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }