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

(Portage version: 2.1.3_rc6)

2 files changed, 78 insertions, 96 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/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