texstudio: qt5.15 fix

4 files changed, 33 insertions, 3 deletions

diff --git a/editors/texstudio/Makefile b/editors/texstudio/Makefile
index 7539f9e9d6c..eb5ab22c9fb 100644
--- a/editors/texstudio/Makefile
+++ b/editors/texstudio/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2020/06/02 08:23:44 adam Exp $
+# $NetBSD: Makefile,v 1.54 2020/06/10 06:36:14 markd Exp $
 
 DISTNAME=	texstudio-2.12.22
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GITHUB:=texstudio-org/}
 
diff --git a/editors/texstudio/distinfo b/editors/texstudio/distinfo
index 21eb995c75a..68090b66612 100644
--- a/editors/texstudio/distinfo
+++ b/editors/texstudio/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.8 2020/03/01 12:48:13 markd Exp $
+$NetBSD: distinfo,v 1.9 2020/06/10 06:36:14 markd Exp $
 
 SHA1 (texstudio-2.12.22.tar.gz) = a3ebcb87913999b3d674464eba5502cd7453d7be
 RMD160 (texstudio-2.12.22.tar.gz) = 1560e583e60da30543eb90c39bbc9a76743b76c3
 SHA512 (texstudio-2.12.22.tar.gz) = c589285d1fba00812583a3d58602a99e044eb4bcf6a84b939d00ad7fe4ba8f15788031361fc9b4cb8df19f8098911c437d1de5459c1736fa40888b88d13b10d1
 Size (texstudio-2.12.22.tar.gz) = 35965795 bytes
+SHA1 (patch-manhattanstyle.cpp) = 390e4026a44656e7fb2a675f958b8a6f315cffdc
 SHA1 (patch-minisplitter.cpp) = 93b1910a12308294a5ae4870da0b208cb4580ee7
+SHA1 (patch-mostQtHeaders.h) = debd3e35005a9fe014e65671db98904a0c76b8a5
 SHA1 (patch-pdfviewer_PDFDocument.cpp) = 3b897c52dcfd507682f52ef4b1a61a26f4ec00a3
diff --git a/editors/texstudio/patches/patch-manhattanstyle.cpp b/editors/texstudio/patches/patch-manhattanstyle.cpp
new file mode 100644
index 00000000000..247e8d9516e
--- /dev/null
+++ b/editors/texstudio/patches/patch-manhattanstyle.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-manhattanstyle.cpp,v 1.1 2020/06/10 06:36:14 markd Exp $
+
+qt5.15 fix
+
+--- src/manhattanstyle.cpp.orig	2020-01-15 19:10:58.000000000 +0000
++++ src/manhattanstyle.cpp
+@@ -44,6 +44,7 @@
+ #include <QMainWindow>
+ #include <QMenuBar>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPixmap>
+ #include <QPixmapCache>
+ #include <QPushButton>
diff --git a/editors/texstudio/patches/patch-mostQtHeaders.h b/editors/texstudio/patches/patch-mostQtHeaders.h
new file mode 100644
index 00000000000..c0959073dd5
--- /dev/null
+++ b/editors/texstudio/patches/patch-mostQtHeaders.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-mostQtHeaders.h,v 1.1 2020/06/10 06:36:14 markd Exp $
+
+qt5.15 fix
+
+--- src/mostQtHeaders.h.orig	2020-01-15 19:10:58.000000000 +0000
++++ src/mostQtHeaders.h
+@@ -83,6 +83,7 @@
+ #include <QObject>

+ #include <QPaintEvent>

+ #include <QPainter>

++#include <QPainterPath>

+ #include <QPixmap>

+ #include <QPixmapCache>

+ #include <QPointer>