Fix patch thanks to Cosimo Cecchi <anarki@lilik.it> in bug 183232

Package-Manager: portage-2.1.3_rc6

3 files changed, 86 insertions, 104 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index e2b23aba0549..674a3e890f69 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.125 2007/06/24 09:13:51 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.126 2007/07/04 06:49:24 genstef Exp $
+
+  04 Jul 2007; Stefan Schweizer <genstef@gentoo.org>
+  files/poppler-0.5.9-header.patch:
+  Fix patch thanks to Cosimo Cecchi <anarki@lilik.it> in bug 183232
 
 *poppler-0.5.9-r1 (24 Jun 2007)
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index ea7365e5ddca..aebb3443c0d0 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -2,10 +2,10 @@ AUX 004_CVE-2007-0104.patch 2581 RMD160 d80464ee04cbbe88379a5c658fc78893515930ea
 MD5 be5c2646db5c46bc739ef12b0d7608a0 files/004_CVE-2007-0104.patch 2581
 RMD160 d80464ee04cbbe88379a5c658fc78893515930ea files/004_CVE-2007-0104.patch 2581
 SHA256 b29803552a7bebab86c5a93b77b2a1d6ceeace22929ed5050cbf98a91b14eb12 files/004_CVE-2007-0104.patch 2581
-AUX poppler-0.5.9-header.patch 2761 RMD160 7258467b651a96b5c434d0fa5ea335daac5fce72 SHA1 468f6f5e0e5588b326cf7c043fcb944a19fd39ed SHA256 2abd10863ef8a7e40c390c5ebaabb6fa8270ad91f54361dd6b4a849e4b684b1d
-MD5 a1bbeee6c0689000c4749328c5a9102e files/poppler-0.5.9-header.patch 2761
-RMD160 7258467b651a96b5c434d0fa5ea335daac5fce72 files/poppler-0.5.9-header.patch 2761
-SHA256 2abd10863ef8a7e40c390c5ebaabb6fa8270ad91f54361dd6b4a849e4b684b1d files/poppler-0.5.9-header.patch 2761
+AUX poppler-0.5.9-header.patch 2264 RMD160 38c71762143f4a4e696a67f63e888c4c8bf2b73b SHA1 dfad34dc104bfcc8b196e7faae76341ee4d3fc45 SHA256 6955bbb45227aa6c21675ef4ac71df9163190808567031c52de994ee00047118
+MD5 0d83ad0368c55eb6b3c1a2f785ca0bc1 files/poppler-0.5.9-header.patch 2264
+RMD160 38c71762143f4a4e696a67f63e888c4c8bf2b73b files/poppler-0.5.9-header.patch 2264
+SHA256 6955bbb45227aa6c21675ef4ac71df9163190808567031c52de994ee00047118 files/poppler-0.5.9-header.patch 2264
 DIST poppler-0.5.3.tar.gz 1049900 RMD160 3456de23955fc4001842c76d32deba308bd7f968 SHA1 e197f5cf56f0676b5ca313577dd6456a393c46ec SHA256 5cfabff39670610fa8f5c33da7b9b0ae89d445445be6d6c245cdce8bf3f24190
 DIST poppler-0.5.4.tar.gz 1062401 RMD160 f28c89b03388757067505df3c60a1d878626b0dd SHA1 edf4e4ff17ef86a7f60f097949ad7db53fa2c3b1 SHA256 ca0f880a4ff07391e99b443f0e7c9860241df6a6aaa327b9d811b358d94a29c9
 DIST poppler-0.5.9.tar.gz 1169002 RMD160 3aab75dfb1f4226048c23ed9b6f08fdb2608feb1 SHA1 8053ede1d7e3d30a3dd934b4d8738334f966004e SHA256 bee251e5149ac9dd8824aac316456b78a82f4e1954eb3c1a94db3625340ef61e
@@ -25,10 +25,10 @@ EBUILD poppler-0.5.9-r1.ebuild 1313 RMD160 5d2f162044df4e6435068e532d6bcd6df78fe
 MD5 2297c215bac133e4aecfe943307cc28a poppler-0.5.9-r1.ebuild 1313
 RMD160 5d2f162044df4e6435068e532d6bcd6df78febfa poppler-0.5.9-r1.ebuild 1313
 SHA256 3ed8435364c0c130b9a61cbf95c9f2437aa371a01c6404757a4156031d01897a poppler-0.5.9-r1.ebuild 1313
