Fix Qt 5.15 issues

4 files changed, 228 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7178888ce147..5de89973d84d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gitahead
 	pkgdesc = Understand your Git history!
 	pkgver = 2.6.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.gitahead.com/
 	arch = x86_64
 	license = MIT
@@ -16,9 +16,13 @@ pkgbase = gitahead
 	source = git+https://github.com/gitahead/gitahead#tag=v2.6.2
 	source = gitahead.desktop
 	source = gitahead.patch
+	source = qt-5.15-fixes.patch
+	source = fix-qt-theme.patch
 	sha256sums = SKIP
 	sha256sums = 254b4e970a942c6ac94df177e54a6169fe7e5f5c5d0d92b6f0c0f03b7b7b2fb0
 	sha256sums = 096e8f3700d7d74884e81eae3282fa1b4fad1cfa7a179ff03f1a7d89867538a0
+	sha256sums = 422f90259e5f312a75da1030524dfd6fa054d261376b73317bb9b9fffa8de4ad
+	sha256sums = 569d9a08059907e002b6b0f1c0b5aa898a0a2bd616e93a6eb20dd617320b987a
 
 pkgname = gitahead
 
diff --git a/PKGBUILD b/PKGBUILD
index acc86b029fc8..6e114f24ef27 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Angelo Theodorou <encelo@gmail.com>
 
 pkgname=gitahead
-pkgrel=1
+pkgrel=2
 pkgver=2.6.2
 pkgdesc='Understand your Git history!'
 url='https://www.gitahead.com/'
@@ -17,14 +17,22 @@ source=(
   "git+https://github.com/gitahead/gitahead#tag=v${pkgver}"
   "gitahead.desktop"
   "gitahead.patch"
+  "qt-5.15-fixes.patch"
+  "fix-qt-theme.patch"
 )
 sha256sums=('SKIP'
             '254b4e970a942c6ac94df177e54a6169fe7e5f5c5d0d92b6f0c0f03b7b7b2fb0'
-            '096e8f3700d7d74884e81eae3282fa1b4fad1cfa7a179ff03f1a7d89867538a0')
+            '096e8f3700d7d74884e81eae3282fa1b4fad1cfa7a179ff03f1a7d89867538a0'
+            '422f90259e5f312a75da1030524dfd6fa054d261376b73317bb9b9fffa8de4ad'
+            '569d9a08059907e002b6b0f1c0b5aa898a0a2bd616e93a6eb20dd617320b987a')
 
 prepare() {
   cd "$srcdir/gitahead"
   patch --forward --strip=1 --input="../gitahead.patch"
+  patch --forward --strip=1 --input="${srcdir}/qt-5.15-fixes.patch"
+
+  # From https://github.com/gitahead/gitahead/pull/445
+  patch --forward --strip=1 --input="${srcdir}/fix-qt-theme.patch"
 
   git submodule update --init --recursive
 }
