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

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

4 files changed, 47 insertions, 11 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/Manifest b/app-misc/tracker/Manifest
index cfe6cca0bb49..2a0cdf51a423 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -3,23 +3,24 @@ Hash: SHA1
 
 AUX tracker-0.8.0-strigi.patch 1385 RMD160 69d07b6145de6919cc1550e4722737cf5b96051d SHA1 5221ac64d5c21e540bb0bb07bd074b3ad5ce0a27 SHA256 7ae959cd52ac96f6427646089b554e0572727f27d5d4aab1913f795e270a4ccb
 AUX tracker-0.8.17-build-with-eds232.patch 807 RMD160 7f681d67da66c66c82171557462e74e095d5f1b5 SHA1 cb56616bd34a0a81a8df6117c2901e6f5d834a0d SHA256 bced568783664b0128903094db05a1f881519754d6fa1588f1050620fb73f989
+AUX tracker-0.8.17-poppler-0.16.patch 1209 RMD160 6ae54087f8d2b3ea864cfaa035e3b1153a749a67 SHA1 a2f7429149ecfa7e45dd58e0a0d37f9385fbefb1 SHA256 8d1ed288fc14655e36ddda9af6d30b5b00572feca08b643951c1b5ac2d4eba1c
 AUX tracker-0.8.17-tests-fixes.patch 2499 RMD160 fb8b749e2addeaa004fd2e6de585357156e2f092 SHA1 a4f193432edc8f64e3505ac407f05a2de7fd73af SHA256 3c00640648e56c722fcca4b6c1016082df992def8d7a95c5a1618453463d4048
 AUX tracker-0.8.17-use-upower.patch 16884 RMD160 a9545a4aa89b6574ccb58d5b9796386eeb62a1ef SHA1 16ad6730798279f9a09459b50e1380bbf16c8e83 SHA256 542432544663f0c1a9c43c08e816f42a95fa31f828e33f6d470cafc60a33a7a1
 DIST tracker-0.8.17.tar.bz2 4959334 RMD160 b33abe9ab955e5e392258657ad3a664ff5cb4cc6 SHA1 460f3d56bd0ed24c5d064a398829f4289a6b081f SHA256 56cf09f41fec1afaf7199e0728f4339b567a7893a51fc2affc5069fa26e2e9d8
 DIST tracker-0.9.30.tar.bz2 7287592 RMD160 5d64646c0098cd9966ed7aa5084d3a80af747980 SHA1 272134bf72031695e1ae0608d0f5d69ec3983afc SHA256 d01fc5bee618c76454cfb5bae44a913584ef6c27abc8620599e4327ecc6a462e
 DIST tracker-0.9.33.tar.bz2 7296331 RMD160 9d9765b6e247a798882387437069dfcf631add0e SHA1 c9e538d6a9f5fea3fcd90a200cd5ef83ecbdc560 SHA256 72e53572433d9a32fac9cce66de35b56412a46096a89530284f58ac84387c9f7
 DIST tracker-0.9.35.tar.bz2 7139994 RMD160 aca676b90b39a314a55b2dcabdcaf9055fe0e962 SHA1 4aa0acdf22cbc498942203cd21709a08051d725f SHA256 0234314069aa1f41f128ec2bb3564e69c582ed50814a842397ddbc0099c6442d
-EBUILD tracker-0.8.17.ebuild 5520 RMD160 746d6f052b0dd0c0deeade073dd85512d51c669b SHA1 597e05966f913ab187b7d136f1c66a5d99b540e9 SHA256 5735408dd93338fcb29e794c73863c0865c39ac494149293592c82db84a94095
+EBUILD tracker-0.8.17.ebuild 5615 RMD160 7684fa0f76c4bd33feb907c8238732f1db2ab72e SHA1 915091993c6c05d657691c23bfca3d76e557e33d SHA256 696673a3c488f3efe667e7fb3db6dbf83bb42f0c67056d8ced131dfaab55fca2
 EBUILD tracker-0.9.30.ebuild 6457 RMD160 acd5cfa39672a5946ef1800a67e29e44b8173104 SHA1 f9dc93a4d81644a7ee2c8b2727c118f91648478c SHA256 dab8380a821c43c3463721130a3d2c1fd12b9fcfeae717ffb900efc586a5efaa
 EBUILD tracker-0.9.33.ebuild 6213 RMD160 aabeefa9db5c2cf0860e9a6d67a322d2f183c862 SHA1 d7547a4ce1802a7e60df33b823a4d14fbd56c152 SHA256 7005f165601129c9e112a5f8cd07a843f7b5830b9c32aca76fe7e04ac8c6a2b2
 EBUILD tracker-0.9.35.ebuild 6124 RMD160 930ef8ef184f9d4a930e0f5d1d8ebdb891169726 SHA1 5c7dc8d69886e4d45ebed2b7dfcbb75eecb77540 SHA256 a178e96d7d4dcfc985b15d3ec515911162301e3ddbc38631415a91222021a0a7
 EBUILD tracker-9999.ebuild 5904 RMD160 e9e16d6ae5c8cdb985e6ca43e4f0395a6c9820b5 SHA1 4ce46a8f0d026ed69176189c35ccbeb66b903b57 SHA256 20440bb1a0c0cba2bc81e3505c7b70df4ffe793e9af9dee47ce44e13a2cc713c
-MISC ChangeLog 16520 RMD160 eb5929c79727be1c18a77b8eebc5654ce047928e SHA1 ec334d00e1ef36b67b0b7bb1bad7fe74d1c9d9d8 SHA256 1491e7f622d8452c67e4747debeac1f75cb4e0e5ff4da2ca9514c52a7ae35f10
+MISC ChangeLog 16705 RMD160 21a90de8da191ed3606f90bab3f9b8c58706199d SHA1 90a85c12719d71ff4f19627f5fac0489f6cd187a SHA256 32715bea5bcc11cb0d722ef8328e123c2eb8556ad8151544fcf2a31325d16547
 MISC metadata.xml 909 RMD160 47100344948079430541942d3841bc4cde102800 SHA1 4fb4e473e4cdf507733555623f28af9121f2d9b7 SHA256 b3bc2efef244353c50faf03ca2fa944698bac1b6a6d023a484e46eb5c3ce02a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk08tHsACgkQ1fmVwcYIWAYjFgCgg0Jkvb0QljjnaXp2UzviZWbB
-PsoAoJzPBR2qBJVt3cQ3PlNqo13DfD4g
-=Cs77
+iEYEARECAAYFAk1CscIACgkQCaWpQKGI+9QPOwCfbakVa1Y8G1fkmNgVJ3IClUN0
+a20An2WdaQJ0rYtlDO/6NqAapCy+Pl4f
+=iiMH
 -----END PGP SIGNATURE-----
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
 }