community/krita: fix FTBFS on OpenGLES (closes #11505)

2 files changed, 61 insertions, 4 deletions

diff --git a/community/krita/APKBUILD b/community/krita/APKBUILD
index cf56dff78d..0a6acf3661 100644
--- a/community/krita/APKBUILD
+++ b/community/krita/APKBUILD
@@ -2,9 +2,8 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=krita
 pkgver=4.2.9
-pkgrel=1
-#arch="all !armhf !mips !mips64" # Blocked by py3-qt5 -> qt5-qtdeclarative
-arch="" # ftbfs
+pkgrel=2
+arch="all !armhf !mips !mips64" # Blocked by py3-qt5 -> qt5-qtdeclarative
 url="https://krita.org/"
 pkgdesc="Free digital painting application. Digital Painting, Creative Freedom!"
 license="GPL-2.0-or-later"
@@ -12,6 +11,7 @@ makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev qt5-qtmultimedia-d
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/krita/$pkgver/krita-$pkgver.tar.xz
         fix-crash-with-c-locale.patch
+        pure-opengles-compat.patch
         "
 subpackages="$pkgname-lang"
 options="!check" # Breaks compilation on Musl https://bugs.kde.org/show_bug.cgi?id=412058
@@ -36,4 +36,5 @@ package() {
 }
 
 sha512sums="66eef3d1b5647e62551276662ef4332f15abc022f1032f27a2ad695a8d2dc5fa758146492a9da2b8cbd4a52e47c576473029d2aa9728dea3bec869b8173f08c0  krita-4.2.9.tar.xz
-e7a9117d012df4181e05de970f2210264b8685ee76c98b33795f8095d9a17b24b20e6ce920f944b4b5cb940cf672af5ba5fd0ffae9f53085a4f97da61b1e69f6  fix-crash-with-c-locale.patch"
+e7a9117d012df4181e05de970f2210264b8685ee76c98b33795f8095d9a17b24b20e6ce920f944b4b5cb940cf672af5ba5fd0ffae9f53085a4f97da61b1e69f6  fix-crash-with-c-locale.patch
+5743461739a658bb471dd6b5434f3a396048cd17cd54127feb4572fa6b3a414d48658aa15b52f7f9c1b6d787caec1af1db1739176f7d6a259b2c32396603fd17  pure-opengles-compat.patch"
diff --git a/community/krita/pure-opengles-compat.patch b/community/krita/pure-opengles-compat.patch
new file mode 100644
index 0000000000..43d6886cb7
--- /dev/null
+++ b/community/krita/pure-opengles-compat.patch
@@ -0,0 +1,56 @@
+diff -urN krita-4.2.9.orig/libs/ui/opengl/kis_opengl_canvas2.cpp krita-4.2.9/libs/ui/opengl/kis_opengl_canvas2.cpp
+--- krita-4.2.9.orig/libs/ui/opengl/kis_opengl_canvas2.cpp      2020-05-22 01:52:07.430282697 -0600
++++ krita-4.2.9/libs/ui/opengl/kis_opengl_canvas2.cpp   2020-05-22 01:53:24.310617820 -0600
+@@ -46,10 +46,6 @@
+ #include "KisOpenGLModeProber.h"
+ #include <KoColorModelStandardIds.h>
+ 
+-#ifndef Q_OS_MACOS
+-#include <QOpenGLFunctions_2_1>
+-#endif
+-
+ #define NEAR_VAL -1000.0
+ #define FAR_VAL 1000.0
+ 
+@@ -104,10 +100,6 @@
+     QVector3D vertices[6];
+     QVector2D texCoords[6];
+ 
+-#ifndef Q_OS_MACOS
+-    QOpenGLFunctions_2_1 *glFn201;
+-#endif
+-
+     qreal pixelGridDrawingThreshold;
+     bool pixelGridEnabled;
+     QColor gridColor;
+@@ -271,16 +263,6 @@
+ {
+     KisOpenGL::initializeContext(context());
+     initializeOpenGLFunctions();
+-#ifndef Q_OS_MACOS
+-    if (!KisOpenGL::hasOpenGLES()) {
+-        d->glFn201 = context()->versionFunctions<QOpenGLFunctions_2_1>();
+-        if (!d->glFn201) {
+-            warnUI << "Cannot obtain QOpenGLFunctions_2_1, glLogicOp cannot be used";
+-        }
+-    } else {
+-        d->glFn201 = nullptr;
+-    }
+-#endif
+ 
+     KisConfig cfg(true);
+     d->openGLImageTextures->setProofingConfig(canvas()->proofingConfiguration());
+@@ -446,13 +428,7 @@
+         glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
+ 
+         glEnable(GL_COLOR_LOGIC_OP);
+-#ifndef Q_OS_MACOS
+-        if (d->glFn201) {
+-            d->glFn201->glLogicOp(GL_XOR);
+-        }
+-#else
+         glLogicOp(GL_XOR);
+-#endif
+     } else {
+         glEnable(GL_BLEND);
+         glBlendFuncSeparate(GL_ONE_MINUS_DST_COLOR, GL_ZERO, GL_ONE, GL_ONE);