diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-01-04 01:27:12 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-01-04 01:27:12 +0000 |
| commit | 3517852e3b8a68d1e997770fc0650c5053bafc6c (patch) | |
| tree | 44068672445b1418489aed82de58df3c470289e7 /media-gfx/krita/files | |
| parent | 0f15659d48c193027158492acb726297501202c5 (diff) | |
gentoo resync : 04.01.2022
Diffstat (limited to 'media-gfx/krita/files')
| -rw-r--r-- | media-gfx/krita/files/krita-5.0.0-clang.patch | 50 | ||||
| -rw-r--r-- | media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch | 24 |
2 files changed, 74 insertions, 0 deletions
diff --git a/media-gfx/krita/files/krita-5.0.0-clang.patch b/media-gfx/krita/files/krita-5.0.0-clang.patch new file mode 100644 index 000000000000..6c9c71d4fca2 --- /dev/null +++ b/media-gfx/krita/files/krita-5.0.0-clang.patch @@ -0,0 +1,50 @@ +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 + diff --git a/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch b/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch new file mode 100644 index 000000000000..c678a9f05492 --- /dev/null +++ b/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch @@ -0,0 +1,24 @@ +From e1b2760966b738f1d467013272035433f1666406 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Mon, 27 Dec 2021 15:25:25 +0100 +Subject: [PATCH] Fix duplicate "Type" key + +Introduced by 542dcd306e236ec776a81e389d0a601387739e48 + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + plugins/impex/jp2/krita_jp2.desktop | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/plugins/impex/jp2/krita_jp2.desktop b/plugins/impex/jp2/krita_jp2.desktop +index 26c448f48b..7de190b247 100644 +--- a/plugins/impex/jp2/krita_jp2.desktop ++++ b/plugins/impex/jp2/krita_jp2.desktop +@@ -120,4 +120,3 @@ Icon=krita + StartupNotify=true + NoDisplay=true + Terminal=false +-Type=Application +-- +GitLab + |