diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2020-07-09 00:07:54 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2020-07-09 00:07:54 -0700 |
| commit | 2f22878d2c2f12d109ae0b39d71afdd29e307740 (patch) | |
| tree | bc3d23b3239ae1556e86b3d01c0cd196bc529b7d | |
| parent | Updated to 2.6.2 (diff) | |
| download | freeciv-qt-2f22878d2c2f12d109ae0b39d71afdd29e307740.tar.xz | |
Fix for qt 5.15
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | qt5.15-fix.diff | 20 |
2 files changed, 32 insertions, 3 deletions
@@ -9,7 +9,7 @@ _pkgname=freeciv pkgname=freeciv-qt pkgver=2.6.2 -pkgrel=1 +pkgrel=1.2 pkgdesc="A multiuser clone of the famous Microprose game of Civilization" arch=('x86_64' 'aarch64') url="https://www.freeciv.org/" @@ -19,8 +19,17 @@ makedepends=('python') conflicts=('freeciv') provides=('freeciv') backup=('etc/freeciv/database.lua') -source=(https://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2) -b2sums=('5d30274f24786dcd0b29d4d85a45be47e791aedba7fbeeb28001e2c19d2acc1fa16b4ab88b779d0dbd318806e571a26c94f8a61b33c6d8df8e68d4fd90713302') +source=(https://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2 + qt5.15-fix.diff) +b2sums=('5d30274f24786dcd0b29d4d85a45be47e791aedba7fbeeb28001e2c19d2acc1fa16b4ab88b779d0dbd318806e571a26c94f8a61b33c6d8df8e68d4fd90713302' + 'bd56898fa81f1e6fa68e3b47de124f5033ac9f20488bb9d128e3f7ec6b83e690293287f3b7f95b8e16f75787428e7351f1d6b89ec4c459c525655320b72f7732') + +prepare() { + cd ${_pkgname}-${pkgver} + + #workaround for qt 5.15 + patch -p1 -i ${srcdir}/qt5.15-fix.diff +} build() { cd ${_pkgname}-${pkgver} diff --git a/qt5.15-fix.diff b/qt5.15-fix.diff new file mode 100644 index 0000000..1f206c2 --- /dev/null +++ b/qt5.15-fix.diff @@ -0,0 +1,20 @@ +--- a/client/gui-qt/dialogs.cpp ++++ b/client/gui-qt/dialogs.cpp +@@ -24,6 +24,7 @@ + #include <QMessageBox> + #include <QMouseEvent> + #include <QPainter> ++#include <QPainterPath> + #include <QRadioButton> + #include <QRect> + #include <QSignalMapper> +--- a/client/gui-qt/canvas.cpp ++++ b/client/gui-qt/canvas.cpp +@@ -18,6 +18,7 @@ + // Qt + #include <QFontMetrics> + #include <QPainter> ++#include <QPainterPath> + + // qt-client + #include "canvas.h" |