-MISC ChangeLog 16946 RMD160 c851263fcddc96aff66bab2633719ea739b2d2b4 SHA1 89c24994b7b3dbe31e78b9808f9a0e1199916004 SHA256 0d56885121c030945fb2a141fb886d320fdebbfccd64411a9d39727aa9c78ff0
-MD5 8beb1d5935ed4431ecd46618b120de46 ChangeLog 16946
-RMD160 c851263fcddc96aff66bab2633719ea739b2d2b4 ChangeLog 16946
-SHA256 0d56885121c030945fb2a141fb886d320fdebbfccd64411a9d39727aa9c78ff0 ChangeLog 16946
+MISC ChangeLog 17104 RMD160 0287da2164d4b02e621c8292d34c2d5c12b96aef SHA1 4d7b598804b9973b6b4844d0017689adc38ac5a4 SHA256 bb4bbc8513253c6a97850fdd6146571531b740a79597e1481d864ef0608fe1c2
+MD5 603b4429b2554d2a5e3e8c07bbbd78a1 ChangeLog 17104
+RMD160 0287da2164d4b02e621c8292d34c2d5c12b96aef ChangeLog 17104
+SHA256 bb4bbc8513253c6a97850fdd6146571531b740a79597e1481d864ef0608fe1c2 ChangeLog 17104
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
diff --git a/app-text/poppler/files/poppler-0.5.9-header.patch b/app-text/poppler/files/poppler-0.5.9-header.patch
index 612548be4213..9618ed098ae1 100644
--- a/app-text/poppler/files/poppler-0.5.9-header.patch
+++ b/app-text/poppler/files/poppler-0.5.9-header.patch
@@ -1,95 +1,73 @@
-https://bugs.freedesktop.org/show_bug.cgi?id=11243

-

-Index: poppler/SecurityHandler.h

-===================================================================

-RCS file: /cvs/poppler/poppler/poppler/SecurityHandler.h,v

-retrieving revision 1.2

-diff -u -r1.2 SecurityHandler.h

---- poppler/SecurityHandler.h	25 Apr 2007 19:59:10 -0000	1.2

-+++ poppler/SecurityHandler.h	13 Jun 2007 12:45:14 -0000

-@@ -9,7 +9,7 @@

- #ifndef SECURITYHANDLER_H

- #define SECURITYHANDLER_H

- 

--#include <config.h>

-+#include "poppler-config.h"

- 

- #ifdef USE_GCC_PRAGMAS

- #pragma interface

-Index: poppler/poppler-config.h.in

-===================================================================

-RCS file: /cvs/poppler/poppler/poppler/poppler-config.h.in,v

-retrieving revision 1.5

-diff -u -r1.5 poppler-config.h.in

---- poppler/poppler-config.h.in	23 Jan 2006 18:52:48 -0000	1.5

-+++ poppler/poppler-config.h.in	13 Jun 2007 12:45:15 -0000

-@@ -15,10 +15,20 @@

- // redefining those symbols.

- 

- /* Enable multithreading support. */

--#ifndef MULTITHREADING

-+#ifndef MULTITHREADED

- #undef MULTITHREADED

- #endif

- 

-+/* Enable exceptions. */

-+#ifndef USE_EXCEPTIONS

-+#undef USE_EXCEPTIONS

-+#endif

-+

-+/* Use fixedpoint. */

-+#ifndef USE_FIXEDPOINT

-+#undef USE_FIXEDPOINT

-+#endif

-+

- /* Full path for the system-wide xpdfrc file. */

- #ifndef SYSTEM_XPDFRC

- #undef SYSTEM_XPDFRC

-Index: goo/gmem.h

-===================================================================

-RCS file: /cvs/poppler/poppler/goo/gmem.h,v

-retrieving revision 1.5

-diff -u -r1.5 gmem.h

---- goo/gmem.h	25 Apr 2007 19:59:10 -0000	1.5

-+++ goo/gmem.h	13 Jun 2007 12:45:14 -0000

-@@ -10,7 +10,7 @@

- #define GMEM_H

- 

- #include <stdio.h>

--#include <config.h>

-+#include <poppler/poppler-config.h>

- 

- #if USE_EXCEPTIONS

- 

-Index: goo/FixedPoint.h

-===================================================================

-RCS file: /cvs/poppler/poppler/goo/FixedPoint.h,v

-retrieving revision 1.3

-diff -u -r1.3 FixedPoint.h

---- goo/FixedPoint.h	25 Apr 2007 19:59:10 -0000	1.3

-+++ goo/FixedPoint.h	13 Jun 2007 12:45:14 -0000

-@@ -11,7 +11,7 @@

- #ifndef FIXEDPOINT_H

