summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-gfx/PrusaSlicer/Manifest3
-rw-r--r--media-gfx/PrusaSlicer/PrusaSlicer-2.2.0.ebuild5
-rw-r--r--media-gfx/PrusaSlicer/files/PrusaSlicer-2.2.0-fix-get-height-crash.patch18
3 files changed, 24 insertions, 2 deletions
diff --git a/media-gfx/PrusaSlicer/Manifest b/media-gfx/PrusaSlicer/Manifest
index a002388..95ec5b9 100644
--- a/media-gfx/PrusaSlicer/Manifest
+++ b/media-gfx/PrusaSlicer/Manifest
@@ -1,4 +1,5 @@
+AUX PrusaSlicer-2.2.0-fix-get-height-crash.patch 671 BLAKE2B 35157d2177a706e4d1736aaab8d1726615a8e49c8b567a762ad12da3a73de261b850e48d6e203122557c937478d0e619817d9c873a236ad9e5a916cded4d0e85 SHA512 de68e8d187fb272e5d2cd3117f2764015c46672823f4fff34f50bfef6f318703a0888d24fb083ac361ddaa8f6b588f0fa17edf4f29bb8bf9af9b6178a6386381
DIST version_2.1.1.tar.gz 27551136 BLAKE2B 05948f7476cb41db83a4c70b6129df5b82c84d0e7de96c5d0a7dc0bad9442e4845a30e080f9ccd88caa09ec1f6c9daceb566a7cf8004e5d4d9a3f7026af1bc96 SHA512 30c00e6fc0dbd97ec2307d83a777f53039ed0eb8c4c26c9f4e581567025225ca1937032fe23fd09216d55b2703fa3c0d20a7f1efd713ba6c9ae5e32a6a088d6a
DIST version_2.2.0.tar.gz 30811929 BLAKE2B cde004add53ee025728d566cb7331cb7b1eac5412e9ad3bee037d13277c24dcdc6024c91f09bb9ef0653a12a3ee7c5cb5cec21e2a00825d185472ea7036e08f5 SHA512 5c8dc5b581e04208a1ae53771ef2607da189ee85aadf501ce1480008f5a6ddb10bb528ddc2608d3f04acd26c583ff895ad4148d6a1397f002292e20098971e1d
EBUILD PrusaSlicer-2.1.1.ebuild 1466 BLAKE2B 9308684396460af7b574bd11006abe13d5530cf4388311146a2d03207adac0b8a0f610a4882f64f041b73f79d9a2a21032abe037fe8609a62ba3debbf42f4157 SHA512 c87108d6fef72d36faa19a35b377b73c2e7ddbda59927dacace1c19d9c1f1bd45a39ead286004267ea4e19e8cba206d5170ba7e16fb5784c256824c274a19df3
-EBUILD PrusaSlicer-2.2.0.ebuild 1589 BLAKE2B e39bc94ca74d52c61d8cb0f3e93d7918d891ac1a801fb64696dda3455054d52e751f26fbcc450e27c705a94d274787c0c66baf218c676a8540ac52cd2c2ca3ce SHA512 5dfd3ffd15b141fb2890b290d6ea1a94739c4e2b11907063cf7e8059aed547ec99c8cf63772423733618570b85f18fd16725c603c7d29e001edabecb31a65f18
+EBUILD PrusaSlicer-2.2.0.ebuild 1657 BLAKE2B 2ef99c92eb4a3eb946feeea1d36461da050ab4f249a6ae52c689d2ab5f1046b19df3f44ff4a9237e98711ff4c3ea3663e7d2de44f964d0f5f2d58216347fb29a SHA512 6d8157dfb47d5d693aec205334557b5e6e351a9d0bd683970cd660929949d112145923ba2216a9e57b049905f6d2dac595b3026deace6d25d9bbd1dd387b8cf6
diff --git a/media-gfx/PrusaSlicer/PrusaSlicer-2.2.0.ebuild b/media-gfx/PrusaSlicer/PrusaSlicer-2.2.0.ebuild
index 1c6f36f..5fbc755 100644
--- a/media-gfx/PrusaSlicer/PrusaSlicer-2.2.0.ebuild
+++ b/media-gfx/PrusaSlicer/PrusaSlicer-2.2.0.ebuild
@@ -38,10 +38,13 @@ DEPEND="${RDEPEND}
>=dev-cpp/gtest-1.7"
S="${WORKDIR}/PrusaSlicer-version_${PV}"
+PATCHES=(
+ "${FILESDIR}/PrusaSlicer-2.2.0-fix-get-height-crash.patch"
+)
src_prepare() {
pushd "${WORKDIR}/PrusaSlicer-version_${PV}" || die
- eapply_user
+ default
popd || die
}
diff --git a/media-gfx/PrusaSlicer/files/PrusaSlicer-2.2.0-fix-get-height-crash.patch b/media-gfx/PrusaSlicer/files/PrusaSlicer-2.2.0-fix-get-height-crash.patch
new file mode 100644
index 0000000..7c2b730
--- /dev/null
+++ b/media-gfx/PrusaSlicer/files/PrusaSlicer-2.2.0-fix-get-height-crash.patch
@@ -0,0 +1,18 @@
+diff --git i/src/slic3r/GUI/ObjectDataViewModel.cpp w/src/slic3r/GUI/ObjectDataViewModel.cpp
+index 0905f4915..d9b9af016 100644
+--- i/src/slic3r/GUI/ObjectDataViewModel.cpp
++++ w/src/slic3r/GUI/ObjectDataViewModel.cpp
+@@ -1710,10 +1710,11 @@ bool BitmapChoiceRenderer::Render(wxRect rect, wxDC* dc, int state)
+ {
+ dc->DrawBitmap(icon, rect.x, rect.y + (rect.height - icon.GetHeight()) / 2);
+ xoffset = icon.GetWidth() + 4;
++
++ if (rect.height==0)
++ rect.height= icon.GetHeight();
+ }
+
+- if (rect.height==0)
+- rect.height= icon.GetHeight();
+ RenderText(m_value.GetText(), xoffset, rect, dc, state);
+
+ return true;