[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/
Date: Wed, 21 Apr 2021 13:10:45 +0000 (UTC)	[thread overview]
Message-ID: <1619010635.0fd92e2a9596191195ebd06d964e164a88a2f21a.polynomial-c@gentoo> (raw)

commit:     0fd92e2a9596191195ebd06d964e164a88a2f21a
Author:     Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Tue Apr 13 22:24:42 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 13:10:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fd92e2a

app-text/poppler: update respect-cflags patch

fix building on clang by restoring additions of -Wl,--as-needed

Closes: https://bugs.gentoo.org/782721
Signed-off-by: Theo Anderson <telans <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/20370
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 ....patch => poppler-21.04.0-respect-cflags.patch} | 45 +++++++++++++---------
 app-text/poppler/poppler-21.02.0.ebuild            |  2 +-
 app-text/poppler/poppler-21.03.0.ebuild            |  2 +-
 app-text/poppler/poppler-21.04.0.ebuild            |  2 +-
 app-text/poppler/poppler-9999.ebuild               |  2 +-
 5 files changed, 31 insertions(+), 22 deletions(-)

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
similarity index 81%
rename from app-text/poppler/files/poppler-20.12.0-respect-cflags.patch
rename to app-text/poppler/files/poppler-21.04.0-respect-cflags.patch
index 4b389faa7d6..8781bbec5bb 100644
--- a/app-text/poppler/files/poppler-20.12.0-respect-cflags.patch
+++ b/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch
@@ -1,17 +1,18 @@
-From 37f8326557eeb291d78a866d5ff78d79b32f6f8b Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 2 Dec 2020 09:29:33 +0100
+From a9f54d7c37b2b738767d757517466768a9f5a8fe Mon Sep 17 00:00:00 2001
+From: Theo Anderson <telans@posteo.de>
+Date: Wed, 14 Apr 2021 10:16:11 +1200
 Subject: [PATCH] build: respect cflags
 
+Signed-off-by: Theo Anderson <telans@posteo.de>
 ---
- cmake/modules/PopplerMacros.cmake | 81 +------------------------------
- 1 file changed, 2 insertions(+), 79 deletions(-)
+ cmake/modules/PopplerMacros.cmake | 77 ++-----------------------------
+ 1 file changed, 4 insertions(+), 73 deletions(-)
 
 diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
-index 707e7497..882cf11b 100644
+index fe1182da..b77eaa3e 100644
 --- a/cmake/modules/PopplerMacros.cmake
 +++ b/cmake/modules/PopplerMacros.cmake
-@@ -79,8 +79,6 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+@@ -79,14 +79,11 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
    set(CMAKE_BUILD_TYPE RelWithDebInfo)
  endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
  
@@ -20,10 +21,17 @@ index 707e7497..882cf11b 100644
    set(_warn "-Wall -Wextra -Wpedantic")
    set(_warn "${_warn} -Wno-unused-parameter")
    set(_warn "${_warn} -Wcast-align")
-@@ -105,80 +103,5 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+   set(_warn "${_warn} -Wformat-security")
+   set(_warn "${_warn} -Wframe-larger-than=65536")
+-  set(_warn "${_warn} -Wlogical-op")
+   set(_warn "${_warn} -Wmissing-format-attribute")
+   set(_warn "${_warn} -Wnon-virtual-dtor")
+   set(_warn "${_warn} -Woverloaded-virtual")
+@@ -102,22 +99,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ 
    set(DEFAULT_COMPILE_WARNINGS "${_warn}")
    set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
- 
+-
 -  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
 -  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
 -  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
@@ -39,14 +47,15 @@ index 707e7497..882cf11b 100644
 -  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
 -  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
 -
--  poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
--  if(GCC_HAS_AS_NEEDED)
--    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
--    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
--    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
--  endif(GCC_HAS_AS_NEEDED)
--endif (CMAKE_COMPILER_IS_GNUCXX)
--
++  
++if(CMAKE_COMPILER_IS_GNUCXX)
+   poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
+   if(GCC_HAS_AS_NEEDED)
+     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
+@@ -126,57 +109,5 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+   endif(GCC_HAS_AS_NEEDED)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ 
 -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 -# set the default compile warnings
 -  set(_warn "-Wall -Wextra -Wpedantic")
@@ -104,5 +113,5 @@ index 707e7497..882cf11b 100644
 +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
 +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
 -- 
-2.29.2
+2.31.1
 

diff --git a/app-text/poppler/poppler-21.02.0.ebuild b/app-text/poppler/poppler-21.02.0.ebuild
index d24ddd8550f..05b6d08ed7b 100644
--- a/app-text/poppler/poppler-21.02.0.ebuild
+++ b/app-text/poppler/poppler-21.02.0.ebuild
@@ -58,7 +58,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
 )
 

diff --git a/app-text/poppler/poppler-21.03.0.ebuild b/app-text/poppler/poppler-21.03.0.ebuild
index 8c97e95774b..a412059ff2a 100644
--- a/app-text/poppler/poppler-21.03.0.ebuild
+++ b/app-text/poppler/poppler-21.03.0.ebuild
@@ -58,7 +58,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
 )
 

diff --git a/app-text/poppler/poppler-21.04.0.ebuild b/app-text/poppler/poppler-21.04.0.ebuild
index 08508522271..e3bf1e313d8 100644
--- a/app-text/poppler/poppler-21.04.0.ebuild
+++ b/app-text/poppler/poppler-21.04.0.ebuild
@@ -58,7 +58,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
 )
 

diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 08508522271..e3bf1e313d8 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -58,7 +58,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
 )

next             reply	other threads:[~2021-04-21 13:10 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-21 13:10 Lars Wendler [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-13 22:45 [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/ Andreas Sturmlechner
2024-01-18 16:45 Andreas Sturmlechner
2023-06-18 14:35 Andreas Sturmlechner
2022-02-05 20:46 Andreas Sturmlechner
2021-12-12 18:48 Sam James
2021-09-01 21:26 Sam James
2021-04-06 11:06 Andreas Sturmlechner
2020-12-02 10:02 Lars Wendler
2020-05-14 17:21 Andreas Sturmlechner
2019-09-01 20:43 Andreas Sturmlechner
2018-11-03 21:46 Andreas Sturmlechner
2018-01-09 10:15 Andreas Sturmlechner
2017-12-27 23:26 Andreas Sturmlechner
2017-12-04 14:29 Lars Wendler
2017-11-24 23:08 Andreas Sturmlechner
2017-11-24 23:08 Andreas Sturmlechner
2017-11-24 23:08 Andreas Sturmlechner
2017-11-13 10:23 Lars Wendler
2017-11-07 15:07 Lars Wendler
2017-11-06 15:29 Lars Wendler
2017-05-30 19:47 Andreas Hüttel
2017-05-10 15:12 Lars Wendler
2016-12-21 17:11 Johannes Huber

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:4b389faa7d dfblob:8781bbec5b dfblob:d24ddd8550
dfblob:05b6d08ed7 dfblob:8c97e95774 dfblob:a412059ff2 dfblob:0850852227
dfblob:e3bf1e313d dfblob:0850852227 dfblob:e3bf1e313d )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1619010635.0fd92e2a9596191195ebd06d964e164a88a2f21a.polynomial-c@gentoo \
    --to=polynomial-c@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox