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 B7ACE1581D3 for ; Wed, 22 May 2024 10:35:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2B4EE2A48; Wed, 22 May 2024 10:35:14 +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 BF850E2A48 for ; Wed, 22 May 2024 10:35:14 +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 C233C335C7E for ; Wed, 22 May 2024 10:35:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2A4B2AAF for ; Wed, 22 May 2024 10:35:12 +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: <1716374091.c40afc02f6ca69a637b4ffcadffc8640eaf553cc.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch media-gfx/prusaslicer/files/prusaslicer-2.7.4-boost-1.85.patch media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild media-gfx/prusaslicer/prusaslicer-9999.ebuild X-VCS-Directories: media-gfx/prusaslicer/files/ media-gfx/prusaslicer/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: c40afc02f6ca69a637b4ffcadffc8640eaf553cc X-VCS-Branch: master Date: Wed, 22 May 2024 10:35:12 +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: e48340a2-3bca-420d-af2c-3c527a9f2e18 X-Archives-Hash: cb7e6101fb47579c183a5582884b93c1 commit: c40afc02f6ca69a637b4ffcadffc8640eaf553cc Author: Miroslav Šulc gentoo org> AuthorDate: Wed May 22 10:31:26 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Wed May 22 10:34:51 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c40afc02 media-gfx/prusaslicer: fixed building with boost 1.85 Closes: https://bugs.gentoo.org/932291 Signed-off-by: Miroslav Šulc gentoo.org> .../prusaslicer-2.6.0-disable-noisy-asserts.patch | 2 -- ...-2.6.0-dont-force-link-to-wayland-and-x11.patch | 2 -- ...icer-2.6.0-libexpat-double-definition-fix.patch | 6 ----- .../prusaslicer-2.7.2-opencascade-7.8.0.patch | 2 -- .../files/prusaslicer-2.7.4-boost-1.85.patch | 30 ++++++++++++++++++++++ media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild | 1 + media-gfx/prusaslicer/prusaslicer-9999.ebuild | 1 + 7 files changed, 32 insertions(+), 12 deletions(-) diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch index 0e3d1d340572..d7c5f25a1651 100644 --- a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch +++ b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch @@ -1,5 +1,3 @@ -diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp -index e855b6290..2479bf054 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -1128,6 +1128,9 @@ bool GUI_App::OnInit() diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch index b949d3b5a897..1d36fcbb7b57 100644 --- a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch +++ b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch @@ -1,5 +1,3 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 50eccfc84..d0f9205b3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -115,9 +115,6 @@ if (SLIC3R_GUI) diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch index 23006a2ceedf..4a93da994bd7 100644 --- a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch +++ b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch @@ -3,12 +3,6 @@ From: Malte kleine Piening Date: Tue, 18 Apr 2023 22:29:04 +0200 Subject: [PATCH] fixed double definition of target libexpat described in #9581 ---- - cmake/modules/FindEXPAT.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/modules/FindEXPAT.cmake b/cmake/modules/FindEXPAT.cmake -index de204c60f7e..5863e136ec5 100644 --- a/cmake/modules/FindEXPAT.cmake +++ b/cmake/modules/FindEXPAT.cmake @@ -25,7 +25,7 @@ if (NOT EXPAT_FOUND) diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch b/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch index 3c97ead5c6b2..296c0366e34a 100644 --- a/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch +++ b/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch @@ -1,5 +1,3 @@ -diff --git a/src/occt_wrapper/CMakeLists.txt b/src/occt_wrapper/CMakeLists.txt -index d8dd8e1..d27055f 100644 --- a/src/occt_wrapper/CMakeLists.txt +++ b/src/occt_wrapper/CMakeLists.txt @@ -22,11 +22,8 @@ generate_export_header(OCCTWrapper) diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.7.4-boost-1.85.patch b/media-gfx/prusaslicer/files/prusaslicer-2.7.4-boost-1.85.patch new file mode 100644 index 000000000000..4ccaff8f6b17 --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.7.4-boost-1.85.patch @@ -0,0 +1,30 @@ +--- PrusaSlicer-version_2.7.4.old/src/slic3r/Config/Snapshot.cpp ++++ PrusaSlicer-version_2.7.4/src/slic3r/Config/Snapshot.cpp +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + + #include "libslic3r/PresetBundle.hpp" +--- PrusaSlicer-version_2.7.4.old/src/slic3r/Config/Version.cpp ++++ PrusaSlicer-version_2.7.4/src/slic3r/Config/Version.cpp +@@ -7,6 +7,7 @@ + #include + + #include ++#include + #include + + #include "libslic3r/libslic3r.h" +--- PrusaSlicer-version_2.7.4.old/src/slic3r/GUI/RemovableDriveManager.cpp ++++ PrusaSlicer-version_2.7.4/src/slic3r/GUI/RemovableDriveManager.cpp +@@ -35,7 +35,6 @@ + #include + #include + #include +-#include + #include + #endif + diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild b/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild index 2bc5d574fed6..3745d41a4e8d 100644 --- a/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild @@ -57,6 +57,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-2.6.0-libexpat-double-definition-fix.patch" "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch" + "${FILESDIR}/${PN}-2.7.4-boost-1.85.patch" ) src_prepare() { diff --git a/media-gfx/prusaslicer/prusaslicer-9999.ebuild b/media-gfx/prusaslicer/prusaslicer-9999.ebuild index 5f7e18907896..72b48171933c 100644 --- a/media-gfx/prusaslicer/prusaslicer-9999.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-9999.ebuild @@ -62,6 +62,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-2.6.0-libexpat-double-definition-fix.patch" "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch" + "${FILESDIR}/${PN}-2.7.4-boost-1.85.patch" ) src_prepare() {