1 |
commit: 2030dfe101fec90b8503dca57f3d087b4795fafb |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 1 21:22:43 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 1 21:26:34 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2030dfe1 |
7 |
|
8 |
app-text/poppler: rebase cflags patch for live ebuild |
9 |
|
10 |
User needed to test some patches upstream in the |
11 |
git repo so had to rebase this patch. Can be renamed |
12 |
when the next release is presumably cut rather soon. |
13 |
|
14 |
Thanks-to: Stefan Radermacher <gentoo <AT> zaister.de> |
15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
16 |
|
17 |
.../files/poppler-9999-respect-cflags.patch | 116 +++++++++++++++++++++ |
18 |
app-text/poppler/poppler-9999.ebuild | 2 +- |
19 |
2 files changed, 117 insertions(+), 1 deletion(-) |
20 |
|
21 |
diff --git a/app-text/poppler/files/poppler-9999-respect-cflags.patch b/app-text/poppler/files/poppler-9999-respect-cflags.patch |
22 |
new file mode 100644 |
23 |
index 00000000000..08eb5beed26 |
24 |
--- /dev/null |
25 |
+++ b/app-text/poppler/files/poppler-9999-respect-cflags.patch |
26 |
@@ -0,0 +1,116 @@ |
27 |
+This can be renamed on the next version after 21.08.0. User wanted to test |
28 |
+some patches committed upstream so ended up needing to rebase this patch. |
29 |
+ |
30 |
+From a9f54d7c37b2b738767d757517466768a9f5a8fe Mon Sep 17 00:00:00 2001 |
31 |
+From: Theo Anderson <telans@××××××.de> |
32 |
+Date: Wed, 14 Apr 2021 10:16:11 +1200 |
33 |
+Subject: [PATCH] build: respect cflags |
34 |
+ |
35 |
+[Rebased by: Stefan Radermacher <gentoo@×××××××.de>] |
36 |
+Signed-off-by: Theo Anderson <telans@××××××.de> |
37 |
+--- a/cmake/modules/PopplerMacros.cmake |
38 |
++++ b/cmake/modules/PopplerMacros.cmake |
39 |
+@@ -87,20 +87,15 @@ set(_known_build_types RELWITHDEBINFO;RELEASE;DEBUG;DEBUGFULL;PROFILE) |
40 |
+ # CMake toolchain file). To avoid surprising compilation errors, we emit an |
41 |
+ # error in that case, so that the user can handle the passed CMAKE_BUILD_TYPE |
42 |
+ # in the compiler flags logic below. |
43 |
+-if (NOT "${_CMAKE_BUILD_TYPE_UPPER}" IN_LIST _known_build_types) |
44 |
+- message(FATAL_ERROR "Unsupported CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") |
45 |
+-endif() |
46 |
+ set(_save_cflags "${CMAKE_C_FLAGS}") |
47 |
+ set(_save_cxxflags "${CMAKE_CXX_FLAGS}") |
48 |
+ |
49 |
+ if(CMAKE_COMPILER_IS_GNUCXX) |
50 |
+- # set the default compile warnings |
51 |
+ set(_warn "-Wall -Wextra -Wpedantic") |
52 |
+ set(_warn "${_warn} -Wno-unused-parameter") |
53 |
+ set(_warn "${_warn} -Wcast-align") |
54 |
+ set(_warn "${_warn} -Wformat-security") |
55 |
+ set(_warn "${_warn} -Wframe-larger-than=65536") |
56 |
+- set(_warn "${_warn} -Wlogical-op") |
57 |
+ set(_warn "${_warn} -Wmissing-format-attribute") |
58 |
+ set(_warn "${_warn} -Wnon-virtual-dtor") |
59 |
+ set(_warn "${_warn} -Woverloaded-virtual") |
60 |
+@@ -116,20 +111,6 @@ if(CMAKE_COMPILER_IS_GNUCXX) |
61 |
+ |
62 |
+ set(DEFAULT_COMPILE_WARNINGS "${_warn}") |
63 |
+ set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") |
64 |
+- |
65 |
+- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE") |
66 |
+- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") |
67 |
+- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") |
68 |
+- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") |
69 |
+- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") |
70 |
+- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") |
71 |
+- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") |
72 |
+- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") |
73 |
+- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG") |
74 |
+- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") |
75 |
+- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") |
76 |
+- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") |
77 |
+- |
78 |
+ poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED) |
79 |
+ if(GCC_HAS_AS_NEEDED) |
80 |
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed") |
81 |
+@@ -139,56 +120,8 @@ if(CMAKE_COMPILER_IS_GNUCXX) |
82 |
+ set(_compiler_flags_changed 1) |
83 |
+ endif (CMAKE_COMPILER_IS_GNUCXX) |
84 |
+ |
85 |
+-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") |
86 |
+-# set the default compile warnings |
87 |
+- set(_warn "-Wall -Wextra -Wpedantic") |
88 |
+- set(_warn "${_warn} -Wno-unused-parameter") |
89 |
+- set(_warn "${_warn} -Wcast-align") |
90 |
+- set(_warn "${_warn} -Wformat-security") |
91 |
+- set(_warn "${_warn} -Wframe-larger-than=65536") |
92 |
+- set(_warn "${_warn} -Wmissing-format-attribute") |
93 |
+- set(_warn "${_warn} -Wnon-virtual-dtor") |
94 |
+- set(_warn "${_warn} -Woverloaded-virtual") |
95 |
+- set(_warn "${_warn} -Wmissing-declarations") |
96 |
+- set(_warn "${_warn} -Wundef") |
97 |
+- set(_warn "${_warn} -Wzero-as-null-pointer-constant") |
98 |
+- set(_warn "${_warn} -Wshadow") |
99 |
+- set(_warn "${_warn} -Wweak-vtables") |
100 |
+- |
101 |
+- # set extra warnings |
102 |
+- set(_warnx "${_warnx} -Wconversion") |
103 |
+- |
104 |
+- set(DEFAULT_COMPILE_WARNINGS "${_warn}") |
105 |
+- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") |
106 |
+- |
107 |
+- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") |
108 |
+- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") |
109 |
+- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") |
110 |
+- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 |
111 |
+- set(CMAKE_CXX_FLAGS_DEBUG "-g") |
112 |
+- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") |
113 |
+- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") |
114 |
+- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") |
115 |
+- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") |
116 |
+- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG") |
117 |
+- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 |
118 |
+- set(CMAKE_C_FLAGS_DEBUG "-g") |
119 |
+- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") |
120 |
+- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") |
121 |
+- set(_compiler_flags_changed 1) |
122 |
+-endif() |
123 |
+- |
124 |
+-if(CMAKE_C_COMPILER MATCHES "icc") |
125 |
+- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") |
126 |
+- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") |
127 |
+- set(CMAKE_CXX_FLAGS_DEBUG "-O2 -g -0b0 -noalign") |
128 |
+- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g -Ob0 -noalign") |
129 |
+- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") |
130 |
+- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG") |
131 |
+- set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign") |
132 |
+- set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign") |
133 |
+- set(_compiler_flags_changed 1) |
134 |
+-endif(CMAKE_C_COMPILER MATCHES "icc") |
135 |
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual") |
136 |
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") |
137 |
+ |
138 |
+ if(_compiler_flags_changed) |
139 |
+ # Ensure that the previous CMAKE_{C,CXX}_FLAGS are included in the current configuration flags. |
140 |
+-- |
141 |
+2.33.0 |
142 |
+ |
143 |
|
144 |
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild |
145 |
index be72663ad68..9151fd10198 100644 |
146 |
--- a/app-text/poppler/poppler-9999.ebuild |
147 |
+++ b/app-text/poppler/poppler-9999.ebuild |
148 |
@@ -61,7 +61,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF ) |
149 |
|
150 |
PATCHES=( |
151 |
"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" |
152 |
- "${FILESDIR}/${PN}-21.04.0-respect-cflags.patch" |
153 |
+ "${FILESDIR}/${PN}-9999-respect-cflags.patch" |
154 |
"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" |
155 |
) |