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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1D84015817D for ; Tue, 4 Jun 2024 10:35:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B7A02BC017; Tue, 4 Jun 2024 10:35:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 18DAE2BC017 for ; Tue, 4 Jun 2024 10:35:11 +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 E70D033BF29 for ; Tue, 4 Jun 2024 10:35:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 471CF1066 for ; Tue, 4 Jun 2024 10:35:08 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1717497285.58e71948274b0119266597be72b352fbf3ea83f7.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/scribus/files/scribus-1.6.1-boost-1.85-2.patch app-office/scribus/scribus-1.6.1-r1.ebuild X-VCS-Directories: app-office/scribus/files/ app-office/scribus/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 58e71948274b0119266597be72b352fbf3ea83f7 X-VCS-Branch: master Date: Tue, 4 Jun 2024 10:35:08 +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: 234de35b-cdd8-4189-a1d4-5bdc1d4eeb78 X-Archives-Hash: 99310c4b5fc743a04fff225c7d7f44b9 commit: 58e71948274b0119266597be72b352fbf3ea83f7 Author: Miroslav Šulc gentoo org> AuthorDate: Tue Jun 4 10:34:45 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Tue Jun 4 10:34:45 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58e71948 app-office/scribus: fixed building with boost 1.85 Closes: https://bugs.gentoo.org/932492 Signed-off-by: Miroslav Šulc gentoo.org> .../scribus/files/scribus-1.6.1-boost-1.85-2.patch | 27 ++++++++++++++++++++++ app-office/scribus/scribus-1.6.1-r1.ebuild | 1 + 2 files changed, 28 insertions(+) diff --git a/app-office/scribus/files/scribus-1.6.1-boost-1.85-2.patch b/app-office/scribus/files/scribus-1.6.1-boost-1.85-2.patch new file mode 100644 index 000000000000..55bc9934964b --- /dev/null +++ b/app-office/scribus/files/scribus-1.6.1-boost-1.85-2.patch @@ -0,0 +1,27 @@ +From 3116328e804c7366ec64c4224cbf20b0f14e52c8 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Sun, 31 Mar 2024 21:40:42 +0000 +Subject: [PATCH] Fix C++20 related warning "template-id is not allowed for + constructor in C++20" + +git-svn-id: svn://scribus.net/trunk/Scribus@26079 11d20701-8431-0410-a711-e3c959e3b870 +--- a/scribus/third_party/lib2geom/rect.h ++++ b/scribus/third_party/lib2geom/rect.h +@@ -56,14 +56,14 @@ class D2 { + private: + Interval f[2]; + public: +- D2() { f[X] = f[Y] = Interval(0, 0); } ++ D2() { f[X] = f[Y] = Interval(0, 0); } + +- D2(Interval const &a, Interval const &b) { ++ D2(Interval const &a, Interval const &b) { + f[X] = a; + f[Y] = b; + } + +- D2(Point const & a, Point const & b) { ++ D2(Point const & a, Point const & b) { + f[X] = Interval(a[X], b[X]); + f[Y] = Interval(a[Y], b[Y]); + } diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild b/app-office/scribus/scribus-1.6.1-r1.ebuild index e112af815030..3b20f7808237 100644 --- a/app-office/scribus/scribus-1.6.1-r1.ebuild +++ b/app-office/scribus/scribus-1.6.1-r1.ebuild @@ -79,6 +79,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.6.1-poppler-24.03.patch "${FILESDIR}"/${PN}-1.6.1-poppler-24.05.patch "${FILESDIR}"/${PN}-1.6.1-boost-1.85.patch + "${FILESDIR}"/${PN}-1.6.1-boost-1.85-2.patch ) src_prepare() {