Gentoo Archives: gentoo-commits

From: "Ben de Groot (yngwin)" <yngwin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-text/poppler/files: poppler-0.12.3-config.patch
Date: Thu, 11 Feb 2010 00:30:55
Message-Id: E1NfMxH-0007yH-Gm@stork.gentoo.org
1 yngwin 10/02/11 00:30:51
2
3 Added: poppler-0.12.3-config.patch
4 Log:
5 Add small patch for typo in configuration (bug 304407). Add ewarn to prompt users to recompile reverse dependencies (bug 304035).
6 (Portage version: 2.2_rc62/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 app-text/poppler/files/poppler-0.12.3-config.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/files/poppler-0.12.3-config.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/files/poppler-0.12.3-config.patch?rev=1.1&content-type=text/plain
13
14 Index: poppler-0.12.3-config.patch
15 ===================================================================
16 diff -urN poppler-0.12.3.sav/CMakeLists.txt poppler-0.12.3/CMakeLists.txt
17 --- poppler-0.12.3.sav/CMakeLists.txt 2009-12-24 11:50:12.000000000 +0100
18 +++ poppler-0.12.3/CMakeLists.txt 2010-02-10 20:29:54.000000000 +0100
19 @@ -33,7 +33,7 @@
20 set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
21
22 # Enable these unconditionally.
23 -set(MULTITHREAD ON)
24 +set(MULTITHREADED ON)
25 set(OPI_SUPPORT ON)
26 set(TEXTOUT_WORD_LIST ON)
27
28 diff -urN poppler-0.12.3.sav/poppler/poppler-config.h poppler-0.12.3/poppler/poppler-config.h
29 --- poppler-0.12.3.sav/poppler/poppler-config.h 2009-12-24 11:51:39.000000000 +0100
30 +++ poppler-0.12.3/poppler/poppler-config.h 1970-01-01 01:00:00.000000000 +0100
31 @@ -1,91 +0,0 @@
32 -/* poppler/poppler-config.h. Generated from poppler-config.h.in by configure. */
33 -//================================================= -*- mode: c++ -*- ====
34 -//
35 -// poppler-config.h
36 -//
37 -// Copyright 1996-2004 Glyph & Cog, LLC
38 -//
39 -//========================================================================
40 -
41 -#ifndef POPPLER_CONFIG_H
42 -#define POPPLER_CONFIG_H
43 -
44 -// We duplicate some of the config.h #define's here since they are
45 -// used in some of the header files we install. The #ifndef/#endif
46 -// around #undef look odd, but it's to silence warnings about
47 -// redefining those symbols.
48 -
49 -/* Enable multithreading support. */
50 -#ifndef MULTITHREADED
51 -#define MULTITHREADED 1
52 -#endif
53 -
54 -/* Enable exceptions. */
55 -#ifndef USE_EXCEPTIONS
56 -/* #undef USE_EXCEPTIONS */
57 -#endif
58 -
59 -/* Use fixedpoint. */
60 -#ifndef USE_FIXEDPOINT
61 -/* #undef USE_FIXEDPOINT */
62 -#endif
63 -
64 -/* Include support for OPI comments. */
65 -#ifndef OPI_SUPPORT
66 -#define OPI_SUPPORT 1
67 -#endif
68 -
69 -/* Enable word list support. */
70 -#ifndef TEXTOUT_WORD_LIST
71 -#define TEXTOUT_WORD_LIST 1
72 -#endif
73 -
74 -// Also, there's a couple of preprocessor symbols in the header files
75 -// that are used but never defined: DISABLE_OUTLINE, DEBUG_MEM and
76 -
77 -//------------------------------------------------------------------------
78 -// version
79 -//------------------------------------------------------------------------
80 -
81 -// copyright notice
82 -#define popplerCopyright "Copyright 2005-2009 The Poppler Developers - http://poppler.freedesktop.org"
83 -#define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC"
84 -
85 -//------------------------------------------------------------------------
86 -// popen
87 -//------------------------------------------------------------------------
88 -
89 -#if defined(_MSC_VER) || defined(__BORLANDC__)
90 -#define popen _popen
91 -#define pclose _pclose
92 -#endif
93 -
94 -#if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(_WIN32) || defined(__DJGPP__) || defined(MACOS)
95 -#define POPEN_READ_MODE "rb"
96 -#else
97 -#define POPEN_READ_MODE "r"
98 -#endif
99 -
100 -//------------------------------------------------------------------------
101 -// Win32 stuff
102 -//------------------------------------------------------------------------
103 -
104 -#if defined(_WIN32) && !defined(_MSC_VER)
105 -#include <windef.h>
106 -#else
107 -#define CDECL
108 -#endif
109 -
110 -//------------------------------------------------------------------------
111 -// Compiler
112 -//------------------------------------------------------------------------
113 -
114 -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
115 -#define GCC_PRINTF_FORMAT(fmt_index, va_index) \
116 - __attribute__((__format__(__printf__, fmt_index, va_index)))
117 -#else
118 -#define GCC_PRINTF_FORMAT(fmt_index, va_index)
119 -#endif
120 -
121 -
122 -#endif /* POPPLER_CONFIG_H */