[arch-commits] Commit in krita/trunk (PKGBUILD krita-qt5.15-qt5ct.patch)

[Antonio Rojas]

    Date: Thursday, June 4, 2020 @ 21:51:11
  Author: arojas
Revision: 388307

Remove no longer needed workaround for qt5ct crashes

Modified:
  krita/trunk/PKGBUILD
Deleted:
  krita/trunk/krita-qt5.15-qt5ct.patch

--------------------------+
 PKGBUILD                 |    8 ++++----
 krita-qt5.15-qt5ct.patch |   15 ---------------
 2 files changed, 4 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-04 21:50:28 UTC (rev 388306)
+++ PKGBUILD	2020-06-04 21:51:11 UTC (rev 388307)
@@ -2,7 +2,7 @@
 
 pkgname=krita
 pkgver=4.2.9
-pkgrel=5
+pkgrel=6
 pkgdesc="Edit and paint images"
 arch=(x86_64)
 url="https://krita.org"
@@ -18,12 +18,12 @@
 source=("https://download.kde.org/stable/krita/$pkgver/$pkgname-$pkgver.tar.gz"{,.sig}
          krita-pyqt5-sip5.patch
          krita-deadlock-qt5.14.2.patch::"https://invent.kde.org/kde/krita/commit/afed6a9e.patch"
-         krita-qt5.15-qt5ct.patch)
+         krita-qt-5.15.patch::"https://invent.kde.org/graphics/krita/-/commit/d5bb12ac.patch")
 sha256sums=('9f85bb81eaf4976af57352a482af1fdb86f338051a991f6f43976e0b65956da8'
             'SKIP'
             'ab2f33843d8cad31bc13e0eca7dc732cdbfed054924f25ed61102c0d0971c1d8'
             '6477ceec976d376172cc82a5a8bf85938a7dffd924286fa79e64ccdab8c901eb'
-            '68583720a24e232dad49c1e042ed9dd0b257d5a433382ea554e4097ca261760e')
+            '8fac35357e6f69f919d47e600cc6dff64f08665bed4853219043949032e19370')
 validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt <foundation at krita.org>
 
 prepare() {
@@ -32,7 +32,7 @@
   cd $pkgname-$pkgver
   patch -p1 -i ../krita-pyqt5-sip5.patch # Fix sip include dir when PyQt5 is compiled with SIP 5
   patch -p1 -i ../krita-deadlock-qt5.14.2.patch # Fix deadlock on plugin load with Qt 5.14.2
-  patch -p1 -i ../krita-qt5.15-qt5ct.patch # Workaround crash when using Qt 5.15 + qt5ct
+  patch -p1 -i ../krita-qt-5.15.patch # Fix build with Qt 5.15
 }
 
 build() {

Deleted: krita-qt5.15-qt5ct.patch
===================================================================
--- krita-qt5.15-qt5ct.patch	2020-06-04 21:50:28 UTC (rev 388306)
+++ krita-qt5.15-qt5ct.patch	2020-06-04 21:51:11 UTC (rev 388307)
@@ -1,15 +0,0 @@
-diff --git a/libs/ui/opengl/KisOpenGLModeProber.cpp b/libs/ui/opengl/KisOpenGLModeProber.cpp
-index 6589e67034..01e3040759 100644
---- a/libs/ui/opengl/KisOpenGLModeProber.cpp
-+++ b/libs/ui/opengl/KisOpenGLModeProber.cpp
-@@ -181,7 +181,10 @@ KisOpenGLModeProber::probeFormat(const KisOpenGL::RendererConfig &rendererConfig
-         formatSetter.reset(new SurfaceFormatSetter(format));
- 
-         QGuiApplication::setDesktopSettingsAware(false);
-+        QString platformtheme = qgetenv("QT_QPA_PLATFORMTHEME");
-+        qunsetenv("QT_QPA_PLATFORMTHEME");
-         application.reset(new QGuiApplication(argc, &argv));
-+        qputenv("QT_QPA_PLATFORMTHEME", platformtheme.toLocal8Bit());
-         QGuiApplication::setDesktopSettingsAware(true);
-     }
-