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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9ADFF15A7D9 for ; Tue, 14 Mar 2023 22:46:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 91216E07DB; Tue, 14 Mar 2023 22:46:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A703E07DB for ; Tue, 14 Mar 2023 22:46:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 87F97335DA7 for ; Tue, 14 Mar 2023 22:46:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F1FE9888 for ; Tue, 14 Mar 2023 22:46:42 +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: <1678833979.c79a0e06a7be1a76ec0368168cafdcf708b977b7.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/, net-print/cups-filters/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/cups-filters/cups-filters-1.28.17-r1.ebuild net-print/cups-filters/files/cups-filters-1.28.17-c++17.patch X-VCS-Directories: net-print/cups-filters/ net-print/cups-filters/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c79a0e06a7be1a76ec0368168cafdcf708b977b7 X-VCS-Branch: master Date: Tue, 14 Mar 2023 22:46:42 +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: 3302b82c-a2f6-4bc1-95f7-b91269355e57 X-Archives-Hash: f3da35f687b491e3db90d106f29016dd commit: c79a0e06a7be1a76ec0368168cafdcf708b977b7 Author: Sam James gentoo org> AuthorDate: Tue Mar 14 22:45:05 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 14 22:46:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c79a0e06 net-print/cups-filters: fix build w/ C++17 Closes: https://bugs.gentoo.org/898076 Closes: https://bugs.gentoo.org/901243 Signed-off-by: Sam James gentoo.org> .../cups-filters/cups-filters-1.28.17-r1.ebuild | 4 +++ .../files/cups-filters-1.28.17-c++17.patch | 31 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/net-print/cups-filters/cups-filters-1.28.17-r1.ebuild b/net-print/cups-filters/cups-filters-1.28.17-r1.ebuild index 2e2bbd3cef13..13b7dac3fc7b 100644 --- a/net-print/cups-filters/cups-filters-1.28.17-r1.ebuild +++ b/net-print/cups-filters/cups-filters-1.28.17-r1.ebuild @@ -51,6 +51,10 @@ BDEPEND=" test? ( media-fonts/dejavu ) " +PATCHES=( + "${FILESDIR}"/${PN}-1.28.17-c++17.patch +) + src_configure() { # Bug #898156 append-cxxflags -std=c++17 diff --git a/net-print/cups-filters/files/cups-filters-1.28.17-c++17.patch b/net-print/cups-filters/files/cups-filters-1.28.17-c++17.patch new file mode 100644 index 000000000000..f8f63ccd4724 --- /dev/null +++ b/net-print/cups-filters/files/cups-filters-1.28.17-c++17.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/901243 +(and https://bugs.gentoo.org/898076) +https://github.com/OpenPrinting/cups-filters/pull/505 + +From 104fba23b1c0c67c92777b3165c6dca99558a656 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 6 Feb 2023 18:13:52 -0800 +Subject: [PATCH] use noexcept(false) instead of throw() from c++17 onwards + +C++17 removed dynamic exception specifications [1] +they had been deprecated since C++11, replace +throw(whatever) with noexcept(false). + +[1] https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0003r5.html + +Signed-off-by: Khem Raj +--- a/filter/pdftoraster.cxx ++++ b/filter/pdftoraster.cxx +@@ -2148,7 +2148,11 @@ int main(int argc, char *argv[]) { + /* For compatibility with g++ >= 4.7 compilers _GLIBCXX_THROW + * should be used as a guard, otherwise use traditional definition */ + #ifndef _GLIBCXX_THROW ++#if __cplusplus < 201703L + #define _GLIBCXX_THROW throw ++#else ++#define _GLIBCXX_THROW(x) noexcept(false) ++#endif + #endif + + void * operator new(size_t size) _GLIBCXX_THROW (std::bad_alloc) +