author | Antonio Rojas
<arojas@archlinux.org> 2022-11-03 17:10:14 UTC |
committer | Antonio Rojas
<arojas@archlinux.org> 2022-11-03 17:10:14 UTC |
parent | 5cb5c423117cdf4d0d507faf6a279d64ed24c84e |
PKGBUILD | +5 | -14 |
fix-global-menu.patch | +0 | -20 |
krita-xsimd-9.patch | +0 | -14 |
diff --git a/PKGBUILD b/PKGBUILD index ff3b7a1..c7ab2a0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,9 +1,9 @@ # Maintainer: Antonio Rojas <arojas@archlinux,org> pkgname=krita -_pkgver=5.1.1 +_pkgver=5.1.2 pkgver=${_pkgver/-/} -pkgrel=3 +pkgrel=1 pkgdesc='Edit and paint images' arch=(x86_64) url='https://krita.org' @@ -16,23 +16,14 @@ optdepends=('poppler-qt5: PDF filter' 'ffmpeg: to save animations' 'python-pyqt5: for the Python plugins' 'libheif: HEIF filter' 'kseexpr: SeExpr generator layer' 'kimageformats: PSD support' 'libmypaint: support for MyPaint brushes' 'krita-plugin-gmic: GMic plugin' 'libjxl: JPEG-XL filter') -source=(https://download.kde.org/stable/krita/$_pkgver/$pkgname-$_pkgver.tar.gz{,.sig} - krita-xsimd-9.patch - fix-global-menu.patch) -sha256sums=('4ddbf897afa7b187131697d12a23ba39894638068b2eae12b3b434fe42ad8e24' - 'SKIP' - '84767e7da9ad861b5a95550f3cd06f45768f8f39eb4a9ce8cdb674163e763234' - '243d1279dded91e048c146f0419eca3313de47f2cebb54fc0840ce6c6d57e8cf') +source=(https://download.kde.org/stable/krita/$_pkgver/$pkgname-$_pkgver.tar.gz{,.sig}) +sha256sums=('95bee250e70250a3c0d10b69cd7ddfbb0d22d3ac0a3816eb8eb02fd5f8767bee' + 'SKIP') validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD' # Boudewijn Rempt <foundation@krita.org> 'E9FB29E74ADEACC5E3035B8AB69EB4CF7468332F' # Dmitry Kazakov (main key) <dimula73@gmail.com> '064182440C674D9F8D0F6F8B4DA79EDA231C852B') # Stichting Krita Foundation <foundation@krita.org> options=(debug) -prepare() { - patch -d $pkgname-$pkgver -p1 < krita-xsimd-9.patch # Support xsimd 9 - patch -d $pkgname-$pkgver -p1 < fix-global-menu.patch # Fix global menu on Wayland -} - build() { cmake -B build -S $pkgname-$_pkgver \ -DBUILD_KRITA_QT_DESIGNER_PLUGINS=ON diff --git a/fix-global-menu.patch b/fix-global-menu.patch deleted file mode 100644 index 12baa36..0000000 --- a/fix-global-menu.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/libs/ui/opengl/KisOpenGLModeProber.cpp b/libs/ui/opengl/KisOpenGLModeProber.cpp -index 813af4c9da..0c028e22b4 100644 ---- a/libs/ui/opengl/KisOpenGLModeProber.cpp -+++ b/libs/ui/opengl/KisOpenGLModeProber.cpp -@@ -149,6 +149,7 @@ KisOpenGLModeProber::probeFormat(const KisOpenGL::RendererConfig &rendererConfig - QScopedPointer<AppAttributeSetter> glesSetter; - QScopedPointer<SurfaceFormatSetter> formatSetter; - QScopedPointer<EnvironmentSetter> rendererSetter; -+ QScopedPointer<EnvironmentSetter> portalSetter; - QScopedPointer<QGuiApplication> application; - - int argc = 1; -@@ -166,6 +167,7 @@ KisOpenGLModeProber::probeFormat(const KisOpenGL::RendererConfig &rendererConfig - } - - rendererSetter.reset(new EnvironmentSetter(QLatin1String("QT_ANGLE_PLATFORM"), angleRendererToString(rendererConfig.angleRenderer))); -+ portalSetter.reset(new EnvironmentSetter(QLatin1String("QT_NO_XDG_DESKTOP_PORTAL"), QLatin1String("1"))); - formatSetter.reset(new SurfaceFormatSetter(format)); - - QGuiApplication::setDesktopSettingsAware(false); diff --git a/krita-xsimd-9.patch b/krita-xsimd-9.patch deleted file mode 100644 index 068186a..0000000 --- a/krita-xsimd-9.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index adc513cbe6..947a041ab2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1053,6 +1053,9 @@ list (APPEND ANDROID_EXTRA_LIBS ${LCMS2_LIBRARIES}) - ## Test for xsimd - ## - find_package(xsimd 8.1.0) -+if(NOT xsimd_FOUND) -+ find_package(xsimd 9) -+endif() - set_package_properties(xsimd PROPERTIES - DESCRIPTION "C++ wrappers for SIMD intrinsics" - URL "https://github.com/xtensor-stack/xsimd"