git » krita.git » commit 5cb5c42

diff --git a/PKGBUILD b/PKGBUILD
index 9600479..ff3b7a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=krita
 _pkgver=5.1.1
 pkgver=${_pkgver/-/}
-pkgrel=2
+pkgrel=3
 pkgdesc='Edit and paint images'
 arch=(x86_64)
 url='https://krita.org'
@@ -17,10 +17,12 @@ optdepends=('poppler-qt5: PDF filter' 'ffmpeg: to save animations'
             '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)
+        krita-xsimd-9.patch
+        fix-global-menu.patch)
 sha256sums=('4ddbf897afa7b187131697d12a23ba39894638068b2eae12b3b434fe42ad8e24'
             'SKIP'
-            '84767e7da9ad861b5a95550f3cd06f45768f8f39eb4a9ce8cdb674163e763234')
+            '84767e7da9ad861b5a95550f3cd06f45768f8f39eb4a9ce8cdb674163e763234'
+            '243d1279dded91e048c146f0419eca3313de47f2cebb54fc0840ce6c6d57e8cf')
 validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD'  # Boudewijn Rempt <foundation@krita.org>
               'E9FB29E74ADEACC5E3035B8AB69EB4CF7468332F'  # Dmitry Kazakov (main key) <dimula73@gmail.com>
               '064182440C674D9F8D0F6F8B4DA79EDA231C852B') # Stichting Krita Foundation <foundation@krita.org>
@@ -28,6 +30,7 @@ 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() {
diff --git a/fix-global-menu.patch b/fix-global-menu.patch
new file mode 100644
index 0000000..12baa36
--- /dev/null
+++ b/fix-global-menu.patch
@@ -0,0 +1,20 @@
+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);