From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E18571580B2 for ; Wed, 1 Sep 2021 21:26:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E434E07A5; Wed, 1 Sep 2021 21:26:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 08CC4E07A5 for ; Wed, 1 Sep 2021 21:26:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A60BB335D3B for ; Wed, 1 Sep 2021 21:26:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D96107E for ; Wed, 1 Sep 2021 21:26:43 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1630531594.2030dfe101fec90b8503dca57f3d087b4795fafb.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/poppler/files/poppler-9999-respect-cflags.patch app-text/poppler/poppler-9999.ebuild X-VCS-Directories: app-text/poppler/ app-text/poppler/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2030dfe101fec90b8503dca57f3d087b4795fafb X-VCS-Branch: master Date: Wed, 1 Sep 2021 21:26:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b50fde18-2fe9-4b4b-85e9-9b46c56d241c X-Archives-Hash: 777f8175846df94516e6d74b47fde91d commit: 2030dfe101fec90b8503dca57f3d087b4795fafb Author: Sam James gentoo org> AuthorDate: Wed Sep 1 21:22:43 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Sep 1 21:26:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2030dfe1 app-text/poppler: rebase cflags patch for live ebuild User needed to test some patches upstream in the git repo so had to rebase this patch. Can be renamed when the next release is presumably cut rather soon. Thanks-to: Stefan Radermacher zaister.de> Signed-off-by: Sam James gentoo.org> .../files/poppler-9999-respect-cflags.patch | 116 +++++++++++++++++++++ app-text/poppler/poppler-9999.ebuild | 2 +- 2 files changed, 117 insertions(+), 1 deletion(-) diff --git a/app-text/poppler/files/poppler-9999-respect-cflags.patch b/app-text/poppler/files/poppler-9999-respect-cflags.patch new file mode 100644 index 00000000000..08eb5beed26 --- /dev/null +++ b/app-text/poppler/files/poppler-9999-respect-cflags.patch @@ -0,0 +1,116 @@ +This can be renamed on the next version after 21.08.0. User wanted to test +some patches committed upstream so ended up needing to rebase this patch. + +From a9f54d7c37b2b738767d757517466768a9f5a8fe Mon Sep 17 00:00:00 2001 +From: Theo Anderson +Date: Wed, 14 Apr 2021 10:16:11 +1200 +Subject: [PATCH] build: respect cflags + +[Rebased by: Stefan Radermacher ] +Signed-off-by: Theo Anderson +--- a/cmake/modules/PopplerMacros.cmake ++++ b/cmake/modules/PopplerMacros.cmake +@@ -87,20 +87,15 @@ set(_known_build_types RELWITHDEBINFO;RELEASE;DEBUG;DEBUGFULL;PROFILE) + # CMake toolchain file). To avoid surprising compilation errors, we emit an + # error in that case, so that the user can handle the passed CMAKE_BUILD_TYPE + # in the compiler flags logic below. +-if (NOT "${_CMAKE_BUILD_TYPE_UPPER}" IN_LIST _known_build_types) +- message(FATAL_ERROR "Unsupported CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") +-endif() + set(_save_cflags "${CMAKE_C_FLAGS}") + set(_save_cxxflags "${CMAKE_CXX_FLAGS}") + + if(CMAKE_COMPILER_IS_GNUCXX) +- # set the default compile warnings + set(_warn "-Wall -Wextra -Wpedantic") + set(_warn "${_warn} -Wno-unused-parameter") + set(_warn "${_warn} -Wcast-align") + 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") +@@ -116,20 +111,6 @@ if(CMAKE_COMPILER_IS_GNUCXX) + + set(DEFAULT_COMPILE_WARNINGS "${_warn}") + set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") +- +- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE") +- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") +- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") +- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") +- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") +- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") +- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") +- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") +- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG") +- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") +- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") +- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") +- + 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") +@@ -139,56 +120,8 @@ if(CMAKE_COMPILER_IS_GNUCXX) + set(_compiler_flags_changed 1) + endif (CMAKE_COMPILER_IS_GNUCXX) + +-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") +-# set the default compile warnings +- set(_warn "-Wall -Wextra -Wpedantic") +- set(_warn "${_warn} -Wno-unused-parameter") +- set(_warn "${_warn} -Wcast-align") +- set(_warn "${_warn} -Wformat-security") +- set(_warn "${_warn} -Wframe-larger-than=65536") +- set(_warn "${_warn} -Wmissing-format-attribute") +- set(_warn "${_warn} -Wnon-virtual-dtor") +- set(_warn "${_warn} -Woverloaded-virtual") +- set(_warn "${_warn} -Wmissing-declarations") +- set(_warn "${_warn} -Wundef") +- set(_warn "${_warn} -Wzero-as-null-pointer-constant") +- set(_warn "${_warn} -Wshadow") +- set(_warn "${_warn} -Wweak-vtables") +- +- # set extra warnings +- set(_warnx "${_warnx} -Wconversion") +- +- set(DEFAULT_COMPILE_WARNINGS "${_warn}") +- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") +- +- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") +- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") +- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") +- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 +- set(CMAKE_CXX_FLAGS_DEBUG "-g") +- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") +- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") +- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") +- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") +- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG") +- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 +- set(CMAKE_C_FLAGS_DEBUG "-g") +- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") +- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") +- set(_compiler_flags_changed 1) +-endif() +- +-if(CMAKE_C_COMPILER MATCHES "icc") +- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") +- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") +- set(CMAKE_CXX_FLAGS_DEBUG "-O2 -g -0b0 -noalign") +- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g -Ob0 -noalign") +- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") +- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG") +- set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign") +- set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign") +- set(_compiler_flags_changed 1) +-endif(CMAKE_C_COMPILER MATCHES "icc") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual") ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") + + if(_compiler_flags_changed) + # Ensure that the previous CMAKE_{C,CXX}_FLAGS are included in the current configuration flags. +-- +2.33.0 + diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild index be72663ad68..9151fd10198 100644 --- a/app-text/poppler/poppler-9999.ebuild +++ b/app-text/poppler/poppler-9999.ebuild @@ -61,7 +61,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF ) PATCHES=( "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" - "${FILESDIR}/${PN}-21.04.0-respect-cflags.patch" + "${FILESDIR}/${PN}-9999-respect-cflags.patch" "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" )