diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog deleted file mode 100644 --- a/app-text/poppler/ChangeLog +++ /dev/null @@ -1,953 +0,0 @@ -# ChangeLog for app-text/poppler -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.226 2010/03/11 22:07:20 yngwin Exp $ - - 13 Mar 2010; Nathan Phillip Brink (ohnobinki) - poppler-0.12.3-r3.ebuild, - poppler-0.12.3-r5.ebuild, +files/poppler-0.12.3-cxxflags.patch, - poppler-0.12.4.ebuild: - Add patch to make sure that poppler respects CXXFLAGS. bug 309297. - - 11 Mar 2010; Ben de Groot poppler-0.12.3-r3.ebuild, - poppler-0.12.3-r5.ebuild, poppler-0.12.4.ebuild: - Add missing lcms dep, bug #309005 - - 21 Feb 2010; Fabian Groffen poppler-0.12.4.ebuild, - +files/poppler-0.12.4-nanosleep-rt.patch: - Drop flag-o-matic ugly hack in favour of patch by upstream to solve - Solaris -lrt problem - - 19 Feb 2010; Fabian Groffen poppler-0.12.4.ebuild: - make sure we link with -lrt on Solaris, problem reported upstream - -*poppler-0.12.4 (18 Feb 2010) - - 18 Feb 2010; Ben de Groot +poppler-0.12.4.ebuild, - +files/poppler-0.12.4-config.patch: - Version bump - - 16 Feb 2010; Ben de Groot +poppler-0.12.3-r5.ebuild, - +files/poppler-0.12.3-cairo-downscale.patch: - Take 2 for cairo downscale patch from upstream, fixes bug 303817. - - 16 Feb 2010; Ben de Groot poppler-0.12.3-r3.ebuild, - -poppler-0.12.3-r4.ebuild, - -files/poppler-0.12.3-cairo-image-downscale.patch: - Install docs (bug 305391). Remove revision with patch that breaks apps - (bug 303817). - - 13 Feb 2010; Fabian Groffen - files/poppler-0.12.3-darwin-gtk-link.patch: - reduce number of libs to link against for poppler-glib, inspired by - upstream bug 26442 - - 11 Feb 2010; Ben de Groot poppler-0.12.3-r3.ebuild, - +files/poppler-0.12.3-config.patch: - Add small patch for typo in configuration (bug 304407). Add ewarn to - prompt users to recompile reverse dependencies (bug 304035). - - 09 Feb 2010; Ben de Groot -poppler-0.8.7.ebuild, - poppler-0.12.3-r3.ebuild, poppler-0.12.3-r4.ebuild: - Re-keyword 0.12.3 for ~mips with okay from Kumba. Drop no longer needed - ancient version with okay from kolla for m68k. - -*poppler-0.12.3-r4 (08 Feb 2010) - - 08 Feb 2010; Ben de Groot - -files/poppler-0.6.1-xpdf-3.02pl2.patch, - -files/poppler-0.8.3-page-init.patch, poppler-0.8.7.ebuild, - -poppler-0.10.5-r1.ebuild, -files/poppler-0.10.5-xpdf-3.02pl3.patch, - -poppler-0.12.3-r2.ebuild, poppler-0.12.3-r3.ebuild, - +poppler-0.12.3-r4.ebuild, - +files/poppler-0.12.3-cairo-image-downscale.patch, - -files/poppler-CVE-2009-1188.patch: - Remove obsoleted versions. Add cairo image downscale issue patch, which - has been applied to upstream git (bug 303817). - - 08 Feb 2010; nixnut poppler-0.12.3-r3.ebuild: - ppc stable #290464 - - 05 Feb 2010; Raúl Porcel poppler-0.12.3-r3.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #290464 - - 05 Feb 2010; Fabian Groffen poppler-0.12.3-r3.ebuild, - +files/poppler-0.12.3-darwin-gtk-link.patch: - Add patch to fix linking on Darwin, reported upstream - - 04 Feb 2010; Markus Meier poppler-0.12.3-r3.ebuild: - arm stable, bug #290464 - - 03 Feb 2010; Markus Meier poppler-0.12.3-r3.ebuild: - amd64 stable, bug #290464 - - 02 Feb 2010; Brent Baude poppler-0.12.3-r3.ebuild: - Marking poppler-0.12.3-r3 ppc64 for bug 290464 - - 01 Feb 2010; Jeroen Roovers poppler-0.12.3-r3.ebuild: - Stable for HPPA (bug #290464). - - 01 Feb 2010; Christian Faulhammer - poppler-0.12.3-r3.ebuild: - stable x86, security bug 290464 - -*poppler-0.12.3-r3 (26 Jan 2010) - - 26 Jan 2010; Ben de Groot +poppler-0.12.3-r3.ebuild, - +files/poppler-0.12.3-gdk.patch: - Add patch to fix gdk feature detection. Fixes bug 302332. - - 26 Jan 2010; Ben de Groot -poppler-0.10.4.ebuild, - -poppler-0.10.5.ebuild: - Remove obsoleted versions. - -*poppler-0.12.3-r2 (24 Jan 2010) - - 24 Jan 2010; Ben de Groot -poppler-0.12.3.ebuild, - -poppler-0.12.3-r1.ebuild, +poppler-0.12.3-r2.ebuild, - files/poppler-0.12.3-fix-headers-installation.patch, metadata.xml: - Join glib and cairo useflags into one, rename openjpeg useflag to jpeg2k. - Update patch. Remove older revisions. - - 24 Jan 2010; Ben de Groot poppler-0.12.3-r1.ebuild, - +files/poppler-0.12.3-fix-headers-installation.patch: - Add proper patch instead of workaround for missing headers installation. - Thanks to Maciej Mrozowski. - -*poppler-0.12.3-r1 (24 Jan 2010) - - 24 Jan 2010; Ben de Groot +poppler-0.12.3-r1.ebuild: - Install missing header. Enable glib useflag by default to make migration - smoother. - - 24 Jan 2010; Jonathan Callen poppler-0.12.3.ebuild: - Add prefix keywords - -*poppler-0.12.3 (24 Jan 2010) - - 24 Jan 2010; Ben de Groot +poppler-0.12.3.ebuild, - +files/poppler-0.12.3-cmake-disable-tests.patch: - New ebuild for monolithic poppler based on cmake buildsystem, as preferred - by upstream. Thanks to Maciej Mrozowski. - - 22 Apr 2009; Raúl Porcel poppler-0.10.5-r1.ebuild: - arm/ia64/s390/sh/sparc stable wrt #263028 - - 21 Apr 2009; Tobias Klausmann poppler-0.10.5-r1: - Stable on alpha, bug #263028 - - 18 Apr 2009; Brent Baude poppler-0.10.5-r1.ebuild: - Marking poppler-0.10.5-r1 ppc64 and ppc for bug 263028 - - 18 Apr 2009; Markus Meier poppler-0.10.5-r1: - amd64/x86 stable, bug #263028 - - 18 Apr 2009; Jeroen Roovers poppler-0.10.5-r1: - Stable for HPPA (bug #263028). - -*poppler-0.10.5-r1 (17 Apr 2009) - - 17 Apr 2009; Peter Alfredsen - +files/poppler-0.10.5-xpdf-3.02pl3.patch, - +files/poppler-CVE-2009-1188.patch, +poppler-0.10.5-r1.ebuild: - Bump w.r.t. bug 263028. - - 01 Apr 2009; Peter Alfredsen poppler-0.8.7.ebuild, - poppler-0.10.4.ebuild, poppler-0.10.5.ebuild: - Update deps w.r.t. bug 264230 - -*poppler-0.10.5 (11 Mar 2009) - - 11 Mar 2009; Peter Alfredsen -poppler-0.10.3.ebuild, - +poppler-0.10.5.ebuild: - Bump - - 04 Mar 2009; Tobias Scherbaum - poppler-0.10.4.ebuild: - ppc stable, bug #260266 - - 27 Feb 2009; Raúl Porcel poppler-0.10.4.ebuild: - alpha/arm/ia64/s390/sh/sparc stable wrt #260266 - - 26 Feb 2009; Jeroen Roovers poppler-0.10.4.ebuild: - Stable for HPPA (bug #260266). - - 26 Feb 2009; Brent Baude poppler-0.10.4.ebuild: - Marking poppler-0.10.4 ppc64 for bug 260266 - - 25 Feb 2009; Markus Meier poppler-0.10.4.ebuild: - amd64/x86 stable, bug #260266 - -*poppler-0.10.4 (25 Feb 2009) - - 25 Feb 2009; Peter Alfredsen +poppler-0.10.4.ebuild: - Bump w.r.t. bug 260266. - - 23 Jan 2009; Peter Alfredsen - -poppler-0.6.3-r1.ebuild: - Take out the trash - -*poppler-0.10.3 (10 Jan 2009) - - 10 Jan 2009; Peter Alfredsen -poppler-0.10.0.ebuild, - -poppler-0.10.1.ebuild, -poppler-0.10.2.ebuild, +poppler-0.10.3.ebuild: - Bump - - 17 Dec 2008; Peter Alfredsen metadata.xml: - Adding myself as maintainer, I've been de-facto maintainer for six months - anyway. - -*poppler-0.10.2 (10 Dec 2008) - - 10 Dec 2008; Peter Alfredsen +poppler-0.10.2.ebuild: - Bumb - - 07 Dec 2008; Mike Frysinger poppler-0.10.0.ebuild, - poppler-0.10.1.ebuild: - Add back s390 #240520. - - 24 Nov 2008; Brent Baude poppler-0.8.7.ebuild: - Marking poppler-0.8.7 ppc64 for bug 239414 - -*poppler-0.10.1 (09 Nov 2008) - - 09 Nov 2008; Peter Alfredsen +poppler-0.10.1.ebuild: - bump - - 01 Nov 2008; Peter Alfredsen - -poppler-0.6.1-r1.ebuild: - Cleanup of GLSA-affected ebuild. - - 25 Oct 2008; Raúl Porcel poppler-0.10.0.ebuild: - Add ~ia64 wrt #240520 - - 14 Oct 2008; Jeroen Roovers poppler-0.10.0.ebuild: - Marked ~hppa (bug #240520). - -*poppler-0.10.0 (12 Oct 2008) - - 12 Oct 2008; Peter Alfredsen -poppler-0.9.3.ebuild, - +poppler-0.10.0.ebuild: - Bump. Watch for API breakage. ABI is broke for sure, remember rebuild. - - 08 Oct 2008; Raúl Porcel poppler-0.8.7.ebuild: - alpha/ia64 stable wrt #239414 - -*poppler-0.9.3 (08 Oct 2008) - - 08 Oct 2008; Peter Alfredsen -poppler-0.8.5.ebuild, - -poppler-0.9.2.ebuild, +poppler-0.9.3.ebuild: - Bump. Dropping jpeg and zlib useflags because they only control whether to - use the internal implementation or the shared lib. Dropping cjk useflag - because all it does is pull in a data-package. Go EAPI-2. Drop la files - and static archives, not used. Dropping keywords for arm hppa ia64 m68k - mips s390 sh sparc-fbsd cause they don't have openjpeg keyworded. - - 07 Oct 2008; nixnut poppler-0.8.7.ebuild: - Stable on ppc wrt bug 239414 - - 05 Oct 2008; Jeroen Roovers poppler-0.8.7.ebuild: - Stable for HPPA (bug #239414). - - 04 Oct 2008; Markus Meier poppler-0.8.7.ebuild: - x86 stable, bug #239414 - - 04 Oct 2008; Thomas Anderson - poppler-0.8.7.ebuild: - stable amd64, bug 239414 - - 03 Oct 2008; Ferris McCormick poppler-0.8.7.ebuild: - Sparc stable, part of Bug #239414. - -*poppler-0.9.2 (26 Sep 2008) - - 26 Sep 2008; Saleem Abdulrasool - +poppler-0.9.2.ebuild: - Version bump for cairo 1.8 - -*poppler-0.8.7 (03 Sep 2008) - - 03 Sep 2008; Peter Alfredsen -poppler-0.8.6.ebuild, - +poppler-0.8.7.ebuild: - Bump, fixes two regressions introduced in 0.8.6 - -*poppler-0.8.6 (24 Aug 2008) - - 24 Aug 2008; Peter Alfredsen -poppler-0.6.3.ebuild, - -poppler-0.8.4-r1.ebuild, +poppler-0.8.6.ebuild: - Bump to 0.8.6, remove old. - -*poppler-0.8.5 (03 Aug 2008) - - 03 Aug 2008; Peter Alfredsen +poppler-0.8.5.ebuild: - Bump. Fixes for memory leaks, feature additions. - - 08 Jul 2008; Tobias Scherbaum - poppler-0.6.3-r1.ebuild: - ppc stable, bug #229931 - - 08 Jul 2008; Raúl Porcel poppler-0.6.3-r1.ebuild: - ia64 stable wrt #229931 - -*poppler-0.8.4-r1 (07 Jul 2008) -*poppler-0.6.3-r1 (07 Jul 2008) - - 07 Jul 2008; Daniel Gryniewicz - +files/poppler-0.8.3-page-init.patch, +poppler-0.6.3-r1.ebuild, - -poppler-0.8.3.ebuild, -poppler-0.8.4.ebuild, +poppler-0.8.4-r1.ebuild: - Fix CVE-2008-2950 bug #229931 - -*poppler-0.8.4 (29 Jun 2008) - - 29 Jun 2008; Peter Alfredsen +poppler-0.8.4.ebuild: - Bump to 0.8.4 - - 11 Jun 2008; Peter Alfredsen - poppler-0.6.1-r1.ebuild: - Dropping keywords for all but arm/sh/m68k/s390 on poppler-0.6.1-r1 due to - bug #216850 - - 11 Jun 2008; Peter Alfredsen - -files/004_CVE-2007-0104.patch, -files/poppler-cve-2007-3387.patch, - -poppler-0.5.3.ebuild, -poppler-0.5.4.ebuild, -poppler-0.5.4-r1.ebuild, - -poppler-0.5.4-r2.ebuild, -poppler-0.6.ebuild, -poppler-0.6.1.ebuild, - -poppler-0.6.2.ebuild: - Spring clean of poppler-related packages. - -*poppler-0.8.3 (04 Jun 2008) - - 04 Jun 2008; Peter Alfredsen -poppler-0.8.0.ebuild, - +poppler-0.8.3.ebuild: - Bump to 0.8.3 - - 17 Apr 2008; Robert Buchholz poppler-0.6.3.ebuild: - ppc stable (proxy commit for dertobi123) - - 14 Apr 2008; Markus Meier poppler-0.6.3.ebuild: - amd64 stable - - 14 Apr 2008; Markus Rothe poppler-0.6.3.ebuild: - Stable on ppc64 - - 12 Apr 2008; Raúl Porcel poppler-0.6.3.ebuild: - alpha/ia64/sparc/x86 stable - - 12 Apr 2008; Jeroen Roovers poppler-0.6.3.ebuild: - Stable for HPPA (bug #216850). - -*poppler-0.8.0 (01 Apr 2008) - - 01 Apr 2008; Stefan Schweizer +poppler-0.8.0.ebuild: - version bump, bug 209647 - - 01 Mar 2008; Ryan Hill poppler-0.5.3.ebuild: - Drop stable version to ~mips to match poppler-bindings. - - 28 Jan 2008; Daniel Gryniewicz poppler-0.6.3.ebuild: - Remove unused configure option - -*poppler-0.6.3 (21 Jan 2008) - - 21 Jan 2008; Daniel Gryniewicz +poppler-0.6.3.ebuild: - Bump to 0.6.3 - core: - * Fix crash in extra debug code - build system: - * Disable gtk tests if the user disabled glib frontend - - 14 Nov 2007; Tobias Scherbaum - poppler-0.6.1-r1.ebuild: - ppc stable, bug #196735 - -*poppler-0.6.2 (12 Nov 2007) - - 12 Nov 2007; Stefan Schweizer +poppler-0.6.2.ebuild: - version bump - - 12 Nov 2007; Jeroen Roovers poppler-0.6.1-r1.ebuild: - Stable for HPPA (bug #196735). - - 11 Nov 2007; Raúl Porcel poppler-0.6.1-r1.ebuild: - alpha/ia64 stable wrt security #196735 - - 10 Nov 2007; Daniel Gryniewicz poppler-0.6.1-r1.ebuild: - Marked stable on amd64 for bug #196735 - - 10 Nov 2007; Markus Rothe poppler-0.6.1-r1.ebuild: - Stable on ppc64; bug #196735 - - 09 Nov 2007; Ferris McCormick poppler-0.6.1-r1.ebuild: - Sparc stable --- Security Bug #196735 - - 09 Nov 2007; Christian Faulhammer - poppler-0.6.1-r1.ebuild: - stable x86, security bug 196735 - -*poppler-0.6.1-r1 (08 Nov 2007) - - 08 Nov 2007; Timo Gurr - +files/poppler-0.6.1-xpdf-3.02pl2.patch, +poppler-0.6.1-r1.ebuild: - New revision poppler-0.6.1-r1, fixes security bug #196735. - -*poppler-0.6.1 (12 Oct 2007) - - 12 Oct 2007; Stefan Schweizer +poppler-0.6.1.ebuild: - version bump - - 06 Sep 2007; Stefan Schweizer - -files/poppler-0.5.9-header.patch, -poppler-0.5.9-r1.ebuild, - -poppler-0.5.91.ebuild: - drop old - -*poppler-0.6 (04 Sep 2007) - - 04 Sep 2007; Stefan Schweizer +poppler-0.6.ebuild: - version bump - - 29 Aug 2007; Markus Rothe poppler-0.5.4-r2.ebuild: - Stable on ppc64; bug #188863 - - 28 Aug 2007; Christoph Mende poppler-0.5.4-r2.ebuild: - Stable on amd64 wrt security bug #188863 - - 28 Aug 2007; Tobias Scherbaum - poppler-0.5.4-r2.ebuild: - ppc stable, bug #188863 - - 24 Aug 2007; Raúl Porcel poppler-0.5.4-r2.ebuild: - alpha/ia64 stable wrt security #188863 - - 24 Aug 2007; Jeroen Roovers poppler-0.5.4-r2.ebuild, - poppler-0.5.91.ebuild: - 0.5.9-r1 back to ~hppa. 0.5.4-r2 stable for HPPA (bug #188863). - - 24 Aug 2007; Gustavo Zacarias - poppler-0.5.4-r2.ebuild: - Stable on sparc wrt security #188863 - - 24 Aug 2007; Christian Faulhammer - poppler-0.5.4-r2.ebuild: - stable x86, security bug 188863 - -*poppler-0.5.4-r2 (23 Aug 2007) - - 23 Aug 2007; Stefan Schweizer - +files/poppler-cve-2007-3387.patch, +poppler-0.5.4-r2.ebuild: - Backport security patch thanks to steev, bug 188863 - - 23 Aug 2007; Jeroen Roovers poppler-0.5.91.ebuild: - Stable for HPPA (bug #188863). - -*poppler-0.5.91 (22 Aug 2007) - - 22 Aug 2007; Stefan Schweizer +poppler-0.5.91.ebuild: - version bump - - 12 Jul 2007; Roy Marples poppler-0.5.4.ebuild, - poppler-0.5.4-r1.ebuild, poppler-0.5.9-r1.ebuild: - Keyworded ~sparc-fbsd. - - 04 Jul 2007; Stefan Schweizer - files/poppler-0.5.9-header.patch: - Fix patch thanks to Cosimo Cecchi in bug 183232 - -*poppler-0.5.9-r1 (24 Jun 2007) - - 24 Jun 2007; Stefan Schweizer - +files/poppler-0.5.9-header.patch, -poppler-0.5.9.ebuild, - +poppler-0.5.9-r1.ebuild: - Add header patch to allow compilation of xpdf against it - -*poppler-0.5.9 (31 May 2007) - - 31 May 2007; Stefan Schweizer +poppler-0.5.9.ebuild: - version bump - - 14 Feb 2007; Tobias Scherbaum - poppler-0.5.4-r1.ebuild: - Stable on ppc wrt bug #162460. - - 13 Feb 2007; Markus Rothe poppler-0.5.4-r1.ebuild: - Stable on ppc64; bug #162460 - - 13 Feb 2007; Marcus D. Hanwell poppler-0.5.4-r1.ebuild: - Stable on amd64, bug 162460. - - 12 Feb 2007; Bryan Østergaard - poppler-0.5.4-r1.ebuild: - Stable on Alpha, bug 162460. - - 12 Feb 2007; Gustavo Zacarias - poppler-0.5.4-r1.ebuild: - Stable on sparc wrt security #162460 - - 12 Feb 2007; Jeroen Roovers poppler-0.5.4-r1.ebuild: - Stable for HPPA (bug #162460). - - 11 Feb 2007; Christian Faulhammer - poppler-0.5.4-r1.ebuild: - stable x86; security bug #162460 - -*poppler-0.5.4-r1 (10 Feb 2007) - - 10 Feb 2007; +files/004_CVE-2007-0104.patch, - +poppler-0.5.4-r1.ebuild: - Add patch for security bug 162460 - - 18 Jan 2007; Jeroen Roovers poppler-0.5.4.ebuild: - Stable for HPPA (bug #147751). - - 14 Jan 2007; Bryan Østergaard poppler-0.5.4.ebuild: - Stable on Alpha. - - 08 Jan 2007; Mike Frysinger poppler-0.5.4.ebuild: - Drop flag filtering as it seemed to be a gcc-3.4.x bug and we've since moved - on to gcc-4.1.x #124179. - - 21 Dec 2006; Markus Rothe poppler-0.5.4.ebuild: - Stable on ppc64; bug #156662 - - 18 Dec 2006; Gustavo Zacarias poppler-0.5.4.ebuild: - Stable on sparc - - 17 Dec 2006; Tobias Scherbaum - poppler-0.5.4.ebuild: - Stable on ppc wrt bug #156662. - - 12 Dec 2006; Chris Gianelloni poppler-0.5.4.ebuild: - Stable on amd64 wrt bug #156662. - - 10 Dec 2006; Andrej Kacian poppler-0.5.4.ebuild: - Stable on x86, bug #156662. - - 19 Oct 2006; Stefan Schweizer - -poppler-0.5.1-r1.ebuild, poppler-0.5.3.ebuild, poppler-0.5.4.ebuild: - remove old, remove no longer needed postinst note, bug 151538 - - 19 Oct 2006; Bryan Østergaard poppler-0.5.3.ebuild: - Stable on Alpha. - - 04 Oct 2006; Stefan Schweizer poppler-0.5.4.ebuild: - Use zlib again thanks to Francisco Javier in bug 150086 - - 23 Sep 2006; Stefan Schweizer - -files/poppler-0.4.3-pdf2xml.patch, -files/poppler-0.4.4-bug117481.patch, - -files/poppler-0.4.4-cairo-lines.patch, - -files/poppler-0.5.0-cairo-ft.patch, -files/poppler-0.5.0-pdftoppm.patch, - -files/poppler-0.5.0-splash-overflow.patch, - -files/poppler-0.5.0-try-all-fonts.patch, -poppler-0.5.0-r4.ebuild, - -poppler-0.5.0-r5.ebuild, -poppler-0.5.1.ebuild: - remove old - -*poppler-0.5.4 (23 Sep 2006) - - 23 Sep 2006; Stefan Schweizer +poppler-0.5.4.ebuild: - version bump, new package poppler-data to support cjk - - 16 Aug 2006; Markus Rothe poppler-0.5.3.ebuild: - Stable on ppc64 - - 23 Jul 2006; Gustavo Felisberto ; Manifest: - Rebuilding Manifest due to error's. - - 22 Jul 2006; poppler-0.5.1.ebuild: - also stable on mips - - 22 Jul 2006; poppler-0.5.3.ebuild: - stable on mips - - 22 Jul 2006; Thomas Cort poppler-0.5.1-r1.ebuild: - Stable on alpha. - - 17 Jul 2006; Daniel Gryniewicz poppler-0.5.3.ebuild: - Marked stable on amd64 for bug #139612 - - 16 Jul 2006; Tobias Scherbaum - poppler-0.5.3.ebuild: - hppa stable, bug #139612 - - 14 Jul 2006; Tobias Scherbaum - poppler-0.5.3.ebuild: - ppc stable, bug #139612 - - 12 Jul 2006; Aron Griffis poppler-0.5.3.ebuild: - Mark 0.5.3 stable on ia64 - - 12 Jul 2006; Chris Gianelloni poppler-0.5.3.ebuild: - Stable on x86 wrt bug #139612. - - 10 Jul 2006; Gustavo Zacarias poppler-0.5.3.ebuild: - Stable on sparc wrt #139612 - - 22 Jun 2006; Emanuele Giaquinta poppler-0.5.3.ebuild: - Remove useless dep on automake. - - 03 Jun 2006; Guy Martin poppler-0.5.1-r1.ebuild: - Stable on hppa. - - 01 Jun 2006; Thomas Cort poppler-0.5.1.ebuild: - Stable on alpha wrt Bug #132213. - -*poppler-0.5.3 (31 May 2006) - - 31 May 2006; Stefan Schweizer -poppler-0.5.2.ebuild, - +poppler-0.5.3.ebuild: - Version bump, remove old broken version, please unmask after some testing - - 30 May 2006; Joseph Jezak poppler-0.5.1-r1.ebuild: - Marked ppc stable. - - 29 May 2006; Jason Wever poppler-0.5.1-r1.ebuild: - Stable on SPARC wrt bug #132349. - - 26 May 2006; Markus Rothe poppler-0.5.1-r1.ebuild: - Stable on ppc64 - - 26 May 2006; Chris Gianelloni - poppler-0.5.1-r1.ebuild: - Stable on amd64 wrt bug #132349 - - 25 May 2006; Chris Gianelloni - poppler-0.5.1-r1.ebuild: - Stable on x86 wrt bug #132349. - -*poppler-0.5.2 (23 May 2006) - - 23 May 2006; Daniel Gryniewicz +poppler-0.5.2.ebuild: - New poppler 0.5.2 - - 04 Apr 2006; Stefan Schweizer - poppler-0.5.0-r4.ebuild, poppler-0.5.0-r5.ebuild, poppler-0.5.1.ebuild, - poppler-0.5.1-r1.ebuild: - poppler does not depend on ghostscript, bug 128761 - - 02 Apr 2006; Diego Pettenò - poppler-0.5.1-r1.ebuild: - Run elibtoolize and add ~x86-fbsd keyword. - -*poppler-0.5.1-r1 (01 Apr 2006) - - 01 Apr 2006; Stefan Schweizer - +poppler-0.5.1-r1.ebuild: - Poppler cvs drop, also fixing bug 128367 thanks to Ruben Jenster - - - 19 Mar 2006; Luis Medinas poppler-0.5.0-r5.ebuild: - Stable on amd64. See bug #125430. - - 14 Mar 2006; Joshua Jackson poppler-0.5.0-r5.ebuild: - Stable on x86; bug #125430 - - 14 Mar 2006; Jeroen Roovers poppler-0.5.0-r5.ebuild: - Stable on hppa (bug #125430). - - 11 Mar 2006; Jose Luis Rivero - poppler-0.5.0-r5.ebuild: - Stable on alpha wrt sec bug #125430 - - 11 Mar 2006; Markus Ullmann poppler-0.5.0-r5.ebuild: - Stable on arm wrt bug #125430 - - 11 Mar 2006; poppler-0.5.0-r5.ebuild: - Stable on ppc. Bug #125430 - - 10 Mar 2006; Markus Rothe poppler-0.5.0-r5.ebuild: - Stable on ppc64; bug #125430 - - 09 Mar 2006; Aron Griffis poppler-0.5.0-r5.ebuild: - Mark 0.5.0-r5 stable on ia64 - - 09 Mar 2006; Stefan Schweizer - -files/poppler-0.4.1-cairo-ft.patch, -files/poppler-0.4.3-bug117481.patch, - -files/poppler-0.4.3-gcc41.patch, -files/poppler-no-libjpeg.patch, - -poppler-0.4.3-r4.ebuild, poppler-0.5.0-r4.ebuild, - poppler-0.5.0-r5.ebuild, poppler-0.5.1.ebuild: - Add -Os-fix to all ebuilds, remove old 0.4.3-r4 - - 09 Mar 2006; Gustavo Zacarias - poppler-0.5.0-r5.ebuild: - Stable on sparc wrt #125430 - - 05 Mar 2006; Stefan Schweizer poppler-0.5.1.ebuild: - -Os is broken, bug 124179 - - 03 Mar 2006; poppler-0.5.1.ebuild: - -m Disable cairo here to keep poppler-cairo.pc from being installed. It's - installed by poppler-bindings - -*poppler-0.5.1 (03 Mar 2006) - - 03 Mar 2006; Stefan Schweizer +poppler-0.5.1.ebuild: - version bump - - 19 Feb 2006; Stephen P. Becker - poppler-0.5.0-r4.ebuild: - stable on mips - -*poppler-0.5.0-r5 (08 Feb 2006) - - 08 Feb 2006; Stefan Schweizer - +poppler-0.5.0-r5.ebuild: - Remove zlib because it is causing problems, see bug 122145 thanks to - Alexander Stein - - 06 Feb 2006; Mark Loeser poppler-0.5.0-r4.ebuild: - Stable on x86; bug #120985 - - 06 Feb 2006; Markus Rothe poppler-0.5.0-r4.ebuild: - Stable on ppc64: bug #120985 - - 05 Feb 2006; Tobias Scherbaum - poppler-0.5.0-r4.ebuild: - ppc stable, security bug #120985 - - 05 Feb 2006; Jose Luis Rivero - poppler-0.5.0-r4.ebuild: - Stable on alpha wrt security bug #120985 - - 05 Feb 2006; Simon Stelling poppler-0.5.0-r4.ebuild: - stable wrt bug 120985 - - 05 Feb 2006; Jason Wever poppler-0.5.0-r4.ebuild: - Stable on SPARC wrt security bug #120985. - - 04 Feb 2006; Rene Nussbaumer - poppler-0.5.0-r4.ebuild: - Stable on hppa. See bug #120985. - - 04 Feb 2006; Stefan Schweizer - -files/poppler-0.5.0-fontimprove.patch, -poppler-0.3.0.ebuild, - -poppler-0.3.0-r1.ebuild, -poppler-0.4.2-r1.ebuild, -poppler-0.4.4.ebuild, - -poppler-0.5.0.ebuild, -poppler-0.5.0-r2.ebuild, -poppler-0.5.0-r3.ebuild: - Remove old ebuilds - - 03 Feb 2006; Stefan Schweizer - poppler-0.5.0-r4.ebuild: - Remove the fontimprove patch from stable-candite -r4, it seems to be causing - problems, bug 121480 - -*poppler-0.5.0-r4 (03 Feb 2006) - - 03 Feb 2006; Stefan Schweizer - +files/poppler-0.5.0-pdftoppm.patch, +poppler-0.5.0-r4.ebuild: - Add pdftoppm to poppler - -*poppler-0.5.0-r3 (03 Feb 2006) - - 03 Feb 2006; Stefan Schweizer - +files/poppler-0.5.0-fontimprove.patch, - +files/poppler-0.5.0-splash-overflow.patch, +poppler-0.5.0-r3.ebuild: - Add security patch, bug 120985, do not build gtk test apps, bug 119761, add - kpdf-integration patch - -*poppler-0.5.0-r2 (01 Feb 2006) - - 01 Feb 2006; +files/poppler-0.5.0-try-all-fonts.patch, - -poppler-0.5.0-r1.ebuild, +poppler-0.5.0-r2.ebuild: - Scan all fonts, not just first found. Bug #119898 - -*poppler-0.5.0-r1 (31 Jan 2006) - - 31 Jan 2006; +poppler-0.5.0-r1.ebuild: - Make poppler > 0.5.0 install the xpdf include files. Bug #119919 - - 25 Jan 2006; Bryan Østergaard poppler-0.5.0.ebuild: - Fix autotools stuff for rare build issues. - -*poppler-0.5.0 (20 Jan 2006) - - 20 Jan 2006; +files/poppler-0.5.0-cairo-ft.patch, - +poppler-0.5.0.ebuild: - New semi-major rev of poppler - -*poppler-0.4.4 (19 Jan 2006) - - 19 Jan 2006; +files/poppler-0.4.3-pdf2xml.patch, - +files/poppler-0.4.4-bug117481.patch, - +files/poppler-0.4.4-cairo-lines.patch, -poppler-0.4.2.ebuild, - -poppler-0.4.3.ebuild, -poppler-0.4.3-r1.ebuild, -poppler-0.4.3-r2.ebuild, - -poppler-0.4.3-r3.ebuild, poppler-0.4.3-r4.ebuild, +poppler-0.4.4.ebuild: - The big poppler cleanup: - - Add new poppler rev 0.4.4 - - Remove currently unneeded poppler versions 0.4.2, and 0.4.3 - 0.4.3-r3 - - Add ghostscript depend to poppler. (previous commit lost) - - Add pdf3xml.dtd to poppler. (previous commit lost) - - 14 Jan 2006; poppler-0.4.3-r4.ebuild: - Don't need ghostscript - - 13 Jan 2006; Mark Loeser poppler-0.4.3-r4.ebuild: - Stable on x86; bug #117495 - - 12 Jan 2006; Robin H. Johnson - poppler-0.4.3-r4.ebuild: - pdf2html != pdftohtml. pdftohtml conflicts with poppler, pdf2html does not. - - 12 Jan 2006; Simon Stelling poppler-0.4.3-r4.ebuild: - stable on amd64 wrt bug 117495 - - 11 Jan 2006; Markus Rothe poppler-0.4.3-r4.ebuild: - Stable on ppc64; bug #117495 - - 11 Jan 2006; Tobias Scherbaum - poppler-0.4.3-r4.ebuild: - ppc stable, bug #117495, #117481 - - 11 Jan 2006; Gustavo Zacarias - poppler-0.4.3-r4.ebuild: - Stable on sparc wrt #117481 #117495 - - 09 Jan 2006; Jeroen Roovers poppler-0.4.3-r4.ebuild: - Marked hppa stable (bug #117495). - - 08 Jan 2006; poppler-0.4.3-r4.ebuild: - Block pdf2html, since poppler installs it. Bug #117839 - -*poppler-0.4.3-r4 (05 Jan 2006) - - 05 Jan 2006; +files/poppler-0.4.3-bug117481.patch, - +poppler-0.4.3-r4.ebuild: - Revbump for bug #117481 - - 05 Jan 2006; Mark Loeser files/poppler-gcc41.patch: - Remove the chunk from bug #116977, not needed for 0.4.2 - -*poppler-0.4.3-r3 (03 Jan 2006) - - 03 Jan 2006; Stefan Schweizer - +files/poppler-0.4.3-gcc41.patch, +files/poppler-no-libjpeg.patch, - +poppler-0.4.3-r3.ebuild: - Add gcc-4.1 patch thanks to Matt Bobulski in bug 117416 - and -libjpeg-patch thanks to SpanKY and Daniel Drake - in bug 117047 - -*poppler-0.4.3-r2 (03 Jan 2006) - - 03 Jan 2006; +poppler-0.4.3-r2.ebuild: - Move gtk/qt bindings to poppler-bindings to resolve circular deps - - 29 Dec 2005; Mike Frysinger files/poppler-gcc41.patch: - Add another gcc-4.1.x fix #116977 by gim. - - 28 Dec 2005; -files/poppler-0.4.3-utils.patch, - poppler-0.4.3-r1.ebuild: - Oops. Patch is too big for files; move to distdir - -*poppler-0.4.3-r1 (27 Dec 2005) - - 27 Dec 2005; +files/poppler-0.4.3-utils.patch, - +poppler-0.4.3-r1.ebuild: - Add non-X utilities to poppler to help resolve dependencies - - 14 Dec 2005; Fernando J. Pereda - poppler-0.3.0-r1.ebuild: - stable on alpha wrt bug #114428 - -*poppler-0.4.3 (13 Dec 2005) - - 13 Dec 2005; +poppler-0.4.3.ebuild: - New upstream. - - 09 Dec 2005; poppler-0.3.0-r1.ebuild: - Add dep for fontconfig. Bug #114727 - - 07 Dec 2005; Mark Loeser poppler-0.3.0-r1.ebuild: - Stable on x86; bug #114428 - - 06 Dec 2005; Michael Hanselmann - poppler-0.3.0-r1.ebuild: - Stable on ppc. - - 06 Dec 2005; Markus Rothe poppler-0.3.0-r1.ebuild, - poppler-0.4.2-r1.ebuild: - Back to unstable/stable on ppc64; bug #114428 - - 06 Dec 2005; poppler-0.3.0-r1.ebuild: - Oops, and actually apply the patch - -*poppler-0.3.0-r1 (06 Dec 2005) - - 06 Dec 2005; +poppler-0.3.0-r1.ebuild, - -poppler-0.3.2.ebuild, -poppler-0.3.3.ebuild, -poppler-0.4.1.ebuild: - Backport fix for bug #114428 to stable version, remove broken versions - - 05 Dec 2005; Brent Baude poppler-0.4.2-r1.ebuild: - Marking poppler-0.4.2-r1 ppc64 per bug 114428 - -*poppler-0.4.2-r1 (04 Dec 2005) - - 04 Dec 2005; +files/poppler-0.4.2-CAN-2005-3193.patch, - +poppler-0.4.2-r1.ebuild: - Fix for bug #114428 - - 30 Nov 2005; Tom Gall poppler-0.3.0.ebuild: - stable on ppc64 - - 29 Nov 2005; Hanno Boeck +files/poppler-gcc41.patch, - poppler-0.4.2.ebuild: - Fix for gcc 4.1. - - 31 Oct 2005; poppler-0.4.2.ebuild: - Add cairo flag back, now cairo is out of mask - -*poppler-0.4.2 (28 Sep 2005) - - 28 Sep 2005; +poppler-0.4.2.ebuild: - Bump to 0.4.2. Bug #105107. Disable cairo by default, Bug #104830 - - 22 Sep 2005; poppler-0.4.1.ebuild: - Force automake 1.9 - - 09 Sep 2005; Aron Griffis poppler-0.3.0.ebuild: - Mark 0.3.0 stable on alpha - - 02 Sep 2005; poppler-0.4.1.ebuild: - Add missing automake-1.9 dep - - 30 Aug 2005; poppler-0.4.1.ebuild: - Remove useless myconf line - -*poppler-0.4.1 (30 Aug 2005) - - 30 Aug 2005; +files/poppler-0.4.1-cairo-ft.patch, - +poppler-0.4.1.ebuild: - Revbump to poppler 0.4.1. Include a patch for bug #103981 - - 23 Aug 2005; Aron Griffis poppler-0.3.0.ebuild: - stable on ia64 - -*poppler-0.3.3 (27 Jun 2005) - - 27 Jun 2005; +poppler-0.3.3.ebuild: - Revbump to 0.3.3 - - 07 Jun 2005; Heinrich Wendel -poppler-0.1.2.ebuild, - -poppler-0.3.1.ebuild, poppler-0.3.2.ebuild: - cleanups - - 05 Jun 2005; Michael Hanselmann poppler-0.3.0.ebuild: - Stable on ppc. - -*poppler-0.3.2 (21 May 2005) - - 21 May 2005; Heinrich Wendel +poppler-0.3.2.ebuild: - version bump - -*poppler-0.3.1 (14 May 2005) - - 14 May 2005; Heinrich Wendel poppler-0.3.0.ebuild, - +poppler-0.3.1.ebuild: - version bump; 0.3.0 stable on x86/amd64 - -*poppler-0.3.0 (23 Apr 2005) - - 23 Apr 2005; Heinrich Wendel +poppler-0.3.0.ebuild: - version bump - -*poppler-0.1.2 (14 Mar 2005) - - 14 Mar 2005; Heinrich Wendel +poppler-0.1.2.ebuild: - initial commit - diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest deleted file mode 100644 --- a/app-text/poppler/Manifest +++ /dev/null @@ -1,16 +0,0 @@ -AUX poppler-0.12.3-cairo-downscale.patch 17313 RMD160 6c2068605e195c2ec27636634613482a181195a9 SHA1 1df4c48520c53ef289d92b2208a5b55140443204 SHA256 643ab8d6d747a9e1484d132be43ee674e5ccae38c79792a8be01ed2df82e8067 -AUX poppler-0.12.3-cmake-disable-tests.patch 2121 RMD160 3edded24926076c9c0ef42d0f1f295a8d46cafdb SHA1 fd22bdf1d887bcedd83673992fd182bfdb3bfcb0 SHA256 182489ee0d76a38c6d2570721a6777d78077ace4249bbeac7dad8d29b075c01b -AUX poppler-0.12.3-config.patch 3468 RMD160 de39ce760cca5b811e1c21efc893731fbcfbc22b SHA1 e7dd1b86d2d5312c5610b02101d5551bece21b10 SHA256 909a1626b8800b3e796c24e3c2a5b6140cd626a28b6c627bd212d6a4a9a12aef -AUX poppler-0.12.3-cxxflags.patch 1427 RMD160 d268e2b8c745108d19142d91b4a1bd57fa8d84bc SHA1 7a9b1f6a8649c38a9e21d847076808625b25c046 SHA256 7f0e5a4048964c6374925cd0a885b777097002e9ab6165f188539f0db2e28f1b -AUX poppler-0.12.3-darwin-gtk-link.patch 455 RMD160 9f08076c4821a29ef8b96bc0eb32b0b1d93b0285 SHA1 297d84fff5ee4f9fd05ceaf34228df5e21baff90 SHA256 1d58beb5d476857e60cdf16bc4c458b8c48e59f2b9a26715f485003da18f9814 -AUX poppler-0.12.3-fix-headers-installation.patch 1110 RMD160 8e327ab79c6cc3dc149b83be8c96ceb0ecfd494d SHA1 fa9b58cc1ca6f81f5dd30a41f89b8b5c136d9fe4 SHA256 ef05df49853ecde1fa5711f799f75d2811d56481f199995d88efb198f9f5b12e -AUX poppler-0.12.3-gdk.patch 633 RMD160 85f009940f64f1e4d8d3b1dff2a8ec1e09b95420 SHA1 90c650df067e5dd2558dee1c098c5655b0f5974b SHA256 c6054c500b6049ec8be492bae5d364c6fdfed23a8ffe704ad80f2677ed13ccac -AUX poppler-0.12.4-config.patch 3028 RMD160 5e0d0e51621eeb272d019990c526cbcef21cec1f SHA1 1279f1c31356ccf80857999f1c3574b28a9fae7c SHA256 7c1b7765ad6a55397d16822bf89e9dcee075181bf589bbbad100854274bbe69b -AUX poppler-0.12.4-nanosleep-rt.patch 1308 RMD160 473ccf2a4fc83762f8b17ab20da89af1a9a80566 SHA1 b1103fc1d310bdbbb3cfd1b9bc29d1bfdef9076b SHA256 57d366e46cad51ead796abf2beae33103187c811c1ae9af4a2750aa29c999ae7 -DIST poppler-0.12.3.tar.gz 1616883 RMD160 a8fd07ec4dc918cc17390a5236aff9a43e1f7253 SHA1 bce8b675fb7c22d507b1965efa7bd71d9ce09460 SHA256 7a4ffe6d2950c446c285700d3b2dc399540a27ce635dd712aff646f02f8dfbcc -DIST poppler-0.12.4.tar.gz 1674400 RMD160 9c212ebb8fc3d4cbc532f1c826428cc4d195cb5b SHA1 306507e0fbf47736b456218618f043a216c263ef SHA256 2afa2a54bd4ccb09e92f82b64bcafa95d39a404a3b3db9d6a5fcad0e0229857a -EBUILD poppler-0.12.3-r3.ebuild 2797 RMD160 a2d74a28b838620c667e35c6c49647e2245a6a23 SHA1 fc866bc9cc6a7b78a3314d7956acf2e5dce426dd SHA256 3c0a35d3227e7f15d64216e2056f06f6b3ceae90e82ca2b5d80e71e936e1705a -EBUILD poppler-0.12.3-r5.ebuild 2865 RMD160 f5cb89b8846b9e37ca7f3d1cfb5f4c71109bdaa4 SHA1 5fd7f52576161e8cbce48b7cf3803b3bc9e219a9 SHA256 b228a0750eee1ab4f8a911bb36c63a0cc869d682c1b2fdb4f6dadd18a9e50c48 -EBUILD poppler-0.12.4.ebuild 2964 RMD160 024a0031ff0a9c5e4ed1bee308ff025d856da1b9 SHA1 545f0180d88ed84da34875c35cc37f41a7f3c645 SHA256 f7597e76343796a06cc33e54892a86efa6a5a7d267218c2fb55e05ee9e88c2e3 -MISC ChangeLog 32511 RMD160 ccd5d4ed92355644ddf339f556cdd7c493f71505 SHA1 aa4d7d2db6df1381ea0a43898aceb53944178f00 SHA256 cfc2c3b99fd501af2274a50dd519ab3285e2516a6ec2e63197c26af91b2ccf0d -MISC metadata.xml 565 RMD160 6a9e714721911707b23fb27535d64ab92c90a5f8 SHA1 ca7711ec7b7d2953310ae3b00ff2f447371c103f SHA256 ec946c05ddfa21325d7cb705cee3342f4a95a1d08b02f324e4bac36bfc479e0b diff --git a/app-text/poppler/files/poppler-0.12.3-cairo-downscale.patch b/app-text/poppler/files/poppler-0.12.3-cairo-downscale.patch deleted file mode 100644 --- a/app-text/poppler/files/poppler-0.12.3-cairo-downscale.patch +++ /dev/null @@ -1,529 +0,0 @@ -diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc -index 9a0f3be..42ac3a8 100644 ---- a/poppler/CairoOutputDev.cc -+++ b/poppler/CairoOutputDev.cc -@@ -58,6 +58,7 @@ - #include - #include "CairoOutputDev.h" - #include "CairoFontEngine.h" -+#include "CairoRescaleBox.h" - //------------------------------------------------------------------------ - - // #define LOG_CAIRO -@@ -1331,6 +1332,82 @@ void CairoOutputDev::endMaskClip(GfxState *state) { - clearSoftMask(state); - } - -+cairo_surface_t *CairoOutputDev::downscaleSurface(cairo_surface_t *orig_surface) { -+ cairo_surface_t *dest_surface; -+ unsigned char *dest_buffer; -+ int dest_stride; -+ unsigned char *orig_buffer; -+ int orig_width, orig_height; -+ int orig_stride; -+ GBool res; -+ -+ if (printing) -+ return NULL; -+ -+ cairo_matrix_t matrix; -+ cairo_get_matrix(cairo, &matrix); -+ -+ /* this whole computation should be factored out */ -+ double xScale = matrix.xx; -+ double yScale = matrix.yy; -+ int tx, tx2, ty, ty2; /* the integer co-oridinates of the resulting image */ -+ int scaledHeight; -+ int scaledWidth; -+ if (xScale >= 0) { -+ tx = splashRound(matrix.x0 - 0.01); -+ tx2 = splashRound(matrix.x0 + xScale + 0.01) - 1; -+ } else { -+ tx = splashRound(matrix.x0 + 0.01) - 1; -+ tx2 = splashRound(matrix.x0 + xScale - 0.01); -+ } -+ scaledWidth = abs(tx2 - tx) + 1; -+ //scaledWidth = splashRound(fabs(xScale)); -+ if (scaledWidth == 0) { -+ // technically, this should draw nothing, but it generally seems -+ // better to draw a one-pixel-wide stripe rather than throwing it -+ // away -+ scaledWidth = 1; -+ } -+ if (yScale >= 0) { -+ ty = splashFloor(matrix.y0 + 0.01); -+ ty2 = splashCeil(matrix.y0 + yScale - 0.01); -+ } else { -+ ty = splashCeil(matrix.y0 - 0.01); -+ ty2 = splashFloor(matrix.y0 + yScale + 0.01); -+ } -+ scaledHeight = abs(ty2 - ty); -+ if (scaledHeight == 0) { -+ scaledHeight = 1; -+ } -+ -+ orig_width = cairo_image_surface_get_width (orig_surface); -+ orig_height = cairo_image_surface_get_height (orig_surface); -+ if (scaledWidth >= orig_width || scaledHeight >= orig_height) -+ return NULL; -+ -+ dest_surface = cairo_surface_create_similar (orig_surface, -+ cairo_surface_get_content (orig_surface), -+ scaledWidth, scaledHeight); -+ dest_buffer = cairo_image_surface_get_data (dest_surface); -+ dest_stride = cairo_image_surface_get_stride (dest_surface); -+ -+ orig_buffer = cairo_image_surface_get_data (orig_surface); -+ orig_stride = cairo_image_surface_get_stride (orig_surface); -+ -+ res = downscale_box_filter((uint32_t *)orig_buffer, -+ orig_stride, orig_width, orig_height, -+ scaledWidth, scaledHeight, 0, 0, -+ scaledWidth, scaledHeight, -+ (uint32_t *)dest_buffer, dest_stride); -+ if (!res) { -+ cairo_surface_destroy (dest_surface); -+ return NULL; -+ } -+ -+ return dest_surface; -+ -+} -+ - void CairoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, - int width, int height, GBool invert, - GBool interpolate, GBool inlineImg) { -@@ -2094,6 +2171,18 @@ void CairoOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, - } - gfree(lookup); - -+ cairo_surface_t *scaled_surface; -+ -+ scaled_surface = downscaleSurface (image); -+ if (scaled_surface) { -+ if (cairo_surface_status (scaled_surface)) -+ goto cleanup; -+ cairo_surface_destroy (image); -+ image = scaled_surface; -+ width = cairo_image_surface_get_width (image); -+ height = cairo_image_surface_get_height (image); -+ } -+ - cairo_surface_mark_dirty (image); - pattern = cairo_pattern_create_for_surface (image); - cairo_surface_destroy (image); -diff --git a/poppler/CairoOutputDev.h b/poppler/CairoOutputDev.h -index fb9c0d7..266f0cb 100644 ---- a/poppler/CairoOutputDev.h -+++ b/poppler/CairoOutputDev.h -@@ -268,6 +268,7 @@ public: - - protected: - void doPath(cairo_t *cairo, GfxState *state, GfxPath *path); -+ cairo_surface_t *downscaleSurface(cairo_surface_t *orig_surface); - - GfxRGB fill_color, stroke_color; - cairo_pattern_t *fill_pattern, *stroke_pattern; -diff --git a/poppler/CairoRescaleBox.cc b/poppler/CairoRescaleBox.cc -new file mode 100644 -index 0000000..dce5ddd ---- /dev/null -+++ b/poppler/CairoRescaleBox.cc -@@ -0,0 +1,352 @@ -+/* -*- Mode: c; c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t; -*- */ -+/* -+ * Copyright © 2009 Mozilla Corporation -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+ * documentation for any purpose is hereby granted without fee, provided that -+ * the above copyright notice appear in all copies and that both that -+ * copyright notice and this permission notice appear in supporting -+ * documentation, and that the name of Mozilla Corporation not be used in -+ * advertising or publicity pertaining to distribution of the software without -+ * specific, written prior permission. Mozilla Corporation makes no -+ * representations about the suitability of this software for any purpose. It -+ * is provided "as is" without express or implied warranty. -+ * -+ * MOZILLA CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT -+ * SHALL MOZILLA CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE -+ * OF THIS SOFTWARE. -+ * -+ * Author: Jeff Muizelaar, Mozilla Corp. -+ */ -+ -+/* This implements a box filter that supports non-integer box sizes */ -+ -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ -+#include -+#include -+#include -+#include -+#include -+#include "goo/gmem.h" -+#include "CairoRescaleBox.h" -+ -+typedef unsigned short int uint16_t; -+typedef unsigned int uint32_t; -+ -+/* we work in fixed point where 1. == 1 << 24 */ -+#define FIXED_SHIFT 24 -+ -+static void downsample_row_box_filter ( -+ int start, int width, -+ uint32_t *src, uint32_t *dest, -+ int coverage[], int pixel_coverage) -+{ -+ /* we need an array of the pixel contribution of each destination pixel on the boundaries. -+ * we invert the value to get the value on the other size of the box */ -+ /* -+ -+ value = a * contribution * 1/box_size -+ value += a * 1/box_size -+ value += a * 1/box_size -+ value += a * 1/box_size -+ value += a * (1 - contribution) * 1/box_size -+ a * (1/box_size - contribution * 1/box_size) -+ -+ box size is constant -+ -+ -+ value = a * contribtion_a * 1/box_size + b * contribution_b * 1/box_size -+ contribution_b = (1 - contribution_a) -+ = (1 - contribution_a_next) -+ */ -+ -+ /* box size = ceil(src_width/dest_width) */ -+ int x = 0; -+ -+ /* skip to start */ -+ /* XXX: it might be possible to do this directly instead of iteratively, however -+ * the iterative solution is simple */ -+ while (x < start) -+ { -+ int box = 1 << FIXED_SHIFT; -+ int start_coverage = coverage[x]; -+ box -= start_coverage; -+ src++; -+ while (box >= pixel_coverage) -+ { -+ src++; -+ box -= pixel_coverage; -+ } -+ x++; -+ } -+ -+ while (x < start + width) -+ { -+ uint32_t a = 0; -+ uint32_t r = 0; -+ uint32_t g = 0; -+ uint32_t b = 0; -+ int box = 1 << FIXED_SHIFT; -+ int start_coverage = coverage[x]; -+ -+ a = ((*src >> 24) & 0xff) * start_coverage; -+ r = ((*src >> 16) & 0xff) * start_coverage; -+ g = ((*src >> 8) & 0xff) * start_coverage; -+ b = ((*src >> 0) & 0xff) * start_coverage; -+ src++; -+ x++; -+ box -= start_coverage; -+ -+ while (box >= pixel_coverage) -+ { -+ a += ((*src >> 24) & 0xff) * pixel_coverage; -+ r += ((*src >> 16) & 0xff) * pixel_coverage; -+ g += ((*src >> 8) & 0xff) * pixel_coverage; -+ b += ((*src >> 0) & 0xff) * pixel_coverage; -+ src++; -+ -+ box -= pixel_coverage; -+ } -+ -+ /* multiply by whatever is leftover -+ * this ensures that we don't bias down. -+ * i.e. start_coverage + n*pixel_coverage + box == 1 << 24 */ -+ if (box > 0) -+ { -+ a += ((*src >> 24) & 0xff) * box; -+ r += ((*src >> 16) & 0xff) * box; -+ g += ((*src >> 8) & 0xff) * box; -+ b += ((*src >> 0) & 0xff) * box; -+ } -+ -+ a >>= FIXED_SHIFT; -+ r >>= FIXED_SHIFT; -+ g >>= FIXED_SHIFT; -+ b >>= FIXED_SHIFT; -+ -+ *dest = (a << 24) | (r << 16) | (g << 8) | b; -+ dest++; -+ } -+} -+ -+static void downsample_columns_box_filter ( -+ int n, -+ int start_coverage, -+ int pixel_coverage, -+ uint32_t *src, uint32_t *dest) -+{ -+ int stride = n; -+ while (n--) { -+ uint32_t a = 0; -+ uint32_t r = 0; -+ uint32_t g = 0; -+ uint32_t b = 0; -+ uint32_t *column_src = src; -+ int box = 1 << FIXED_SHIFT; -+ -+ a = ((*column_src >> 24) & 0xff) * start_coverage; -+ r = ((*column_src >> 16) & 0xff) * start_coverage; -+ g = ((*column_src >> 8) & 0xff) * start_coverage; -+ b = ((*column_src >> 0) & 0xff) * start_coverage; -+ column_src += stride; -+ box -= start_coverage; -+ -+ while (box >= pixel_coverage) -+ { -+ a += ((*column_src >> 24) & 0xff) * pixel_coverage; -+ r += ((*column_src >> 16) & 0xff) * pixel_coverage; -+ g += ((*column_src >> 8) & 0xff) * pixel_coverage; -+ b += ((*column_src >> 0) & 0xff) * pixel_coverage; -+ column_src += stride; -+ box -= pixel_coverage; -+ } -+ -+ if (box > 0) { -+ a += ((*column_src >> 24) & 0xff) * box; -+ r += ((*column_src >> 16) & 0xff) * box; -+ g += ((*column_src >> 8) & 0xff) * box; -+ b += ((*column_src >> 0) & 0xff) * box; -+ } -+ -+ a >>= FIXED_SHIFT; -+ r >>= FIXED_SHIFT; -+ g >>= FIXED_SHIFT; -+ b >>= FIXED_SHIFT; -+ -+ *dest = (a << 24) | (r << 16) | (g << 8) | b; -+ dest++; -+ src++; -+ } -+} -+ -+static int compute_coverage (int coverage[], int src_length, int dest_length) -+{ -+ int i; -+ /* num = src_length/dest_length -+ total = sum(pixel) / num -+ -+ pixel * 1/num == pixel * dest_length / src_length -+ */ -+ /* the average contribution of each source pixel */ -+ int ratio = ((1 << 24)*(long long int)dest_length)/src_length; -+ /* because ((1 << 24)*(long long int)dest_length) won't always be divisible by src_length -+ * we'll need someplace to put the other bits. -+ * -+ * We want to ensure a + n*ratio < 1<<24 -+ * -+ * 1<<24 -+ * */ -+ -+ double scale = (double)src_length/dest_length; -+ -+ /* for each destination pixel compute the coverage of the left most pixel included in the box */ -+ /* I have a proof of this, which this margin is too narrow to contain */ -+ for (i=0; i= i*scale -+ -+ floor((i+1)*scale) - ceil(i*scale) <= scale -+ -+ further since: floor((i+1)*scale) - ceil(i*scale) is an integer -+ -+ therefore: -+ floor((i+1)*scale) - ceil(i*scale) <= floor(scale) -+ */ -+ -+ if (left_fract == 0.) -+ count--; -+ -+ /* compute how much the right-most pixel contributes */ -+ overage = ratio*(right_fract); -+ -+ /* the remainder is the the amount that the left-most pixel -+ * contributes */ -+ coverage[i] = (1<<24) - (count * ratio + overage); -+ } -+ -+ return ratio; -+} -+ -+GBool downscale_box_filter(uint32_t *orig, int orig_stride, unsigned orig_width, unsigned orig_height, -+ signed scaled_width, signed scaled_height, -+ uint16_t start_column, uint16_t start_row, -+ uint16_t width, uint16_t height, -+ uint32_t *dest, int dst_stride) -+{ -+ int pixel_coverage_x, pixel_coverage_y; -+ int dest_y; -+ int src_y = 0; -+ uint32_t *scanline = orig; -+ int *x_coverage = NULL; -+ int *y_coverage = NULL; -+ uint32_t *temp_buf = NULL; -+ GBool retval = gFalse; -+ -+ x_coverage = (int *)gmallocn3 (orig_width, 1, sizeof(int)); -+ y_coverage = (int *)gmallocn3 (orig_height, 1, sizeof(int)); -+ -+ /* we need to allocate enough room for ceil(src_height/dest_height)+1 -+ Example: -+ src_height = 140 -+ dest_height = 50 -+ src_height/dest_height = 2.8 -+ -+ |-------------| 2.8 pixels -+ |----|----|----|----| 4 pixels -+ need to sample 3 pixels -+ -+ |-------------| 2.8 pixels -+ |----|----|----|----| 4 pixels -+ need to sample 4 pixels -+ */ -+ -+ temp_buf = (uint32_t *)gmallocn3 ((orig_height + scaled_height-1)/scaled_height+1, scaled_width, sizeof(uint32_t)); -+ -+ if (!x_coverage || !y_coverage || !scanline || !temp_buf) -+ goto cleanup; -+ -+ pixel_coverage_x = compute_coverage (x_coverage, orig_width, scaled_width); -+ pixel_coverage_y = compute_coverage (y_coverage, orig_height, scaled_height); -+ -+ assert (width + start_column <= scaled_width); -+ -+ /* skip the rows at the beginning */ -+ for (dest_y = 0; dest_y < start_row; dest_y++) -+ { -+ int box = 1 << FIXED_SHIFT; -+ int start_coverage_y = y_coverage[dest_y]; -+ box -= start_coverage_y; -+ src_y++; -+ while (box >= pixel_coverage_y) -+ { -+ box -= pixel_coverage_y; -+ src_y++; -+ } -+ } -+ -+ for (; dest_y < start_row + height; dest_y++) -+ { -+ int columns = 0; -+ int box = 1 << FIXED_SHIFT; -+ int start_coverage_y = y_coverage[dest_y]; -+ -+ scanline = orig + src_y * orig_stride / 4; -+ downsample_row_box_filter (start_column, width, scanline, temp_buf + width * columns, x_coverage, pixel_coverage_x); -+ columns++; -+ src_y++; -+ box -= start_coverage_y; -+ -+ while (box >= pixel_coverage_y) -+ { -+ scanline = orig + src_y * orig_stride / 4; -+ downsample_row_box_filter (start_column, width, scanline, temp_buf + width * columns, x_coverage, pixel_coverage_x); -+ columns++; -+ src_y++; -+ box -= pixel_coverage_y; -+ } -+ -+ /* downsample any leftovers */ -+ if (box > 0) -+ { -+ scanline = orig + src_y * orig_stride / 4; -+ downsample_row_box_filter (start_column, width, scanline, temp_buf + width * columns, x_coverage, pixel_coverage_x); -+ columns++; -+ } -+ -+ /* now scale the rows we just downsampled in the y direction */ -+ downsample_columns_box_filter (width, start_coverage_y, pixel_coverage_y, temp_buf, dest); -+ dest += dst_stride / 4; -+ -+// assert(width*columns <= ((orig_height + scaled_height-1)/scaled_height+1) * width); -+ } -+// assert (src_y<=orig_height); -+ -+ retval = gTrue; -+ -+cleanup: -+ free (x_coverage); -+ free (y_coverage); -+ free (temp_buf); -+ -+ return gTrue; -+} -diff --git a/poppler/CairoRescaleBox.h b/poppler/CairoRescaleBox.h -new file mode 100644 -index 0000000..5349c87 ---- /dev/null -+++ b/poppler/CairoRescaleBox.h -@@ -0,0 +1,12 @@ -+#ifndef CAIRO_RESCALE_BOX_H -+#define CAIRO_RESCALE_BOX_H -+ -+#include "goo/gtypes.h" -+ -+GBool downscale_box_filter(unsigned int *orig, int orig_stride, unsigned orig_width, unsigned orig_height, -+ signed scaled_width, signed scaled_height, -+ unsigned short int start_column, unsigned short int start_row, -+ unsigned short int width, unsigned short int height, -+ unsigned int *dest, int dst_stride); -+ -+#endif /* CAIRO_RESCALE_BOX_H */ -diff --git a/poppler/Makefile.am b/poppler/Makefile.am -index ec79e31..096ea76 100644 ---- a/poppler/Makefile.am -+++ b/poppler/Makefile.am -@@ -47,7 +47,9 @@ libpoppler_cairo_la_SOURCES = \ - CairoFontEngine.cc \ - CairoFontEngine.h \ - CairoOutputDev.cc \ -- CairoOutputDev.h -+ CairoOutputDev.h \ -+ CairoRescaleBox.cc \ -+ CairoRescaleBox.h - - endif - -diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt -index 6ed9523..ceef25e 100644 ---- a/glib/CMakeLists.txt -+++ b/glib/CMakeLists.txt -@@ -90,6 +90,7 @@ if (CAIRO_FOUND) - set(poppler_glib_SRCS ${poppler_glib_SRCS} - ${CMAKE_SOURCE_DIR}/poppler/CairoFontEngine.cc - ${CMAKE_SOURCE_DIR}/poppler/CairoOutputDev.cc -+ ${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc - ) - endif (CAIRO_FOUND) - add_library(poppler-glib SHARED ${poppler_glib_SRCS}) diff --git a/app-text/poppler/files/poppler-0.12.3-cmake-disable-tests.patch b/app-text/poppler/files/poppler-0.12.3-cmake-disable-tests.patch deleted file mode 100644 --- a/app-text/poppler/files/poppler-0.12.3-cmake-disable-tests.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 4fd0aae36004d48736673a8c6c40bb880e2e87e4 Mon Sep 17 00:00:00 2001 -From: Maciej Mrozowski -Date: Sat, 23 Jan 2010 06:51:16 +0100 -Subject: [PATCH] [CMake] Fix building with glib or Qt4 tests disabled. This is workaround to be honest and needs - poppler_add_test macro fixed - ---- - glib/CMakeLists.txt | 8 ++++---- - qt4/CMakeLists.txt | 6 ++++-- - test/CMakeLists.txt | 4 ++-- - 3 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt -index 6ed9523..c6b3922 100644 ---- a/glib/CMakeLists.txt -+++ b/glib/CMakeLists.txt -@@ -18,9 +18,9 @@ endif (GDK_FOUND) - - configure_file(poppler-features.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/poppler-features.h @ONLY) - --if (GTK_FOUND) -+if (GTK_FOUND AND BUILD_GTK_TESTS) - add_subdirectory(demo) --endif (GTK_FOUND) -+endif (GTK_FOUND AND BUILD_GTK_TESTS) - - set(poppler_glib_public_headers - poppler-action.h -@@ -107,11 +107,11 @@ install(FILES - DESTINATION include/poppler/glib) - - --if (GDK_FOUND) -+if (GDK_FOUND AND BUILD_GTK_TESTS) - set(test_poppler_glib_SRCS - test-poppler-glib.cc - ) - poppler_add_test(test-poppler-glib BUILD_GTK_TESTS ${test_poppler_glib_SRCS}) - target_link_libraries(test-poppler-glib poppler-glib ${GDK2_LIBRARIES}) --endif (GDK_FOUND) -+endif (GDK_FOUND AND BUILD_GTK_TESTS) - -diff --git a/qt4/CMakeLists.txt b/qt4/CMakeLists.txt -index a364abf..461ed77 100644 ---- a/qt4/CMakeLists.txt -+++ b/qt4/CMakeLists.txt -@@ -1,3 +1,5 @@ - add_subdirectory(src) --add_subdirectory(tests) --add_subdirectory(demos) -+if(BUILD_QT4_TESTS) -+ add_subdirectory(tests) -+ add_subdirectory(demos) -+endif(BUILD_QT4_TESTS) -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 478cb31..2c6ec36 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -10,7 +10,7 @@ if (ENABLE_SPLASH) - - endif (ENABLE_SPLASH) - --if (GTK_FOUND) -+if (GTK_FOUND AND BUILD_GTK_TESTS) - - add_definitions(${GTK2_CFLAGS}) - -@@ -41,7 +41,7 @@ if (GTK_FOUND) - - endif (HAVE_CAIRO) - --endif (GTK_FOUND) -+endif (GTK_FOUND AND BUILD_GTK_TESTS) - - set (pdf_fullrewrite_SRCS - pdf-fullrewrite.cc --- -1.6.4.4 - diff --git a/app-text/poppler/files/poppler-0.12.3-config.patch b/app-text/poppler/files/poppler-0.12.3-config.patch deleted file mode 100644 --- a/app-text/poppler/files/poppler-0.12.3-config.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff -urN poppler-0.12.3.sav/CMakeLists.txt poppler-0.12.3/CMakeLists.txt ---- poppler-0.12.3.sav/CMakeLists.txt 2009-12-24 11:50:12.000000000 +0100 -+++ poppler-0.12.3/CMakeLists.txt 2010-02-10 20:29:54.000000000 +0100 -@@ -33,7 +33,7 @@ - set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") - - # Enable these unconditionally. --set(MULTITHREAD ON) -+set(MULTITHREADED ON) - set(OPI_SUPPORT ON) - set(TEXTOUT_WORD_LIST ON) - -diff -urN poppler-0.12.3.sav/poppler/poppler-config.h poppler-0.12.3/poppler/poppler-config.h ---- poppler-0.12.3.sav/poppler/poppler-config.h 2009-12-24 11:51:39.000000000 +0100 -+++ poppler-0.12.3/poppler/poppler-config.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,91 +0,0 @@ --/* poppler/poppler-config.h. Generated from poppler-config.h.in by configure. */ --//================================================= -*- mode: c++ -*- ==== --// --// poppler-config.h --// --// Copyright 1996-2004 Glyph & Cog, LLC --// --//======================================================================== -- --#ifndef POPPLER_CONFIG_H --#define POPPLER_CONFIG_H -- --// We duplicate some of the config.h #define's here since they are --// used in some of the header files we install. The #ifndef/#endif --// around #undef look odd, but it's to silence warnings about --// redefining those symbols. -- --/* Enable multithreading support. */ --#ifndef MULTITHREADED --#define MULTITHREADED 1 --#endif -- --/* Enable exceptions. */ --#ifndef USE_EXCEPTIONS --/* #undef USE_EXCEPTIONS */ --#endif -- --/* Use fixedpoint. */ --#ifndef USE_FIXEDPOINT --/* #undef USE_FIXEDPOINT */ --#endif -- --/* Include support for OPI comments. */ --#ifndef OPI_SUPPORT --#define OPI_SUPPORT 1 --#endif -- --/* Enable word list support. */ --#ifndef TEXTOUT_WORD_LIST --#define TEXTOUT_WORD_LIST 1 --#endif -- --// Also, there's a couple of preprocessor symbols in the header files --// that are used but never defined: DISABLE_OUTLINE, DEBUG_MEM and -- --//------------------------------------------------------------------------ --// version --//------------------------------------------------------------------------ -- --// copyright notice --#define popplerCopyright "Copyright 2005-2009 The Poppler Developers - http://poppler.freedesktop.org" --#define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC" -- --//------------------------------------------------------------------------ --// popen --//------------------------------------------------------------------------ -- --#if defined(_MSC_VER) || defined(__BORLANDC__) --#define popen _popen --#define pclose _pclose --#endif -- --#if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(_WIN32) || defined(__DJGPP__) || defined(MACOS) --#define POPEN_READ_MODE "rb" --#else --#define POPEN_READ_MODE "r" --#endif -- --//------------------------------------------------------------------------ --// Win32 stuff --//------------------------------------------------------------------------ -- --#if defined(_WIN32) && !defined(_MSC_VER) --#include --#else --#define CDECL --#endif -- --//------------------------------------------------------------------------ --// Compiler --//------------------------------------------------------------------------ -- --#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) --#define GCC_PRINTF_FORMAT(fmt_index, va_index) \ -- __attribute__((__format__(__printf__, fmt_index, va_index))) --#else --#define GCC_PRINTF_FORMAT(fmt_index, va_index) --#endif -- -- --#endif /* POPPLER_CONFIG_H */ diff --git a/app-text/poppler/files/poppler-0.12.3-cxxflags.patch b/app-text/poppler/files/poppler-0.12.3-cxxflags.patch deleted file mode 100644 --- a/app-text/poppler/files/poppler-0.12.3-cxxflags.patch +++ /dev/null @@ -1,25 +0,0 @@ -Author: Nathan Phillip Brink -Purpose: Ensure that the CXXFLAGS environmental variable are properly communicated to cmake's unix driver. - ---- a/CMakeLists.txt 2010-03-13 16:29:25.000000000 -0500 -+++ b/CMakeLists.txt 2010-03-13 16:32:04.000000000 -0500 -@@ -127,7 +127,7 @@ - add_definitions(${DEFAULT_COMPILE_WARNINGS_YES}) - endif(_comp_warnings STREQUAL "yes") - if(_comp_warnings STREQUAL "kde") -- set(CMAKE_CXX_FLAGS "${DEFAULT_COMPILE_WARNINGS_KDE} ${CMAKE_CXX_FLAGS}") -+ add_definitions(${DEFAULT_COMPILE_WARNINGS_KDE}) - endif(_comp_warnings STREQUAL "kde") - - ---- a/cmake/modules/PopplerMacros.cmake Sat Mar 13 16:50:27 2010 -0500 -+++ b/cmake/modules/PopplerMacros.cmake Sat Mar 13 16:52:58 2010 -0500 -@@ -91,7 +91,7 @@ - set(DEFAULT_COMPILE_WARNINGS_YES "-Wall -Wno-write-strings") - set(DEFAULT_COMPILE_WARNINGS_KDE "-Wnon-virtual-dtor -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common") - -- set(CMAKE_CXX_FLAGS "-Woverloaded-virtual") -+ add_definitions(-Woverloaded-virtual) - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") - set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") - set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") diff --git a/app-text/poppler/files/poppler-0.12.3-darwin-gtk-link.patch b/app-text/poppler/files/poppler-0.12.3-darwin-gtk-link.patch deleted file mode 100644 --- a/app-text/poppler/files/poppler-0.12.3-darwin-gtk-link.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.freedesktop.org/show_bug.cgi?id=26442 - ---- glib/CMakeLists.txt -+++ glib/CMakeLists.txt -@@ -100,6 +100,9 @@ - if (CAIRO_FOUND) - target_link_libraries(poppler-glib ${CAIRO_LIBRARIES}) - endif (CAIRO_FOUND) -+if (GDK_FOUND) -+ target_link_libraries(poppler-glib ${GDK2_LIBRARIES}) -+endif (GDK_FOUND) - install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) - - install(FILES diff --git a/app-text/poppler/files/poppler-0.12.3-fix-headers-installation.patch b/app-text/poppler/files/poppler-0.12.3-fix-headers-installation.patch deleted file mode 100644 --- a/app-text/poppler/files/poppler-0.12.3-fix-headers-installation.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0cd32df..070be33 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -363,6 +363,11 @@ if(ENABLE_XPDF_HEADERS) - goo/FixedPoint.h - goo/gstrtod.h - DESTINATION include/poppler/goo) -+ if(PNG_FOUND) -+ install(FILES -+ goo/PNGWriter.h -+ DESTINATION include/poppler/goo) -+ endif(PNG_FOUND) - install(FILES - fofi/FoFiBase.h - fofi/FoFiEncodings.h - -diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt -index 6ed9523..9f5d0e7 100644 ---- a/glib/CMakeLists.txt -+++ b/glib/CMakeLists.txt -@@ -30,6 +30,7 @@ set(poppler_glib_public_headers - poppler-attachment.h - poppler-form-field.h - poppler-annot.h -+ poppler-layer.h - poppler.h - ) - -diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am -index 7e982e7..10ac221 100644 ---- a/qt4/src/Makefile.am -+++ b/qt4/src/Makefile.am -@@ -16,8 +16,7 @@ poppler_include_HEADERS = \ - poppler-form.h \ - poppler-optcontent.h \ - poppler-export.h \ -- poppler-page-transition.h \ -- poppler-page-transition-private.h -+ poppler-page-transition.h - - lib_LTLIBRARIES = libpoppler-qt4.la - diff --git a/app-text/poppler/files/poppler-0.12.3-gdk.patch b/app-text/poppler/files/poppler-0.12.3-gdk.patch deleted file mode 100644 --- a/app-text/poppler/files/poppler-0.12.3-gdk.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- glib/poppler-features.h.cmake.orig 2009-09-09 23:22:31.000000000 +0200 -+++ glib/poppler-features.h.cmake 2010-01-26 23:36:17.518737903 +0100 -@@ -20,6 +20,7 @@ - #define __POPPLER_FEATURES_H__ - - @CAIRO_FEATURE@ -+@GDK_FEATURE@ - - #define POPPLER_MAJOR_VERSION (@POPPLER_MAJOR_VERSION@) - #define POPPLER_MINOR_VERSION (@POPPLER_MINOR_VERSION@) ---- glib/CMakeLists.txt.orig 2010-01-26 23:40:40.719242931 +0100 -+++ glib/CMakeLists.txt 2010-01-26 23:48:30.107752041 +0100 -@@ -13,6 +13,7 @@ - endif (CAIRO_FOUND) - - if (GDK_FOUND) -+ set (GDK_FEATURE "#define POPPLER_WITH_GDK 1") - add_definitions(${GDK2_CFLAGS}) - endif (GDK_FOUND) - diff --git a/app-text/poppler/files/poppler-0.12.4-config.patch b/app-text/poppler/files/poppler-0.12.4-config.patch deleted file mode 100644 --- a/app-text/poppler/files/poppler-0.12.4-config.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff -urN poppler-0.12.3.sav/poppler/poppler-config.h poppler-0.12.3/poppler/poppler-config.h ---- poppler-0.12.3.sav/poppler/poppler-config.h 2009-12-24 11:51:39.000000000 +0100 -+++ poppler-0.12.3/poppler/poppler-config.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,91 +0,0 @@ --/* poppler/poppler-config.h. Generated from poppler-config.h.in by configure. */ --//================================================= -*- mode: c++ -*- ==== --// --// poppler-config.h --// --// Copyright 1996-2004 Glyph & Cog, LLC --// --//======================================================================== -- --#ifndef POPPLER_CONFIG_H --#define POPPLER_CONFIG_H -- --// We duplicate some of the config.h #define's here since they are --// used in some of the header files we install. The #ifndef/#endif --// around #undef look odd, but it's to silence warnings about --// redefining those symbols. -- --/* Enable multithreading support. */ --#ifndef MULTITHREADED --#define MULTITHREADED 1 --#endif -- --/* Enable exceptions. */ --#ifndef USE_EXCEPTIONS --/* #undef USE_EXCEPTIONS */ --#endif -- --/* Use fixedpoint. */ --#ifndef USE_FIXEDPOINT --/* #undef USE_FIXEDPOINT */ --#endif -- --/* Include support for OPI comments. */ --#ifndef OPI_SUPPORT --#define OPI_SUPPORT 1 --#endif -- --/* Enable word list support. */ --#ifndef TEXTOUT_WORD_LIST --#define TEXTOUT_WORD_LIST 1 --#endif -- --// Also, there's a couple of preprocessor symbols in the header files --// that are used but never defined: DISABLE_OUTLINE, DEBUG_MEM and -- --//------------------------------------------------------------------------ --// version --//------------------------------------------------------------------------ -- --// copyright notice --#define popplerCopyright "Copyright 2005-2009 The Poppler Developers - http://poppler.freedesktop.org" --#define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC" -- --//------------------------------------------------------------------------ --// popen --//------------------------------------------------------------------------ -- --#if defined(_MSC_VER) || defined(__BORLANDC__) --#define popen _popen --#define pclose _pclose --#endif -- --#if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(_WIN32) || defined(__DJGPP__) || defined(MACOS) --#define POPEN_READ_MODE "rb" --#else --#define POPEN_READ_MODE "r" --#endif -- --//------------------------------------------------------------------------ --// Win32 stuff --//------------------------------------------------------------------------ -- --#if defined(_WIN32) && !defined(_MSC_VER) --#include --#else --#define CDECL --#endif -- --//------------------------------------------------------------------------ --// Compiler --//------------------------------------------------------------------------ -- --#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) --#define GCC_PRINTF_FORMAT(fmt_index, va_index) \ -- __attribute__((__format__(__printf__, fmt_index, va_index))) --#else --#define GCC_PRINTF_FORMAT(fmt_index, va_index) --#endif -- -- --#endif /* POPPLER_CONFIG_H */ diff --git a/app-text/poppler/files/poppler-0.12.4-nanosleep-rt.patch b/app-text/poppler/files/poppler-0.12.4-nanosleep-rt.patch deleted file mode 100644 --- a/app-text/poppler/files/poppler-0.12.4-nanosleep-rt.patch +++ /dev/null @@ -1,43 +0,0 @@ -http://bugs.freedesktop.org/show_bug.cgi?id=26650 - -diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake -index 6049c9a..04de970 100644 ---- a/ConfigureChecks.cmake -+++ b/ConfigureChecks.cmake -@@ -49,3 +49,8 @@ check_for_dir("dirent.h" HAVE_DIRENT_H) - check_for_dir("ndir.h" HAVE_NDIR_H) - check_for_dir("sys/dir.h" HAVE_SYS_DIR_H) - check_for_dir("sys/ndir.h" HAVE_SYS_NDIR_H) -+ -+check_function_exists("nanosleep" HAVE_NANOSLEEP) -+if(NOT HAVE_NANOSLEEP) -+ check_library_exists("rt" "nanosleep" "" LIB_RT_HAS_NANOSLEEP) -+endif(NOT HAVE_NANOSLEEP) -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 2c6ec36..eada899 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -1,12 +1,17 @@ - - if (ENABLE_SPLASH) - -- set (perf_test_SRCS -- perf-test.cc -- perf-test-preview-dummy.cc -- ) -- add_executable(perf-test ${perf_test_SRCS}) -- target_link_libraries(perf-test poppler) -+ if (HAVE_NANOSLEEP OR LIB_RT_HAS_NANOSLEEP) -+ set (perf_test_SRCS -+ perf-test.cc -+ perf-test-preview-dummy.cc -+ ) -+ add_executable(perf-test ${perf_test_SRCS}) -+ target_link_libraries(perf-test poppler) -+ if (LIB_RT_HAS_NANOSLEEP) -+ target_link_libraries(perf-test rt) -+ endif (LIB_RT_HAS_NANOSLEEP) -+ endif (HAVE_NANOSLEEP OR LIB_RT_HAS_NANOSLEEP) - - endif (ENABLE_SPLASH) - diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml deleted file mode 100644 --- a/app-text/poppler/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - desktop-misc - kde - printing - - Enable support for app-office/abiword output. Requires dev-libs/libxml2. - Install xpdf headers. - Enable exceptions throwing. - Install command-line PDF converters and various utilities. - - diff --git a/app-text/poppler/poppler-0.12.3-r3.ebuild b/app-text/poppler/poppler-0.12.3-r3.ebuild deleted file mode 100644 --- a/app-text/poppler/poppler-0.12.3-r3.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.3-r3.ebuild,v 1.14 2010/03/11 22:07:20 yngwin Exp $ - -EAPI="2" - -inherit cmake-utils - -DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" -HOMEPAGE="http://poppler.freedesktop.org/" -SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+abiword cairo cjk debug doc exceptions jpeg jpeg2k +lcms png qt4 +utils +xpdf-headers" - -COMMON_DEPEND=">=media-libs/fontconfig-2.6.0 - >=media-libs/freetype-2.3.9 - sys-libs/zlib - abiword? ( dev-libs/libxml2:2 ) - cairo? ( dev-libs/glib:2 - >=x11-libs/cairo-1.8.4 - >=x11-libs/gtk+-2.14.0:2 ) - jpeg? ( >=media-libs/jpeg-7:0 ) - jpeg2k? ( media-libs/openjpeg ) - lcms? ( media-libs/lcms ) - png? ( media-libs/libpng ) - qt4? ( x11-libs/qt-core:4 - x11-libs/qt-gui:4 )" -DEPEND="${COMMON_DEPEND} - dev-util/pkgconfig" -RDEPEND="${COMMON_DEPEND} - !dev-libs/poppler - !dev-libs/poppler-glib - !dev-libs/poppler-qt3 - !dev-libs/poppler-qt4 - !app-text/poppler-utils - cjk? ( >=app-text/poppler-data-0.2.1 )" - -DOCS="AUTHORS ChangeLog NEWS README README-XPDF TODO" - -src_prepare() { - epatch "${FILESDIR}"/${P}-cmake-disable-tests.patch - epatch "${FILESDIR}"/${P}-fix-headers-installation.patch - epatch "${FILESDIR}"/${P}-gdk.patch - epatch "${FILESDIR}"/${P}-darwin-gtk-link.patch - epatch "${FILESDIR}"/${P}-config.patch #304407 - epatch "${FILESDIR}"/${P}-cxxflags.patch #309297 -} - -src_configure() { - mycmakeargs=( - -DBUILD_GTK_TESTS=OFF - -DBUILD_QT4_TESTS=OFF - -DWITH_Qt3=OFF - -DENABLE_SPLASH=ON - -DENABLE_ZLIB=ON - $(cmake-utils_use_enable abiword) - $(cmake-utils_use_enable lcms) - $(cmake-utils_use_enable jpeg2k LIBOPENJPEG) - $(cmake-utils_use_enable utils) - $(cmake-utils_use_enable xpdf-headers XPDF_HEADERS) - $(cmake-utils_use_with cairo) - $(cmake-utils_use_with cairo GTK) - $(cmake-utils_use_with jpeg) - $(cmake-utils_use_with png) - $(cmake-utils_use_with qt4) - $(cmake-utils_use exceptions USE_EXCEPTIONS) - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - if use cairo && use doc; then - # For now install gtk-doc there - insinto /usr/share/gtk-doc/html/poppler - doins -r "${S}"/glib/reference/html/* || die 'failed to install API documentation' - fi -} - -pkg_postinst() { - ewarn 'After upgrading app-text/poppler you may need to reinstall packages' - ewarn 'depending on it. If you have gentoolkit installed, you can find those' - ewarn 'with `equery d poppler`.' -} diff --git a/app-text/poppler/poppler-0.12.3-r5.ebuild b/app-text/poppler/poppler-0.12.3-r5.ebuild deleted file mode 100644 --- a/app-text/poppler/poppler-0.12.3-r5.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.3-r5.ebuild,v 1.2 2010/03/11 22:07:20 yngwin Exp $ - -EAPI="2" - -inherit cmake-utils - -DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" -HOMEPAGE="http://poppler.freedesktop.org/" -SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+abiword cairo cjk debug doc exceptions jpeg jpeg2k +lcms png qt4 +utils +xpdf-headers" - -COMMON_DEPEND=">=media-libs/fontconfig-2.6.0 - >=media-libs/freetype-2.3.9 - sys-libs/zlib - abiword? ( dev-libs/libxml2:2 ) - cairo? ( dev-libs/glib:2 - >=x11-libs/cairo-1.8.4 - >=x11-libs/gtk+-2.14.0:2 ) - jpeg? ( >=media-libs/jpeg-7:0 ) - jpeg2k? ( media-libs/openjpeg ) - lcms? ( media-libs/lcms ) - png? ( media-libs/libpng ) - qt4? ( x11-libs/qt-core:4 - x11-libs/qt-gui:4 )" -DEPEND="${COMMON_DEPEND} - dev-util/pkgconfig" -RDEPEND="${COMMON_DEPEND} - !dev-libs/poppler - !dev-libs/poppler-glib - !dev-libs/poppler-qt3 - !dev-libs/poppler-qt4 - !app-text/poppler-utils - cjk? ( >=app-text/poppler-data-0.2.1 )" - -DOCS="AUTHORS ChangeLog NEWS README README-XPDF TODO" - -src_prepare() { - epatch "${FILESDIR}"/${P}-cmake-disable-tests.patch - epatch "${FILESDIR}"/${P}-fix-headers-installation.patch - epatch "${FILESDIR}"/${P}-gdk.patch - epatch "${FILESDIR}"/${P}-darwin-gtk-link.patch - epatch "${FILESDIR}"/${P}-config.patch #304407 - epatch "${FILESDIR}"/${P}-cairo-downscale.patch #303817 - epatch "${FILESDIR}"/${P}-cxxflags.patch #309297 -} - -src_configure() { - mycmakeargs=( - -DBUILD_GTK_TESTS=OFF - -DBUILD_QT4_TESTS=OFF - -DWITH_Qt3=OFF - -DENABLE_SPLASH=ON - -DENABLE_ZLIB=ON - $(cmake-utils_use_enable abiword) - $(cmake-utils_use_enable lcms) - $(cmake-utils_use_enable jpeg2k LIBOPENJPEG) - $(cmake-utils_use_enable utils) - $(cmake-utils_use_enable xpdf-headers XPDF_HEADERS) - $(cmake-utils_use_with cairo) - $(cmake-utils_use_with cairo GTK) - $(cmake-utils_use_with jpeg) - $(cmake-utils_use_with png) - $(cmake-utils_use_with qt4) - $(cmake-utils_use exceptions USE_EXCEPTIONS) - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - if use cairo && use doc; then - # For now install gtk-doc there - insinto /usr/share/gtk-doc/html/poppler - doins -r "${S}"/glib/reference/html/* || die 'failed to install API documentation' - fi -} - -pkg_postinst() { - ewarn 'After upgrading app-text/poppler you may need to reinstall packages' - ewarn 'depending on it. If you have gentoolkit installed, you can find those' - ewarn 'with `equery d poppler`.' -} diff --git a/app-text/poppler/poppler-0.12.4.ebuild b/app-text/poppler/poppler-0.12.4.ebuild deleted file mode 100644 --- a/app-text/poppler/poppler-0.12.4.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4.ebuild,v 1.4 2010/03/11 22:07:19 yngwin Exp $ - -EAPI="2" - -inherit cmake-utils - -DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" -HOMEPAGE="http://poppler.freedesktop.org/" -SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+abiword cairo cjk debug doc exceptions jpeg jpeg2k +lcms png qt4 +utils +xpdf-headers" - -COMMON_DEPEND=">=media-libs/fontconfig-2.6.0 - >=media-libs/freetype-2.3.9 - sys-libs/zlib - abiword? ( dev-libs/libxml2:2 ) - cairo? ( dev-libs/glib:2 - >=x11-libs/cairo-1.8.4 - >=x11-libs/gtk+-2.14.0:2 ) - jpeg? ( >=media-libs/jpeg-7:0 ) - jpeg2k? ( media-libs/openjpeg ) - lcms? ( media-libs/lcms ) - png? ( media-libs/libpng ) - qt4? ( x11-libs/qt-core:4 - x11-libs/qt-gui:4 )" -DEPEND="${COMMON_DEPEND} - dev-util/pkgconfig" -RDEPEND="${COMMON_DEPEND} - !dev-libs/poppler - !dev-libs/poppler-glib - !dev-libs/poppler-qt3 - !dev-libs/poppler-qt4 - !app-text/poppler-utils - cjk? ( >=app-text/poppler-data-0.2.1 )" - -DOCS="AUTHORS ChangeLog NEWS README README-XPDF TODO" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.12.3-cmake-disable-tests.patch - epatch "${FILESDIR}"/${PN}-0.12.3-fix-headers-installation.patch - epatch "${FILESDIR}"/${PN}-0.12.3-gdk.patch - epatch "${FILESDIR}"/${PN}-0.12.3-darwin-gtk-link.patch - epatch "${FILESDIR}"/${P}-config.patch #304407 - epatch "${FILESDIR}"/${PN}-0.12.3-cairo-downscale.patch #303817 - epatch "${FILESDIR}"/${PN}-0.12.4-nanosleep-rt.patch - epatch "${FILESDIR}"/${PN}-0.12.3-cxxflags.patch #309297 -} - -src_configure() { - mycmakeargs=( - -DBUILD_GTK_TESTS=OFF - -DBUILD_QT4_TESTS=OFF - -DWITH_Qt3=OFF - -DENABLE_SPLASH=ON - -DENABLE_ZLIB=ON - $(cmake-utils_use_enable abiword) - $(cmake-utils_use_enable lcms) - $(cmake-utils_use_enable jpeg2k LIBOPENJPEG) - $(cmake-utils_use_enable utils) - $(cmake-utils_use_enable xpdf-headers XPDF_HEADERS) - $(cmake-utils_use_with cairo) - $(cmake-utils_use_with cairo GTK) - $(cmake-utils_use_with jpeg) - $(cmake-utils_use_with png) - $(cmake-utils_use_with qt4) - $(cmake-utils_use exceptions USE_EXCEPTIONS) - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - if use cairo && use doc; then - # For now install gtk-doc there - insinto /usr/share/gtk-doc/html/poppler - doins -r "${S}"/glib/reference/html/* || die 'failed to install API documentation' - fi -} - -pkg_postinst() { - ewarn 'After upgrading app-text/poppler you may need to reinstall packages' - ewarn 'depending on it. If you have gentoolkit installed, you can find those' - ewarn 'with `equery d poppler`.' -}