-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'void-linux:master' into nekoray
- Loading branch information
Showing
569 changed files
with
4,710 additions
and
4,646 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| From 65cf9f2585b696b2819db928fb8b0f13a997113b Mon Sep 17 00:00:00 2001 | ||
| From: Dmitry Shachnev <mitya57@gmail.com> | ||
| Date: Wed, 17 May 2023 11:26:12 +0300 | ||
| Subject: [PATCH] Make QPainterTest pass with Qt 5.15.9 | ||
|
|
||
| https://bugreports.qt.io/browse/QTBUG-100327 was fixed in 5.15.9, | ||
| so now we have a good result from the beginning and don't need | ||
| ImageTransparencyFixup. | ||
| --- | ||
| src/core/image_transparency_fixup.h | 5 +++++ | ||
| test/qpainter_t.cpp | 6 ++++-- | ||
| 2 files changed, 9 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/src/core/image_transparency_fixup.h b/src/core/image_transparency_fixup.h | ||
| index 1dfe2f51b..8bd930744 100644 | ||
| --- a/src/core/image_transparency_fixup.h | ||
| +++ b/src/core/image_transparency_fixup.h | ||
| @@ -57,6 +57,9 @@ class ImageTransparencyFixup | ||
| * | ||
| * The image must be of QImage::Format_ARGB32_Premultiplied. | ||
| * It may be null. | ||
| + * | ||
| + * This fixup is needed for Qt5 < 5.15.9 and Qt6 < 6.2.4 which are | ||
| + * affected by https://bugreports.qt.io/browse/QTBUG-100327. | ||
| */ | ||
| inline ImageTransparencyFixup(QImage* image) | ||
| : dest(0), dest_end(0) | ||
| @@ -81,11 +84,13 @@ class ImageTransparencyFixup | ||
| */ | ||
| inline void operator()() const | ||
| { | ||
| +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4)) | ||
| for (QRgb* px = dest; px < dest_end; px++) | ||
| { | ||
| if (*px == 0x01000000) /* qRgba(0, 0, 0, 1) */ | ||
| *px = 0x00000000; /* qRgba(0, 0, 0, 0) */ | ||
| } | ||
| +#endif | ||
| } | ||
|
|
||
| protected: | ||
| diff --git a/test/qpainter_t.cpp b/test/qpainter_t.cpp | ||
| index 85b971c03..a9172b1c8 100644 | ||
| --- a/test/qpainter_t.cpp | ||
| +++ b/test/qpainter_t.cpp | ||
| @@ -80,9 +80,10 @@ void QPainterTest::multiplyComposition() | ||
| QCOMPARE(compose(white_img, white_img, multiply).pixel(0,0), qRgba(255, 255, 255, 255)); | ||
| QCOMPARE(compose(black_img, black_img, multiply).pixel(0,0), qRgba(0, 0, 0, 255)); | ||
|
|
||
| +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4)) | ||
| QEXPECT_FAIL("", "CompositionMode_Multiply incorrectly composes full transparency.", Continue); | ||
| +#endif | ||
| QCOMPARE(compose(trans_img, trans_img, multiply).pixel(0,0), qRgba(0, 0, 0, 0)); | ||
| - QCOMPARE(compose(trans_img, trans_img, multiply).pixel(0,0), qRgba(0, 0, 0, 1)); // This should fail! | ||
|
|
||
| // ImageTransparencyFixup fixes the particular issue. | ||
| QImage result = compose(trans_img, trans_img, multiply); | ||
| @@ -107,9 +108,10 @@ void QPainterTest::darkenComposition() | ||
| QCOMPARE(compose(white_img, white_img, darken).pixel(0,0), qRgba(255, 255, 255, 255)); | ||
| QCOMPARE(compose(black_img, black_img, darken).pixel(0,0), qRgba(0, 0, 0, 255)); | ||
|
|
||
| +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4)) | ||
| QEXPECT_FAIL("", "CompositionMode_Darken incorrectly composes full transparency.", Continue); | ||
| +#endif | ||
| QCOMPARE(compose(trans_img, trans_img, darken).pixel(0,0), qRgba(0, 0, 0, 0)); | ||
| - QCOMPARE(compose(trans_img, trans_img, darken).pixel(0,0), qRgba(0, 0, 0, 1)); // This should fail! | ||
|
|
||
| // ImageTransparencyFixup fixes the particular issue. | ||
| QImage result = compose(trans_img, trans_img, darken); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp | ||
| index 2364c5624..c977bee4c 100644 | ||
| --- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp | ||
| +++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp | ||
| @@ -467,7 +467,8 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr | ||
| // Always fill in the "printhost_port" combo box from the config and select it. | ||
| { | ||
| Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port")); | ||
| - choice->set_values({ m_config->opt_string("printhost_port") }); | ||
| + const wxArrayString printhost_port = wxArrayString{ m_config->opt_string("printhost_port") }; | ||
| + choice->set_values(printhost_port); | ||
| choice->set_selection(); | ||
| } | ||
|
|
||
| diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp | ||
| index 2d00674c0..011ef7cfd 100644 | ||
| --- a/src/slic3r/GUI/Plater.cpp | ||
| +++ b/src/slic3r/GUI/Plater.cpp | ||
| @@ -5425,7 +5425,8 @@ void Plater::load_project(const wxString& filename) | ||
|
|
||
| p->reset(); | ||
|
|
||
| - if (! load_files({ into_path(filename) }).empty()) { | ||
| + boost::filesystem::path full_path = into_path(filename); | ||
| + if (! load_files({ full_path }, true, true).empty()) { | ||
| // At least one file was loaded. | ||
| p->set_project_filename(filename); | ||
| // Save the names of active presets and project specific config into ProjectDirtyStateManager. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| From 4846f8c211515546d441d3305a50138614987b72 Mon Sep 17 00:00:00 2001 | ||
| From: Robert Schiele <rschiele@gmail.com> | ||
| Date: Fri, 5 May 2023 20:39:46 +0200 | ||
| Subject: [PATCH] add missing includes of <cstdint> (PR #10499) | ||
|
|
||
| --- | ||
| deps/OpenEXR/OpenEXR.cmake | 3 ++- | ||
| deps/OpenEXR/OpenEXR.patch | 36 +++++++++++++++++++++++++++++++++ | ||
| src/libslic3r/PNGReadWrite.hpp | 1 + | ||
| 4 files changed, 40 insertions(+), 1 deletion(-) | ||
| create mode 100644 deps/OpenEXR/OpenEXR.patch | ||
|
|
||
| diff --git a/deps/OpenEXR/OpenEXR.cmake b/deps/OpenEXR/OpenEXR.cmake | ||
| index 046223fed9e..094965d0421 100644 | ||
| --- a/deps/OpenEXR/OpenEXR.cmake | ||
| +++ b/deps/OpenEXR/OpenEXR.cmake | ||
| @@ -4,6 +4,7 @@ prusaslicer_add_cmake_project(OpenEXR | ||
| URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de | ||
| DEPENDS ${ZLIB_PKG} | ||
| GIT_TAG v2.5.5 | ||
| + PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_LIST_DIR}/OpenEXR.patch | ||
| CMAKE_ARGS | ||
| -DCMAKE_POSITION_INDEPENDENT_CODE=ON | ||
| -DBUILD_TESTING=OFF | ||
| @@ -14,4 +15,4 @@ prusaslicer_add_cmake_project(OpenEXR | ||
|
|
||
| if (MSVC) | ||
| add_debug_dep(dep_OpenEXR) | ||
| -endif () | ||
| \ No newline at end of file | ||
| +endif () | ||
| diff --git a/deps/OpenEXR/OpenEXR.patch b/deps/OpenEXR/OpenEXR.patch | ||
| new file mode 100644 | ||
| index 00000000000..22adbd27784 | ||
| --- /dev/null | ||
| +++ b/deps/OpenEXR/OpenEXR.patch | ||
| @@ -0,0 +1,36 @@ | ||
| +diff --git a/OpenEXR/IlmImf/ImfDwaCompressor.cpp b/OpenEXR/IlmImf/ImfDwaCompressor.cpp | ||
| +index 59d1d5d1..585a3e65 100644 | ||
| +--- a/OpenEXR/IlmImf/ImfDwaCompressor.cpp | ||
| ++++ b/OpenEXR/IlmImf/ImfDwaCompressor.cpp | ||
| +@@ -159,6 +159,7 @@ | ||
| + #include <limits> | ||
| + | ||
| + #include <cstddef> | ||
| ++#include <cstdint> | ||
| + | ||
| + | ||
| + // Windows specific addition to prevent the indirect import of the redefined min/max macros | ||
| +diff --git a/OpenEXR/IlmImf/ImfHuf.cpp b/OpenEXR/IlmImf/ImfHuf.cpp | ||
| +index 271849b7..165fac58 100644 | ||
| +--- a/OpenEXR/IlmImf/ImfHuf.cpp | ||
| ++++ b/OpenEXR/IlmImf/ImfHuf.cpp | ||
| +@@ -53,6 +53,7 @@ | ||
| + #include <cstring> | ||
| + #include <cassert> | ||
| + #include <algorithm> | ||
| ++#include <cstdint> | ||
| + | ||
| + | ||
| + using namespace std; | ||
| +diff --git a/OpenEXR/IlmImf/ImfMisc.cpp b/OpenEXR/IlmImf/ImfMisc.cpp | ||
| +index d2c84787..4b487940 100644 | ||
| +--- a/OpenEXR/IlmImf/ImfMisc.cpp | ||
| ++++ b/OpenEXR/IlmImf/ImfMisc.cpp | ||
| +@@ -40,6 +40,7 @@ | ||
| + // | ||
| + //----------------------------------------------------------------------------- | ||
| + | ||
| ++#include <cstdint> | ||
| + #include <ImfMisc.h> | ||
| + #include <ImfHeader.h> | ||
| + #include <ImfAttribute.h> | ||
| diff --git a/src/libslic3r/PNGReadWrite.hpp b/src/libslic3r/PNGReadWrite.hpp | ||
| index 01e1f474500..399c6224382 100644 | ||
| --- a/src/libslic3r/PNGReadWrite.hpp | ||
| +++ b/src/libslic3r/PNGReadWrite.hpp | ||
| @@ -4,6 +4,7 @@ | ||
| #include <vector> | ||
| #include <string> | ||
| #include <istream> | ||
| +#include <cstdint> | ||
|
|
||
| namespace Slic3r { namespace png { | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.