poppler gcc41 fix

Package-Manager: portage-2.0.53_rc7

4 files changed, 53 insertions, 7 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index b16f38a51b33..98a358d46038 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.15 2005/10/31 16:39:50 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.16 2005/11/29 21:27:18 hanno Exp $
+
+  29 Nov 2005; Hanno Boeck <hanno@gentoo.org> +files/poppler-gcc41.patch,
+  poppler-0.4.2.ebuild:
+  Fix for gcc 4.1.
 
   31 Oct 2005; <dang@gentoo.org> poppler-0.4.2.ebuild:
   Add cairo flag back, now cairo is out of mask
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index f58a87dcb748..58fb12a589c6 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,23 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 115fe1e5686e2023e19e628dccbb5ec0 ChangeLog 1958
+MD5 3ea6fdf5c15d9a49a1d01a4af0de7c42 ChangeLog 2077
 MD5 9fcae20e4d0c670e6f53602e516991aa files/digest-poppler-0.3.0 65
 MD5 25675c998a475fcdd58b64313df002b5 files/digest-poppler-0.3.2 65
 MD5 ffa0dcdb55709d044c7cefd7da512fe8 files/digest-poppler-0.3.3 65
 MD5 ff3789d555c986604a49249f0df50c8a files/digest-poppler-0.4.1 65
 MD5 be62fc9641cde65e89b62b2a629bb617 files/digest-poppler-0.4.2 65
 MD5 3342aad1175b4b522f84e453999fbb05 files/poppler-0.4.1-cairo-ft.patch 470
+MD5 569ab87015257d03b6ab6cedb4bcdbec files/poppler-gcc41.patch 1130
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 2775f0555069e7375c82e6898951cc98 poppler-0.3.0.ebuild 860
 MD5 0f47305adf0da4f94dc6ef03291cd175 poppler-0.3.2.ebuild 941
 MD5 d2c3a8a3ea5a2609eaf2289b3995dea4 poppler-0.3.3.ebuild 939
 MD5 d7a0327f479e0afd0bd13cd6cbf00f89 poppler-0.4.1.ebuild 1073
-MD5 ba437d3c7fdbe0399796ca89227c573c poppler-0.4.2.ebuild 1342
+MD5 0a4aeea8b99f0bde18dd89db5fc6d313 poppler-0.4.2.ebuild 1383
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDZkoGomPajV0RnrERAk/WAJ0YObempeMWrrhcb8ryqR390ruThgCfQWuQ
-pP2X9LVv6XJ0uZKsJzhwe/M=
-=H4B0
+iD8DBQFDjMfQr2QksT29OyARAsxoAJwPoJ8IKpUAQArn2sDRMS3VO5jFJQCgnHHf
+anG6OSUDmiaK3eJGjnQfxyw=
+=j5Tp
 -----END PGP SIGNATURE-----
diff --git a/app-text/poppler/files/poppler-gcc41.patch b/app-text/poppler/files/poppler-gcc41.patch
new file mode 100644
index 000000000000..2c37da268d28
--- /dev/null
+++ b/app-text/poppler/files/poppler-gcc41.patch
@@ -0,0 +1,40 @@
+Index: poppler-0.4.2/poppler/TextOutputDev.cc
+===================================================================
+--- poppler-0.4.2.orig/poppler/TextOutputDev.cc
++++ poppler-0.4.2/poppler/TextOutputDev.cc
+@@ -3025,7 +3025,7 @@ public:
+   virtual void visitWord (TextWord *word, int begin, int end,
+ 			  PDFRectangle *selection) { };
+ 
+-  GooString *TextSelectionDumper::getText(void);
++  GooString *getText(void);
+ 
+ private:
+   TextLineFrag *frags;
+Index: poppler-0.4.2/qt/poppler-qt.h
+===================================================================
+--- poppler-0.4.2.orig/qt/poppler-qt.h
++++ poppler-0.4.2/qt/poppler-qt.h
+@@ -150,7 +150,7 @@ public:
+     UseOC
+   };
+   
+-  static Document *Document::load(const QString & filePath);
++  static Document *load(const QString & filePath);
+   
+   Page *getPage(int index) const{ return new Page(this, index); }
+   
+@@ -172,11 +172,11 @@ public:
+   bool okToAddNotes() const;
+   double getPDFVersion() const;
+   
+-  Document::~Document();
++  ~Document();
+   
+ private:
+   DocumentData *data;
+-  Document::Document(DocumentData *dataA);
++  Document(DocumentData *dataA);
+ };
+ 
+ }
diff --git a/app-text/poppler/poppler-0.4.2.ebuild b/app-text/poppler/poppler-0.4.2.ebuild
index a546284bc241..4a8d398b58ea 100644
--- a/app-text/poppler/poppler-0.4.2.ebuild
+++ b/app-text/poppler/poppler-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.4.2.ebuild,v 1.2 2005/10/31 16:39:50 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.4.2.ebuild,v 1.3 2005/11/29 21:27:18 hanno Exp $
 
 inherit eutils autotools
 
@@ -30,6 +30,7 @@ src_unpack(){
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/poppler-0.4.1-cairo-ft.patch
+	epatch ${FILESDIR}/poppler-gcc41.patch
 	eautoreconf
 }