public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Piotr Karbowski" <slashbeast@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/
Date: Tue,  1 Aug 2023 18:22:26 +0000 (UTC)	[thread overview]
Message-ID: <1690914143.856aa99efca751cb4f0eb232e5323c50994cd5ee.slashbeast@gentoo> (raw)

commit:     856aa99efca751cb4f0eb232e5323c50994cd5ee
Author:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  1 18:21:04 2023 +0000
Commit:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Tue Aug  1 18:22:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=856aa99e

media-gfx/prusaslicer: 2.6.0-r1: patch out hard dep on wayland (and X11).

Closes: https://bugs.gentoo.org/910751
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>

 ...saslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch | 14 ++++++++++++++
 ...rusaslicer-2.6.0.ebuild => prusaslicer-2.6.0-r1.ebuild} |  1 +
 2 files changed, 15 insertions(+)

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
new file mode 100644
index 000000000000..b949d3b5a897
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch
@@ -0,0 +1,14 @@
+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)
+     # libslic3r_gui will link to opengl anyway, so lets override wx
+     list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX OpenGL)
+     
+-    if (UNIX AND NOT APPLE)
+-        list(APPEND wxWidgets_LIBRARIES X11 wayland-client wayland-egl EGL)
+-    endif ()
+ #    list(REMOVE_ITEM wxWidgets_LIBRARIES oleacc)
+     message(STATUS "wx libs: ${wxWidgets_LIBRARIES}")
+ 

diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.0.ebuild b/media-gfx/prusaslicer/prusaslicer-2.6.0-r1.ebuild
similarity index 96%
rename from media-gfx/prusaslicer/prusaslicer-2.6.0.ebuild
rename to media-gfx/prusaslicer/prusaslicer-2.6.0-r1.ebuild
index fcbc39930483..281398381412 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.6.0.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.6.0-r1.ebuild
@@ -53,6 +53,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${P}-libexpat-double-definition-fix.patch"
 	"${FILESDIR}/${P}-disable-noisy-asserts.patch"
+	"${FILESDIR}/${P}-dont-force-link-to-wayland-and-x11.patch"
 )
 
 S="${WORKDIR}/${MY_PN}-version_${MY_PV}"


             reply	other threads:[~2023-08-01 18:22 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-01 18:22 Piotr Karbowski [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-01-03 14:43 [gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/ Miroslav Šulc
2024-12-21 11:38 Miroslav Šulc
2024-12-21  8:03 Miroslav Šulc
2024-11-21  8:49 Miroslav Šulc
2024-11-21  8:49 Miroslav Šulc
2024-09-19 11:42 Miroslav Šulc
2024-09-13 10:58 Miroslav Šulc
2024-09-13  8:57 Miroslav Šulc
2024-08-06  9:15 Miroslav Šulc
2024-06-22  8:56 Miroslav Šulc
2024-05-22 10:35 Miroslav Šulc
2024-03-25 18:57 Sam James
2024-03-01 10:50 Miroslav Šulc
2023-07-23 16:40 Piotr Karbowski
2023-03-23  6:48 Miroslav Šulc
2022-08-31 18:26 Dennis Lamm
2022-08-29  4:46 Dennis Lamm
2022-07-02 10:19 Piotr Karbowski
2022-05-09  8:44 Piotr Karbowski
2022-03-14  6:51 Dennis Lamm
2021-02-07 21:30 Dennis Lamm
2021-02-05  2:06 Sam James

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=1690914143.856aa99efca751cb4f0eb232e5323c50994cd5ee.slashbeast@gentoo \
    --to=slashbeast@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