| 1 |
the_paya 10/04/25 17:37:04 |
| 2 |
|
| 3 |
Added: poppler-0.12.4-xopen_source.patch |
| 4 |
poppler-0.12.4-strings_h.patch |
| 5 |
Log: |
| 6 |
Apply patch from upstream wrt bug #314925 with revbump. |
| 7 |
(Portage version: 2.2_rc67/cvs/FreeBSD i386) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-text/poppler/files/poppler-0.12.4-xopen_source.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/files/poppler-0.12.4-xopen_source.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/files/poppler-0.12.4-xopen_source.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: poppler-0.12.4-xopen_source.patch |
| 16 |
=================================================================== |
| 17 |
From a8d43ec1c7f5448a7f63d9bbd9062d56ee1c7c58 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Albert Astals Cid <aacid@×××.org> |
| 19 |
Date: Wed, 14 Apr 2010 18:21:33 +0000 |
| 20 |
Subject: update XOPEN_SOURCE to 600 in non standard compile options |
| 21 |
|
| 22 |
it seems helps compiling on some BSD |
| 23 |
See also https://bugs.freedesktop.org/show_bug.cgi?id=27610 |
| 24 |
and http://bugs.gentoo.org/show_bug.cgi?id=314925 |
| 25 |
|
| 26 |
--- poppler-0.12.4.orig/cmake/modules/PopplerMacros.cmake |
| 27 |
+++ poppler-0.12.4/cmake/modules/PopplerMacros.cmake |
| 28 |
@@ -88,7 +88,7 @@ |
| 29 |
if(CMAKE_COMPILER_IS_GNUCXX) |
| 30 |
set(CMAKE_C_FLAGS "-Wall -Wno-write-strings -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common ${CMAKE_C_FLAGS}") |
| 31 |
set(CMAKE_CXX_FLAGS "-Wall -Woverloaded-virtual -Wno-write-strings -Wnon-virtual-dtor -Wno-long-long -Wundef -ansi -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-check-new -fno-common ${CMAKE_CXX_FLAGS}") |
| 32 |
- add_definitions(-D_XOPEN_SOURCE=500 -D_BSD_SOURCE) |
| 33 |
+ add_definitions(-D_XOPEN_SOURCE=600 -D_BSD_SOURCE) |
| 34 |
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") |
| 35 |
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") |
| 36 |
set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") |
| 37 |
--- poppler-0.12.4.orig/configure.ac |
| 38 |
+++ poppler-0.12.4/configure.ac |
| 39 |
@@ -512,7 +512,7 @@ |
| 40 |
no) ;; |
| 41 |
yes) CXXFLAGS="-Wall -Wno-write-strings -Woverloaded-virtual $CXXFLAGS" ;; |
| 42 |
kde) CXXFLAGS="-Wnon-virtual-dtor -Wno-long-long -Wundef -ansi \ |
| 43 |
- -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align \ |
| 44 |
+ -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align \ |
| 45 |
-Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith \ |
| 46 |
-Wwrite-strings -O2 -Wformat-security \ |
| 47 |
-Wmissing-format-attribute -fno-exceptions -fno-check-new \ |
| 48 |
|
| 49 |
|
| 50 |
|
| 51 |
1.1 app-text/poppler/files/poppler-0.12.4-strings_h.patch |
| 52 |
|
| 53 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/files/poppler-0.12.4-strings_h.patch?rev=1.1&view=markup |
| 54 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/files/poppler-0.12.4-strings_h.patch?rev=1.1&content-type=text/plain |
| 55 |
|
| 56 |
Index: poppler-0.12.4-strings_h.patch |
| 57 |
=================================================================== |
| 58 |
From 4cce1f14e964edf1bf2d9fb8286ee002a67dc212 Mon Sep 17 00:00:00 2001 |
| 59 |
From: Albert Astals Cid <aacid@×××.org> |
| 60 |
Date: Tue, 13 Apr 2010 20:57:16 +0000 |
| 61 |
Subject: include strings.h on non windows platforms |
| 62 |
|
| 63 |
See also https://bugs.freedesktop.org/show_bug.cgi?id=27610 |
| 64 |
and http://bugs.gentoo.org/show_bug.cgi?id=314925 |
| 65 |
--- |
| 66 |
diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc |
| 67 |
index 09a1b20..bf79585 100644 |
| 68 |
--- a/poppler/GlobalParams.cc |
| 69 |
+++ b/poppler/GlobalParams.cc |
| 70 |
@@ -68,6 +68,8 @@ |
| 71 |
|
| 72 |
#ifdef _WIN32 |
| 73 |
# define strcasecmp stricmp |
| 74 |
+#else |
| 75 |
+# include <strings.h> |
| 76 |
#endif |
| 77 |
|
| 78 |
#if MULTITHREADED |
| 79 |
diff --git a/test/perf-test.cc b/test/perf-test.cc |
| 80 |
index a11a377..6d6961e 100644 |
| 81 |
--- a/test/perf-test.cc |
| 82 |
+++ b/test/perf-test.cc |
| 83 |
@@ -22,6 +22,8 @@ |
| 84 |
|
| 85 |
#ifdef _WIN32 |
| 86 |
#include <windows.h> |
| 87 |
+#else |
| 88 |
+#include <strings.h> |
| 89 |
#endif |
| 90 |
|
| 91 |
// Define COPY_FILE if you want the file to be copied to a local disk first |
| 92 |
-- |
| 93 |
cgit v0.8.3-6-g21f6 |
Archives