diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-05-02 17:32:56 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-05-02 17:32:56 -0700 |
| commit | 25c1988826eeeee728357a99646fe75634df5f32 (patch) | |
| tree | df245a06a67ae7bbfa74883f8fe47f9d6fe4216d | |
| parent | Rebuild with lua5.3 (diff) | |
| download | freeciv-qt-25c1988826eeeee728357a99646fe75634df5f32.tar.xz | |
Updated to 2.6.4
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | qt5.15-fix.diff | 20 |
2 files changed, 4 insertions, 33 deletions
@@ -8,8 +8,8 @@ _pkgname=freeciv pkgname=freeciv-qt -pkgver=2.6.2 -pkgrel=2 +pkgver=2.6.4 +pkgrel=1 pkgdesc="A multiuser clone of the famous Microprose game of Civilization" arch=('x86_64' 'aarch64') url="https://www.freeciv.org/" @@ -19,17 +19,8 @@ makedepends=('python') conflicts=('freeciv') provides=('freeciv') backup=('etc/freeciv/database.lua') -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 -} +source=(https://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2) +b2sums=('00392974707d9a11e626ac7855fcb27780492b7bead020f6849726ad39833d9ada288bad7245664f8446d0905f027dccc205ee6c943361ba9ba455c55c52cd04') build() { cd ${_pkgname}-${pkgver} diff --git a/qt5.15-fix.diff b/qt5.15-fix.diff deleted file mode 100644 index 1f206c2..0000000 --- a/qt5.15-fix.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- 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" |