Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/
Date: Wed, 21 Apr 2021 13:10:49
Message-Id: 1619010635.0fd92e2a9596191195ebd06d964e164a88a2f21a.polynomial-c@gentoo
1 commit: 0fd92e2a9596191195ebd06d964e164a88a2f21a
2 Author: Theo Anderson <telans <AT> posteo <DOT> de>
3 AuthorDate: Tue Apr 13 22:24:42 2021 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 21 13:10:35 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fd92e2a
7
8 app-text/poppler: update respect-cflags patch
9
10 fix building on clang by restoring additions of -Wl,--as-needed
11
12 Closes: https://bugs.gentoo.org/782721
13 Signed-off-by: Theo Anderson <telans <AT> posteo.de>
14 Closes: https://github.com/gentoo/gentoo/pull/20370
15 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
16
17 ....patch => poppler-21.04.0-respect-cflags.patch} | 45 +++++++++++++---------
18 app-text/poppler/poppler-21.02.0.ebuild | 2 +-
19 app-text/poppler/poppler-21.03.0.ebuild | 2 +-
20 app-text/poppler/poppler-21.04.0.ebuild | 2 +-
21 app-text/poppler/poppler-9999.ebuild | 2 +-
22 5 files changed, 31 insertions(+), 22 deletions(-)
23
24 diff --git a/app-text/poppler/files/poppler-20.12.0-respect-cflags.patch b/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch
25 similarity index 81%
26 rename from app-text/poppler/files/poppler-20.12.0-respect-cflags.patch
27 rename to app-text/poppler/files/poppler-21.04.0-respect-cflags.patch
28 index 4b389faa7d6..8781bbec5bb 100644
29 --- a/app-text/poppler/files/poppler-20.12.0-respect-cflags.patch
30 +++ b/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch
31 @@ -1,17 +1,18 @@
32 -From 37f8326557eeb291d78a866d5ff78d79b32f6f8b Mon Sep 17 00:00:00 2001
33 -From: Lars Wendler <polynomial-c@g.o>
34 -Date: Wed, 2 Dec 2020 09:29:33 +0100
35 +From a9f54d7c37b2b738767d757517466768a9f5a8fe Mon Sep 17 00:00:00 2001
36 +From: Theo Anderson <telans@××××××.de>
37 +Date: Wed, 14 Apr 2021 10:16:11 +1200
38 Subject: [PATCH] build: respect cflags
39
40 +Signed-off-by: Theo Anderson <telans@××××××.de>
41 ---
42 - cmake/modules/PopplerMacros.cmake | 81 +------------------------------
43 - 1 file changed, 2 insertions(+), 79 deletions(-)
44 + cmake/modules/PopplerMacros.cmake | 77 ++-----------------------------
45 + 1 file changed, 4 insertions(+), 73 deletions(-)
46
47 diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
48 -index 707e7497..882cf11b 100644
49 +index fe1182da..b77eaa3e 100644
50 --- a/cmake/modules/PopplerMacros.cmake
51 +++ b/cmake/modules/PopplerMacros.cmake
52 -@@ -79,8 +79,6 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
53 +@@ -79,14 +79,11 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
54 set(CMAKE_BUILD_TYPE RelWithDebInfo)
55 endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
56
57 @@ -20,10 +21,17 @@ index 707e7497..882cf11b 100644
58 set(_warn "-Wall -Wextra -Wpedantic")
59 set(_warn "${_warn} -Wno-unused-parameter")
60 set(_warn "${_warn} -Wcast-align")
61 -@@ -105,80 +103,5 @@ if(CMAKE_COMPILER_IS_GNUCXX)
62 + set(_warn "${_warn} -Wformat-security")
63 + set(_warn "${_warn} -Wframe-larger-than=65536")
64 +- set(_warn "${_warn} -Wlogical-op")
65 + set(_warn "${_warn} -Wmissing-format-attribute")
66 + set(_warn "${_warn} -Wnon-virtual-dtor")
67 + set(_warn "${_warn} -Woverloaded-virtual")
68 +@@ -102,22 +99,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
69 +
70 set(DEFAULT_COMPILE_WARNINGS "${_warn}")
71 set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
72 -
73 +-
74 - set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
75 - set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
76 - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
77 @@ -39,14 +47,15 @@ index 707e7497..882cf11b 100644
78 - set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cflags}")
79 - set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
80 -
81 -- poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
82 -- if(GCC_HAS_AS_NEEDED)
83 -- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
84 -- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
85 -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
86 -- endif(GCC_HAS_AS_NEEDED)
87 --endif (CMAKE_COMPILER_IS_GNUCXX)
88 --
89 ++
90 ++if(CMAKE_COMPILER_IS_GNUCXX)
91 + poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
92 + if(GCC_HAS_AS_NEEDED)
93 + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
94 +@@ -126,57 +109,5 @@ if(CMAKE_COMPILER_IS_GNUCXX)
95 + endif(GCC_HAS_AS_NEEDED)
96 + endif (CMAKE_COMPILER_IS_GNUCXX)
97 +
98 -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
99 -# set the default compile warnings
100 - set(_warn "-Wall -Wextra -Wpedantic")
101 @@ -104,5 +113,5 @@ index 707e7497..882cf11b 100644
102 +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
103 +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
104 --
105 -2.29.2
106 +2.31.1
107
108
109 diff --git a/app-text/poppler/poppler-21.02.0.ebuild b/app-text/poppler/poppler-21.02.0.ebuild
110 index d24ddd8550f..05b6d08ed7b 100644
111 --- a/app-text/poppler/poppler-21.02.0.ebuild
112 +++ b/app-text/poppler/poppler-21.02.0.ebuild
113 @@ -58,7 +58,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF )
114
115 PATCHES=(
116 "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
117 - "${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
118 + "${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
119 "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
120 )
121
122
123 diff --git a/app-text/poppler/poppler-21.03.0.ebuild b/app-text/poppler/poppler-21.03.0.ebuild
124 index 8c97e95774b..a412059ff2a 100644
125 --- a/app-text/poppler/poppler-21.03.0.ebuild
126 +++ b/app-text/poppler/poppler-21.03.0.ebuild
127 @@ -58,7 +58,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF )
128
129 PATCHES=(
130 "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
131 - "${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
132 + "${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
133 "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
134 )
135
136
137 diff --git a/app-text/poppler/poppler-21.04.0.ebuild b/app-text/poppler/poppler-21.04.0.ebuild
138 index 08508522271..e3bf1e313d8 100644
139 --- a/app-text/poppler/poppler-21.04.0.ebuild
140 +++ b/app-text/poppler/poppler-21.04.0.ebuild
141 @@ -58,7 +58,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF )
142
143 PATCHES=(
144 "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
145 - "${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
146 + "${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
147 "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
148 )
149
150
151 diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
152 index 08508522271..e3bf1e313d8 100644
153 --- a/app-text/poppler/poppler-9999.ebuild
154 +++ b/app-text/poppler/poppler-9999.ebuild
155 @@ -58,7 +58,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF )
156
157 PATCHES=(
158 "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
159 - "${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
160 + "${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
161 "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
162 )
Report Message
Find on MARC Find on Google Groups