gentoo resync : 29.12.2022

4 files changed, 0 insertions, 183 deletions

diff --git a/media-gfx/krita/files/krita-4.4.2-quazip1.patch b/media-gfx/krita/files/krita-4.4.2-quazip1.patch
deleted file mode 100644
index 6a49bd3ba2e7..000000000000
--- a/media-gfx/krita/files/krita-4.4.2-quazip1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3eaf480ae5d615e8e26153cca98115ff0f23135f Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Mon, 5 Oct 2020 20:11:26 +0200
-Subject: [PATCH] Support quazip 1.0
-
-Update FindQuaZip to find the QuaZip 1.0 library names and include dirs. Once support for quazip<1 is dropped this should be ported to use quazip's own QuaZipConfig
----
- cmake/modules/FindQuaZip.cmake | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/modules/FindQuaZip.cmake b/cmake/modules/FindQuaZip.cmake
-index 7e628fcd4b..345c7909ab 100644
---- a/cmake/modules/FindQuaZip.cmake
-+++ b/cmake/modules/FindQuaZip.cmake
-@@ -25,15 +25,15 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
- 	ELSE(WIN32)
- 		FIND_PACKAGE(PkgConfig)
- #     pkg_check_modules(PC_QCA2 QUIET qca2)
--		pkg_check_modules(PC_QUAZIP quazip)
-+		pkg_check_modules(PC_QUAZIP quazip quazip1-qt5)
- 		FIND_LIBRARY(QUAZIP_LIBRARIES
- 			WIN32_DEBUG_POSTFIX d
--            NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
-+            NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} quazip1-qt5
- 			HINTS /usr/lib /usr/lib64
- 		)
- 		FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
- 			HINTS /usr/include /usr/local/include
--			PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
-+			PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} QuaZip-Qt5-1.0/quazip
- 		)
- 		FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
- 	ENDIF (WIN32)
--- 
-GitLab
-
diff --git a/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch b/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch
deleted file mode 100644
index f896a3920efc..000000000000
--- a/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a0c29913114164ff3f2ba4e255ccee1c52cb3e86 Mon Sep 17 00:00:00 2001
-From: Alvin Wong <alvin@alvinhc.com>
-Date: Sat, 19 Jun 2021 16:29:45 +0800
-Subject: [PATCH] Fix PyKrita cleanup using qApp::aboutToQuit to prevent crash
-
-Suspecting that we can't have Python clean up its QObject's inside
-QCoreApplication's destructor, but must be done before it.
-
-BUG: 417465
----
- plugins/extensions/pykrita/plugin/plugin.cpp | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/plugins/extensions/pykrita/plugin/plugin.cpp b/plugins/extensions/pykrita/plugin/plugin.cpp
-index ef0e27eb65..66f552b007 100644
---- a/plugins/extensions/pykrita/plugin/plugin.cpp
-+++ b/plugins/extensions/pykrita/plugin/plugin.cpp
-@@ -13,6 +13,8 @@
- #include <kis_preference_set_registry.h>
- #include "pyqtpluginsettings.h"
- 
-+#include <QCoreApplication>
-+
- #include <Krita.h>
- 
- K_PLUGIN_FACTORY_WITH_JSON(KritaPyQtPluginFactory, "kritapykrita.json", registerPlugin<KritaPyQtPlugin>();)
-@@ -74,6 +76,12 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &)
-     Q_FOREACH (Extension *extension, Krita::instance()->extensions()) {
-         extension->setup();
-     }
-+
-+    // This ensures that QObject's owned by Python are destructed before
-+    // the destructor of QCoreApplication is called, in order to prevent
-+    // a crash on exit.
-+    // See https://bugs.kde.org/show_bug.cgi?id=417465
-+    connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this, []() { PyKrita::finalize(); });
- }
- 
- KritaPyQtPlugin::~KritaPyQtPlugin()
--- 
-GitLab
diff --git a/media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch b/media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch
deleted file mode 100644
index c60b53ffc64b..000000000000
--- a/media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From d2f29d77db58b54a8bcabfb68df66e4dd44f0c27 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heiko.becker@kde.org>
-Date: Fri, 12 Nov 2021 12:27:07 +0100
-Subject: [PATCH] Try (and thus prefer) sip >=5 first
-
-If one has sip 4.x and sip 6.x installed sip 4 is picked up
-("Found SIP version: 4.19.24") just because it is searched first.
-
-This matters not only because it is nice to use the "latest and
-greatest", but also because software using the latest PyQt5 (including
-krita) can't be built with sip 4 at the moment and the maintainer is
-apparently in no hurry to fix it [1].
-
-[1] https://www.riverbankcomputing.com/pipermail/pyqt/2021-November/044345.html
----
- cmake/modules/FindSIP.py | 19 ++++++++++---------
- 1 file changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/cmake/modules/FindSIP.py b/cmake/modules/FindSIP.py
-index 7b92abd36e..600805c329 100644
---- a/cmake/modules/FindSIP.py
-+++ b/cmake/modules/FindSIP.py
-@@ -15,6 +15,16 @@ def osAwareSuffix():
-     return os.path.join("lib", "python3.8", "site-packages","sipconfig.py") if os.name != 'nt' else os.path.join("lib","krita-python-libs","sipconfig.py")
- 
- try:
-+    import sipbuild
-+
-+    print("sip_version:%06.0x" % sipbuild.version.SIP_VERSION)
-+    print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR)
-+
-+    import shutil
-+
-+    # sip v5 and higher need to invoke sip-build
-+    print("sip_bin:%s" % shutil.which("sip-build"))
-+except ImportError:  # Code for SIP <5
-     import sipconfig
- 
-     sipcfg = sipconfig.Configuration()
-@@ -41,13 +51,4 @@ try:
-     print("sip_bin:%s" % sip_bin)
-     print("default_sip_dir:%s" % default_sip_dir)
-     print("sip_inc_dir:%s" % sip_inc_dir)
--except ImportError:  # Code for SIP v5+
--    import sipbuild
--
--    print("sip_version:%06.0x" % sipbuild.version.SIP_VERSION)
--    print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR)
- 
--    import shutil
--
--    # sip v5 and higher need to invoke sip-build
--    print("sip_bin:%s" % shutil.which("sip-build"))
--- 
-GitLab
-
diff --git a/media-gfx/krita/files/krita-5.0.0-clang.patch b/media-gfx/krita/files/krita-5.0.0-clang.patch
deleted file mode 100644
index 6c9c71d4fca2..000000000000
--- a/media-gfx/krita/files/krita-5.0.0-clang.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0b755beaa1fdba03d38f887b93a15a58fc0830c7 Mon Sep 17 00:00:00 2001
-From: Sharaf Zaman <shzam@sdf.org>
-Date: Wed, 27 Oct 2021 22:19:07 +0000
-Subject: [PATCH] Fix build on linux clang targets
-
-In CheckAtomic.cmake we include is_lock_free because these routines
-don't seem to be included in the compiler's "simple atomics". This
-triggers a failure in clang toolchain, forcing it to link libatomic.
-
-Resulting in error: ld.lld: error: undefined symbol: __atomic_is_lock_free
-
-CCBUG:444247
-CCBUG:444547
----
- cmake/modules/CheckAtomic.cmake | 1 +
- libs/image/CMakeLists.txt       | 6 ++----
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake
-index b061e2d65b..df6b70504c 100644
---- a/cmake/modules/CheckAtomic.cmake
-+++ b/cmake/modules/CheckAtomic.cmake
-@@ -46,6 +46,7 @@ function(check_working_cxx_atomics64 varname)
- 	std::atomic<uint64_t> x (0);
- 	int main() {
- 		uint64_t i = x.load(std::memory_order_relaxed);
-+		x.is_lock_free();
- 		return 0;
- 	}
- 	" ${varname})
-diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
-index e883c7f1c8..43c945fad3 100644
---- a/libs/image/CMakeLists.txt
-+++ b/libs/image/CMakeLists.txt
-@@ -372,10 +372,8 @@ target_link_libraries(kritaimage
- 
- target_link_libraries(kritaimage PUBLIC ${Boost_SYSTEM_LIBRARY})
- 
--if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
--    if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
--        target_link_libraries(kritaimage PUBLIC atomic)
--    endif()
-+if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)
-+   target_link_libraries(kritaimage PUBLIC atomic)
- endif()
- 
- if(OpenEXR_FOUND)
--- 
-GitLab
-