diff --git a/fix-qt-theme.patch b/fix-qt-theme.patch
new file mode 100644
index 000000000000..fe0510b3f85e
--- /dev/null
+++ b/fix-qt-theme.patch
@@ -0,0 +1,31 @@
+From 0817e3933cf8a4122cbba944ff5d32a8cdb78f9b Mon Sep 17 00:00:00 2001
+From: Mick Sayson <mick@sayson.com>
+Date: Fri, 12 Jun 2020 19:52:50 -0700
+Subject: [PATCH] Fix default palette application on Qt 5.15.0
+
+---
+ src/app/Application.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/app/Application.cpp b/src/app/Application.cpp
+index 7a54b89..143dc05 100644
+--- a/src/app/Application.cpp
++++ b/src/app/Application.cpp
+@@ -27,6 +27,7 @@
+ #include <QNetworkReply>
+ #include <QOperatingSystemVersion>
+ #include <QSettings>
++#include <QStyle>
+ #include <QSysInfo>
+ #include <QTimer>
+ #include <QTranslator>
+@@ -187,6 +188,9 @@ Application::Application(int &argc, char **argv, bool haltOnParseError)
+   // Enable system proxy auto-detection.
+   QNetworkProxyFactory::setUseSystemConfiguration(true);
+ 
++  // Set default pallete. Pre Qt 5.15.0 this should be the same as the default
++  QApplication::setPalette(QApplication::style()->standardPalette());
++
+   // Do platform-specific initialization.
+ #if defined(Q_OS_MAC)
+   // Register service on Mac.
diff --git a/qt-5.15-fixes.patch b/qt-5.15-fixes.patch
new file mode 100644
index 000000000000..5a0c07e9dda3
--- /dev/null
+++ b/qt-5.15-fixes.patch
@@ -0,0 +1,182 @@
+From 628746382997ecd4b8cc122c21bf5ed7206f47fb Mon Sep 17 00:00:00 2001
+From: Tim Schumacher <timschumi@gmx.de>
+Date: Thu, 18 Jun 2020 20:46:40 +0200
+Subject: [PATCH] Fixes for Qt 5.15
+
+- QPainterPath is now its own header file
+
+---
+ src/ui/Badge.cpp             | 1 +
+ src/ui/ColumnView.cpp        | 1 +
+ src/ui/CommitList.cpp        | 1 +
+ src/ui/CommitToolBar.cpp     | 1 +
+ src/ui/ContextMenuButton.cpp | 1 +
+ src/ui/DetailView.cpp        | 1 +
+ src/ui/DiffView.cpp          | 1 +
+ src/ui/ExpandButton.cpp      | 1 +
+ src/ui/FileList.cpp          | 1 +
+ src/ui/FindWidget.cpp        | 1 +
+ src/ui/Footer.cpp            | 1 +
+ src/ui/SearchField.cpp       | 1 +
+ src/ui/ToolBar.cpp           | 1 +
+ 13 files changed, 13 insertions(+)
+
+diff --git a/src/ui/Badge.cpp b/src/ui/Badge.cpp
+index cb86812..fd3fb4b 100644
+--- a/src/ui/Badge.cpp
++++ b/src/ui/Badge.cpp
+@@ -10,6 +10,7 @@
+ #include "Badge.h"
+ #include "app/Application.h"
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QStyleOption>
+ 
+ namespace {
+diff --git a/src/ui/ColumnView.cpp b/src/ui/ColumnView.cpp
+index 4193f82..cc6c9e1 100644
+--- a/src/ui/ColumnView.cpp
++++ b/src/ui/ColumnView.cpp
+@@ -15,6 +15,7 @@
+ #include <QLabel>
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QVBoxLayout>
+ 
+ #ifdef Q_OS_WIN
+diff --git a/src/ui/CommitList.cpp b/src/ui/CommitList.cpp
+index 08e14a9..a744e55 100644
+--- a/src/ui/CommitList.cpp
++++ b/src/ui/CommitList.cpp
+@@ -31,6 +31,7 @@
+ #include <QApplication>
+ #include <QMenu>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPushButton>
+ #include <QStyledItemDelegate>
+ #include <QTextLayout>
+diff --git a/src/ui/CommitToolBar.cpp b/src/ui/CommitToolBar.cpp
+index a8252a9..a151879 100644
+--- a/src/ui/CommitToolBar.cpp
++++ b/src/ui/CommitToolBar.cpp
+@@ -15,6 +15,7 @@
+ #include <QApplication>
+ #include <QMenu>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QProxyStyle>
+ #include <QStyleOption>
+ #include <QToolButton>
+diff --git a/src/ui/ContextMenuButton.cpp b/src/ui/ContextMenuButton.cpp
+index 403a526..7bfbb05 100644
+--- a/src/ui/ContextMenuButton.cpp
++++ b/src/ui/ContextMenuButton.cpp
+@@ -9,6 +9,7 @@
+ 
+ #include "ContextMenuButton.h"
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QStyleOption>
+ #include <QStylePainter>
+ #include <QToolBar>
+diff --git a/src/ui/DetailView.cpp b/src/ui/DetailView.cpp
+index 315dcb7..5127450 100644
+--- a/src/ui/DetailView.cpp
++++ b/src/ui/DetailView.cpp
+@@ -30,6 +30,7 @@
+ #include <QNetworkReply>
+ #include <QNetworkRequest>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPushButton>
+ #include <QRegularExpression>
+ #include <QStackedWidget>
+diff --git a/src/ui/DiffView.cpp b/src/ui/DiffView.cpp
+index dbadd79..552a757 100644
+--- a/src/ui/DiffView.cpp
++++ b/src/ui/DiffView.cpp
+@@ -45,6 +45,7 @@
+ #include <QMimeData>
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPushButton>
+ #include <QSaveFile>
+ #include <QScrollBar>
+diff --git a/src/ui/ExpandButton.cpp b/src/ui/ExpandButton.cpp
+index b36917b..624d502 100644
+--- a/src/ui/ExpandButton.cpp
++++ b/src/ui/ExpandButton.cpp
+@@ -9,6 +9,7 @@
+ 
+ #include "ExpandButton.h"
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ ExpandButton::ExpandButton(QWidget *parent)
+   : QToolButton(parent)
+diff --git a/src/ui/FileList.cpp b/src/ui/FileList.cpp
+index 1aad0f4..f82541c 100644
+--- a/src/ui/FileList.cpp
++++ b/src/ui/FileList.cpp
+@@ -22,6 +22,7 @@
+ #include <QApplication>
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QSettings>
+ #include <QStyledItemDelegate>
+ #include <QWindow>
+diff --git a/src/ui/FindWidget.cpp b/src/ui/FindWidget.cpp
+index 567f39b..07096b4 100644
+--- a/src/ui/FindWidget.cpp
++++ b/src/ui/FindWidget.cpp
+@@ -15,6 +15,7 @@
+ #include <QLabel>
+ #include <QLineEdit>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QShortcut>
+ #include <QShowEvent>
+ #include <QStyleOption>
+diff --git a/src/ui/Footer.cpp b/src/ui/Footer.cpp
+index f68bc2c..fac6f51 100644
+--- a/src/ui/Footer.cpp
++++ b/src/ui/Footer.cpp
+@@ -11,6 +11,7 @@
+ #include <QHBoxLayout>
+ #include <QMenu>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPaintEvent>
+ #include <QPen>
+ #include <QStyleOption>
+diff --git a/src/ui/SearchField.cpp b/src/ui/SearchField.cpp
+index b7687bf..fac5768 100644
+--- a/src/ui/SearchField.cpp
++++ b/src/ui/SearchField.cpp
+@@ -9,6 +9,7 @@
+ 
+ #include "SearchField.h"
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QStyle>
+ #include <QToolButton>
+ 
+diff --git a/src/ui/ToolBar.cpp b/src/ui/ToolBar.cpp
+index e64d541..88a1807 100644
+--- a/src/ui/ToolBar.cpp
++++ b/src/ui/ToolBar.cpp
+@@ -21,6 +21,7 @@
+ #include <QHBoxLayout>
+ #include <QMenu>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QStyleOptionToolButton>
+ #include <QToolButton>
+ #include <QWindow>
+-- 
+2.27.0
+