summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Loeser <halcy0n@gentoo.org>2006-01-05 04:01:53 +0000
committerMark Loeser <halcy0n@gentoo.org>2006-01-05 04:01:53 +0000
commit5f1997f58bcf183ebc33d9c7421fe0dd8c9e6fda (patch)
treee5bef271cfd20db1a860bed931f63be2e5187d4d /app-text
parentsh love (diff)
downloadgentoo-2-5f1997f58bcf183ebc33d9c7421fe0dd8c9e6fda.tar.gz
gentoo-2-5f1997f58bcf183ebc33d9c7421fe0dd8c9e6fda.tar.bz2
gentoo-2-5f1997f58bcf183ebc33d9c7421fe0dd8c9e6fda.zip
Remove the chunk from bug #116977, not needed for 0.4.2
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'app-text')
-rw-r--r--app-text/poppler/ChangeLog5
-rw-r--r--app-text/poppler/Manifest12
-rw-r--r--app-text/poppler/files/poppler-gcc41.patch12
3 files changed, 5 insertions, 24 deletions
diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 2d90a9aeda2c..00e8821e1dec 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-text/poppler
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.32 2006/01/03 22:59:49 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.33 2006/01/05 04:01:53 halcy0n Exp $
+
+ 05 Jan 2006; Mark Loeser <halcy0n@gentoo.org> files/poppler-gcc41.patch:
+ Remove the chunk from bug #116977, not needed for 0.4.2
*poppler-0.4.3-r3 (03 Jan 2006)
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 19d9f703a081..6473e05f6214 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 8535175adc50c631178eb62c255c09c6 ChangeLog 4435
MD5 9fcae20e4d0c670e6f53602e516991aa files/digest-poppler-0.3.0 65
MD5 9fcae20e4d0c670e6f53602e516991aa files/digest-poppler-0.3.0-r1 65
@@ -13,7 +10,7 @@ MD5 91f251deb3a322d16a5ea68576f1c9a9 files/digest-poppler-0.4.3-r3 137
MD5 3342aad1175b4b522f84e453999fbb05 files/poppler-0.4.1-cairo-ft.patch 470
MD5 c6805b961ecb2a526246a39bbff57f23 files/poppler-0.4.2-CAN-2005-3193.patch 3940
MD5 8b92823cdaec86c3cb5993440d95c306 files/poppler-0.4.3-gcc41.patch 479
-MD5 ce7b0785e0aca755f5840c802dd7fed8 files/poppler-gcc41.patch 1612
+MD5 f52250f6bc64f4201e663a46ed126f9b files/poppler-gcc41.patch 1131
MD5 580dbf31fbeac60b3e29d38fdeabc4f1 files/poppler-no-libjpeg.patch 773
MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
MD5 2638f0cdd789bc7e7ffd78e5b1555008 poppler-0.3.0-r1.ebuild 1019
@@ -24,10 +21,3 @@ MD5 aadc332cb628ee3dbee13cffc0682acf poppler-0.4.3-r1.ebuild 1467
MD5 23a4cfea729b004e919713beb75035a2 poppler-0.4.3-r2.ebuild 1377
MD5 56e58601b60af35c7a06bae16d88a4d4 poppler-0.4.3-r3.ebuild 1466
MD5 73581022e21e0c1521e08454a71ca131 poppler-0.4.3.ebuild 1350
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDu2fg2+ySkm8kpY0RAk+kAKCZbNe5XbgPWxH/Pwmi971kvMLN0QCguzAH
-G6tLyC4RB7a6iDnMy+WYsmY=
-=J/ih
------END PGP SIGNATURE-----
diff --git a/app-text/poppler/files/poppler-gcc41.patch b/app-text/poppler/files/poppler-gcc41.patch
index e21675c8bf16..d9df738848fc 100644
--- a/app-text/poppler/files/poppler-gcc41.patch
+++ b/app-text/poppler/files/poppler-gcc41.patch
@@ -39,15 +39,3 @@ Index: poppler-0.4.2/qt/poppler-qt.h
}
-http://bugs.gentoo.org/116977
---- poppler/utils/HtmlLinks.h
-+++ poppler/utils/HtmlLinks.h
-@@ -19,7 +19,7 @@
- HtmlLink& operator=(const HtmlLink& x);
- HtmlLink(double xmin,double ymin,double xmax,double ymax,GooString *_dest);
- ~HtmlLink();
-- GBool HtmlLink::isEqualDest(const HtmlLink& x) const;
-+ GBool isEqualDest(const HtmlLink& x) const;
- GooString *getDest(){return new GooString(dest);}
- double getX1() const {return Xmin;}
- double getX2() const {return Xmax;}