* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/
@ 2017-12-27 10:40 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2017-12-27 10:40 UTC (permalink / raw
To: gentoo-commits
commit: b4a3cd01d165e83eefa448a4eeea5e507b88f728
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Dec 27 09:45:46 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec 27 10:40:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4a3cd01
media-gfx/krita: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/6658
media-gfx/krita/files/krita-3.1.4-qt-5.9.patch | 24 ----------------------
media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch | 14 -------------
2 files changed, 38 deletions(-)
diff --git a/media-gfx/krita/files/krita-3.1.4-qt-5.9.patch b/media-gfx/krita/files/krita-3.1.4-qt-5.9.patch
deleted file mode 100644
index 6bda9ddd206..00000000000
--- a/media-gfx/krita/files/krita-3.1.4-qt-5.9.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2f59d0d1d91e3f79342c20d0df68aa9a51817e8d Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Sat, 6 May 2017 16:00:21 +0200
-Subject: [PATCH] Drop QForeachContainer include and fix Qt 5.9 build
-
-It's not used anywhere.
-
-Acked by boud.
----
- libs/ui/KisResourceBundleManifest.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/libs/ui/KisResourceBundleManifest.cpp b/libs/ui/KisResourceBundleManifest.cpp
-index e4f94ca788..83761657d8 100644
---- a/libs/ui/KisResourceBundleManifest.cpp
-+++ b/libs/ui/KisResourceBundleManifest.cpp
-@@ -22,7 +22,6 @@
- #include <QDomElement>
- #include <QDomNode>
- #include <QDomNodeList>
--#include <QForeachContainer>
-
- #include <KoXmlNS.h>
- #include <KoXmlReader.h>
diff --git a/media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch b/media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch
deleted file mode 100644
index 0f0b9674dd0..00000000000
--- a/media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/CMakeLists.txt 2017-02-13 11:12:47.866321035 -0200
-+++ b/CMakeLists.txt 2017-02-13 11:18:55.769657370 -0200
-@@ -533,9 +533,9 @@
- include (VcMacros)
-
- if(Vc_COMPILER_IS_CLANG)
-- set(ADDITIONAL_VC_FLAGS "-Wabi -ffp-contract=fast -fPIC")
-+ add_compile_options(-Wabi -ffp-contract=fast -fPIC)
- elseif (NOT MSVC)
-- set(ADDITIONAL_VC_FLAGS "-Wabi -fabi-version=0 -ffp-contract=fast -fPIC")
-+ add_compile_options(-Wabi -fabi-version=0 -ffp-contract=fast -fPIC)
- endif()
-
- #Handle Vc master
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/
@ 2021-10-10 19:05 Jakov Smolić
0 siblings, 0 replies; 3+ messages in thread
From: Jakov Smolić @ 2021-10-10 19:05 UTC (permalink / raw
To: gentoo-commits
commit: 821e207f0213a7b6f54e0eeb0fddf1373012c2b2
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Oct 10 18:19:19 2021 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun Oct 10 19:05:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=821e207f
media-gfx/krita: remove unused patch
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/22549
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
.../files/krita-4.4.5-pykrita-crash-on-exit.patch | 32 ----------------------
1 file changed, 32 deletions(-)
diff --git a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
deleted file mode 100644
index 12ebb2fa95a..00000000000
--- a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 86a38621fbbf96edf489a0efd2b9c24c123e2051 Mon Sep 17 00:00:00 2001
-From: Dmitry Kazakov <dimula73@gmail.com>
-Date: Tue, 3 Aug 2021 11:57:33 +0300
-Subject: [PATCH] Disable finalizing of the PyQt to prevent crash on exit
-
-CCBUG:417465
----
- plugins/extensions/pykrita/plugin/plugin.cpp | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/plugins/extensions/pykrita/plugin/plugin.cpp b/plugins/extensions/pykrita/plugin/plugin.cpp
-index 028798e2f4..cc06c07fbe 100644
---- a/plugins/extensions/pykrita/plugin/plugin.cpp
-+++ b/plugins/extensions/pykrita/plugin/plugin.cpp
-@@ -89,11 +89,10 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &)
-
- KritaPyQtPlugin::~KritaPyQtPlugin()
- {
-- // XXX: With Qt 5.14, this crashes Krita on exit. See https://bugs.kde.org/show_bug.cgi?id=417465
-- // So, for now, we just don't call finalize...
--#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
-- PyKrita::finalize();
--#endif
-+ /// XXX: Don't call PyKrita::finalize here, because that can result in a crash
-+ /// deep inside Qt. See https://bugs.kde.org/show_bug.cgi?id=417465
-+
-+ // PyKrita::finalize();
- }
-
- #include "plugin.moc"
---
-GitLab
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/
@ 2024-07-21 15:12 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2024-07-21 15:12 UTC (permalink / raw
To: gentoo-commits
commit: ae7db7096441eec449114edf4a375fc5e62fbddc
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jul 15 16:55:53 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 15:04:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae7db709
media-gfx/krita: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
media-gfx/krita/files/krita-5.2.2-libjxl-0.9.patch | 93 ----------------------
1 file changed, 93 deletions(-)
diff --git a/media-gfx/krita/files/krita-5.2.2-libjxl-0.9.patch b/media-gfx/krita/files/krita-5.2.2-libjxl-0.9.patch
deleted file mode 100644
index 83caf604bf70..000000000000
--- a/media-gfx/krita/files/krita-5.2.2-libjxl-0.9.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From ace7edcca6ad322581ab39620f21ccf3ffbd3b5a Mon Sep 17 00:00:00 2001
-From: Timo Gurr <timo.gurr@gmail.com>
-Date: Fri, 5 Jan 2024 14:04:50 +0000
-Subject: [PATCH] Fix build with libjxl 0.9.0
-
-Fix build with libjxl 0.9.0
-
-BUG:478987
-
-Test Plan
----------
-
-* Upgrade to libjxl 0.9.0
-* Apply patch from MR and build krita (5.2.2)
-* Open/Display a sample image e.g. https://jpegxl.info/test-page/red-room.jxl
-
-Formalities Checklist
----------------------
-
-- [x] I confirmed this builds.
-- [x] I confirmed Krita ran and the relevant functions work (Could successfully open/display a sample image https://jpegxl.info/test-page/red-room.jxl).
-- [ ] I tested the relevant unit tests and can confirm they are not broken. (If not possible, don't hesitate to ask for help!)
-- [x] I made sure my commits build individually and have good descriptions as per [KDE guidelines](https://community.kde.org/Policies/Commit_Policy).
-- [x] I made sure my code conforms to the standards set in the HACKING file.
-- [x] I can confirm the code is licensed and attributed appropriately, and that unattributed code is mine, as per [KDE Licensing Policy](https://community.kde.org/Policies/Licensing_Policy).
-
-_**Reminder: the reviewer is responsible for merging the patch, this is to ensure at the least two people can build the patch. In case a patch breaks the build, both the author and the reviewer should be contacted to fix the build.**_
-_**If this is not possible, the commits shall be reverted, and a notification with the reasoning and any relevant logs shall be sent to the mailing list, kimageshop@kde.org.**_
----
- plugins/impex/jxl/JPEGXLImport.cpp | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/impex/jxl/JPEGXLImport.cpp b/plugins/impex/jxl/JPEGXLImport.cpp
-index 573bae41247..f5b989b3b70 100644
---- a/plugins/impex/jxl/JPEGXLImport.cpp
-+++ b/plugins/impex/jxl/JPEGXLImport.cpp
-@@ -511,7 +511,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
- JxlColorEncoding colorEncoding{};
- if (JXL_DEC_SUCCESS
- == JxlDecoderGetColorAsEncodedProfile(dec.get(),
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0)
- nullptr,
-+#endif
- JXL_COLOR_PROFILE_TARGET_DATA,
- &colorEncoding)) {
- const TransferCharacteristics transferFunction = [&]() {
-@@ -635,7 +637,12 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
- size_t iccSize = 0;
- QByteArray iccProfile;
- if (JXL_DEC_SUCCESS
-- != JxlDecoderGetICCProfileSize(dec.get(), nullptr, JXL_COLOR_PROFILE_TARGET_DATA, &iccSize)) {
-+ != JxlDecoderGetICCProfileSize(dec.get(),
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
-+ nullptr,
-+#endif
-+ JXL_COLOR_PROFILE_TARGET_DATA,
-+ &iccSize)) {
- errFile << "ICC profile size retrieval failed";
- document->setErrorMessage(i18nc("JPEG-XL errors", "Unable to read the image profile."));
- return ImportExportCodes::ErrorWhileReading;
-@@ -643,7 +650,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
- iccProfile.resize(static_cast<int>(iccSize));
- if (JXL_DEC_SUCCESS
- != JxlDecoderGetColorAsICCProfile(dec.get(),
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
- nullptr,
-+#endif
- JXL_COLOR_PROFILE_TARGET_DATA,
- reinterpret_cast<uint8_t *>(iccProfile.data()),
- static_cast<size_t>(iccProfile.size()))) {
-@@ -657,7 +666,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
- if (!d.m_info.uses_original_profile) {
- if (JXL_DEC_SUCCESS
- != JxlDecoderGetICCProfileSize(dec.get(),
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
- nullptr,
-+#endif
- JXL_COLOR_PROFILE_TARGET_ORIGINAL,
- &iccTargetSize)) {
- errFile << "ICC profile size retrieval failed";
-@@ -667,7 +678,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
- iccTargetProfile.resize(static_cast<int>(iccTargetSize));
- if (JXL_DEC_SUCCESS
- != JxlDecoderGetColorAsICCProfile(dec.get(),
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
- nullptr,
-+#endif
- JXL_COLOR_PROFILE_TARGET_ORIGINAL,
- reinterpret_cast<uint8_t *>(iccTargetProfile.data()),
- static_cast<size_t>(iccTargetProfile.size()))) {
---
-GitLab
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-07-21 15:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-10 19:05 [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/ Jakov Smolić
-- strict thread matches above, loose matches on Subject: below --
2024-07-21 15:12 Conrad Kostecki
2017-12-27 10:40 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox