mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
media-gfx/krita: Drop 5.0.2
Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -1,2 +1 @@
|
||||
DIST krita-5.0.2.tar.xz 179049488 BLAKE2B a58ee0e7d654f18509f970d32a680a9a993c7172a3818517ddf0a41f500c2d1f9102a432b728b9d9254f39f1be0c926602e3b1806ae19b6efc49f99becdffcdd SHA512 5dd2d6961feabf20dbcef49f3499281e34b409e96d379b0247eec70449f82c05ed3cf3ca09014535adb7ce66659d58e988f1f054364637c9851181fa8ee926a5
|
||||
DIST krita-5.0.8.tar.xz 179344256 BLAKE2B f8a020b726c2b4f7776b3a31d18028d19f274243fa085ca49e46cd06c2d9e4f8f166e4d77018b1bef7ef2820962759f362e3d00274b3bbb33ac1544ce17d5682 SHA512 652a24206f955739dbd188f4c35d10fdfe42bb660f4e046f15a31ee90647786b501e4ad8760c0656b24aa5fbdeda0c009b744dfc16a92cf545c2147a5ad1c777
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,124 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
ECM_TEST="forceoptional"
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
KFMIN=5.82.0
|
||||
QTMIN=5.15.2
|
||||
VIRTUALX_REQUIRED="test"
|
||||
inherit ecm kde.org python-single-r1
|
||||
|
||||
if [[ ${KDE_BUILD_TYPE} = release ]]; then
|
||||
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
|
||||
KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
|
||||
HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="5"
|
||||
IUSE="color-management fftw gif +gsl heif +jpeg +mypaint-brush-engine openexr pdf qtmedia +raw vc webp"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
# bug 630508
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="${PYTHON_DEPS}
|
||||
dev-libs/boost:=
|
||||
dev-libs/quazip:0=
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}]
|
||||
dev-python/sip:=[${PYTHON_USEDEP}]
|
||||
')
|
||||
>=dev-qt/qtconcurrent-${QTMIN}:5
|
||||
>=dev-qt/qtdbus-${QTMIN}:5
|
||||
>=dev-qt/qtdeclarative-${QTMIN}:5
|
||||
>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
|
||||
>=dev-qt/qtnetwork-${QTMIN}:5
|
||||
>=dev-qt/qtprintsupport-${QTMIN}:5
|
||||
>=dev-qt/qtsql-${QTMIN}:5
|
||||
>=dev-qt/qtsvg-${QTMIN}:5
|
||||
>=dev-qt/qtwidgets-${QTMIN}:5
|
||||
>=dev-qt/qtx11extras-${QTMIN}:5
|
||||
>=dev-qt/qtxml-${QTMIN}:5
|
||||
>=kde-frameworks/kcompletion-${KFMIN}:5
|
||||
>=kde-frameworks/kconfig-${KFMIN}:5
|
||||
>=kde-frameworks/kcoreaddons-${KFMIN}:5
|
||||
>=kde-frameworks/kcrash-${KFMIN}:5
|
||||
>=kde-frameworks/kguiaddons-${KFMIN}:5
|
||||
>=kde-frameworks/ki18n-${KFMIN}:5
|
||||
>=kde-frameworks/kiconthemes-${KFMIN}:5
|
||||
>=kde-frameworks/kitemmodels-${KFMIN}:5
|
||||
>=kde-frameworks/kitemviews-${KFMIN}:5
|
||||
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
|
||||
>=kde-frameworks/kwindowsystem-${KFMIN}:5
|
||||
>=kde-frameworks/kxmlgui-${KFMIN}:5
|
||||
media-gfx/exiv2:=
|
||||
media-libs/lcms
|
||||
media-libs/libpng:0=
|
||||
media-libs/tiff:0
|
||||
sys-libs/zlib
|
||||
virtual/opengl
|
||||
x11-libs/libX11
|
||||
x11-libs/libXi
|
||||
color-management? ( >=media-libs/opencolorio-2.0.0 )
|
||||
fftw? ( sci-libs/fftw:3.0= )
|
||||
gif? ( media-libs/giflib )
|
||||
gsl? ( sci-libs/gsl:= )
|
||||
jpeg? ( virtual/jpeg:0 )
|
||||
heif? ( >=media-libs/libheif-1.11:= )
|
||||
mypaint-brush-engine? ( media-libs/libmypaint:= )
|
||||
openexr? ( media-libs/openexr:= )
|
||||
pdf? ( app-text/poppler[qt5] )
|
||||
qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
|
||||
raw? ( media-libs/libraw:= )
|
||||
webp? ( >=media-libs/libwebp-1.2.0:= )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
vc? ( >=dev-libs/vc-1.1.0 )
|
||||
"
|
||||
BDEPEND="
|
||||
dev-cpp/eigen:3
|
||||
dev-lang/perl
|
||||
sys-devel/gettext
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
|
||||
"${FILESDIR}"/${PN}-5.0.0-clang.patch # bug 830225
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
ecm_pkg_setup
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Prevent sandbox violation from FindPyQt5.py module
|
||||
# See Gentoo-bug 655918
|
||||
addpredict /dev/dri
|
||||
|
||||
local mycmakeargs=(
|
||||
-DENABLE_UPDATERS=OFF
|
||||
-DFETCH_TRANSLATIONS=OFF
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
|
||||
$(cmake_use_find_package color-management OpenColorIO)
|
||||
$(cmake_use_find_package fftw FFTW3)
|
||||
$(cmake_use_find_package gif GIF)
|
||||
$(cmake_use_find_package gsl GSL)
|
||||
$(cmake_use_find_package heif HEIF)
|
||||
$(cmake_use_find_package jpeg JPEG)
|
||||
$(cmake_use_find_package mypaint-brush-engine LibMyPaint)
|
||||
$(cmake_use_find_package openexr OpenEXR)
|
||||
$(cmake_use_find_package pdf Poppler)
|
||||
$(cmake_use_find_package qtmedia Qt5Multimedia)
|
||||
$(cmake_use_find_package raw LibRaw)
|
||||
$(cmake_use_find_package vc Vc)
|
||||
$(cmake_use_find_package webp WebP)
|
||||
)
|
||||
|
||||
ecm_src_configure
|
||||
}
|
||||
Reference in New Issue
Block a user