- #define FIXEDPOINT_H

- 

--#include <config.h>

-+#include <poppler/poppler-config.h>

- 

- #if USE_FIXEDPOINT

- 

-Index: utils/ImageOutputDev.h

-===================================================================

-RCS file: /cvs/poppler/poppler/utils/ImageOutputDev.h,v

-retrieving revision 1.2

-diff -u -r1.2 ImageOutputDev.h

---- utils/ImageOutputDev.h	22 May 2006 19:58:41 -0000	1.2

-+++ utils/ImageOutputDev.h	13 Jun 2007 12:45:15 -0000

-@@ -9,7 +9,7 @@

- #ifndef IMAGEOUTPUTDEV_H

- #define IMAGEOUTPUTDEV_H

- 

--#include <poppler-config.h>

-+#include <poppler/poppler-config.h>

- 

- #ifdef USE_GCC_PRAGMAS

- #pragma interface

+diff -Naur poppler-0.5.9.orig/goo/FixedPoint.h poppler-0.5.9/goo/FixedPoint.h
+--- poppler-0.5.9.orig/goo/FixedPoint.h	2007-03-30 20:57:17.000000000 +0200
++++ poppler-0.5.9/goo/FixedPoint.h	2007-06-26 00:50:03.000000000 +0200
+@@ -11,7 +11,7 @@
+ #ifndef FIXEDPOINT_H
+ #define FIXEDPOINT_H
+ 
+-#include <config.h>
++#include <poppler/poppler-config.h>
+ 
+ #if USE_FIXEDPOINT
+ 
+diff -Naur poppler-0.5.9.orig/goo/gmem.h poppler-0.5.9/goo/gmem.h
+--- poppler-0.5.9.orig/goo/gmem.h	2007-04-01 01:17:26.000000000 +0200
++++ poppler-0.5.9/goo/gmem.h	2007-06-26 00:49:35.000000000 +0200
+@@ -10,7 +10,7 @@
+ #define GMEM_H
+ 
+ #include <stdio.h>
+-#include <config.h>
++#include <poppler/poppler-config.h>
+ 
+ #if USE_EXCEPTIONS
+ 
+diff -Naur poppler-0.5.9.orig/poppler/poppler-config.h.in poppler-0.5.9/poppler/poppler-config.h.in
+--- poppler-0.5.9.orig/poppler/poppler-config.h.in	2007-05-30 20:33:56.000000000 +0200
++++ poppler-0.5.9/poppler/poppler-config.h.in	2007-06-26 00:48:56.000000000 +0200
+@@ -15,10 +15,20 @@
+ // redefining those symbols.
+ 
+ /* Enable multithreading support. */
+-#ifndef MULTITHREADING
++#ifndef MULTITHREADED
+ #undef MULTITHREADED
+ #endif
+ 
++/* Enable exceptions. */
++#ifndef USE_EXCEPTIONS
++#undef USE_EXCEPTIONS
++#endif
++
++/* Use fixedpoint. */
++#ifndef USE_FIXEDPOINT
++#undef USE_FIXEDPOINT
++#endif
++
+ /* Full path for the system-wide xpdfrc file. */
+ #ifndef SYSTEM_XPDFRC
+ #undef SYSTEM_XPDFRC
+diff -Naur poppler-0.5.9.orig/poppler/SecurityHandler.h poppler-0.5.9/poppler/SecurityHandler.h
+--- poppler-0.5.9.orig/poppler/SecurityHandler.h	2007-04-05 01:11:52.000000000 +0200
++++ poppler-0.5.9/poppler/SecurityHandler.h	2007-06-26 00:47:40.000000000 +0200
+@@ -9,7 +9,7 @@
+ #ifndef SECURITYHANDLER_H
+ #define SECURITYHANDLER_H
+ 
+-#include <config.h>
++#include "poppler-config.h"
+ 
+ #ifdef USE_GCC_PRAGMAS
+ #pragma interface
+diff -Naur poppler-0.5.9.orig/utils/ImageOutputDev.h poppler-0.5.9/utils/ImageOutputDev.h
+--- poppler-0.5.9.orig/utils/ImageOutputDev.h	2007-02-01 21:01:00.000000000 +0100
++++ poppler-0.5.9/utils/ImageOutputDev.h	2007-06-26 00:50:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ #ifndef IMAGEOUTPUTDEV_H
+ #define IMAGEOUTPUTDEV_H
+ 
+-#include <poppler-config.h>
++#include <poppler/poppler-config.h>
+ 
+ #ifdef USE_GCC_PRAGMAS
+ #pragma interface