Fix include bug

3 files changed, 47 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 91d93f4cf32a..760131a626e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,18 @@
 pkgbase = cutecom
 	pkgdesc = A graphical serial terminal
 	pkgver = 0.51.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gitlab.com/cutecom/cutecom
+	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = cmake
+	depends = qt5-base
 	depends = qt5-serialport
 	source = cutecom-v0.51.0.tar.gz::https://gitlab.com/cutecom/cutecom/-/archive/v0.51.0/cutecom-v0.51.0.tar.gz
-	md5sums = bcc5d13ab5c70f1e343ad32b57c9618c
+	source = fix_qpainterpath.patch
+	sha256sums = 4b2591daa983b31716091bd1602988b5a06a19c1a3402150826fc36233edbedd
+	sha256sums = 9ac6861c60b7e68cc0daa58ff745fffbf5a99214b584d00e54574db41e4e7eca
 
 pkgname = cutecom
 
diff --git a/PKGBUILD b/PKGBUILD
index 3c56f7ee1e22..25e8572d9dfc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,28 +3,39 @@
 
 pkgname=cutecom
 pkgver=0.51.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A graphical serial terminal"
-arch=('x86_64')
+arch=(i686 x86_64)
 url="https://gitlab.com/cutecom/cutecom"
-license=('GPL3')
-depends=('qt5-serialport')
-makedepends=('cmake')
-source=(${pkgname}-v${pkgver}.tar.gz::${url}/-/archive/v${pkgver}/cutecom-v${pkgver}.tar.gz)
+license=(GPL3)
+depends=(qt5-base qt5-serialport)
+makedepends=(cmake)
+source=(${pkgname}-v${pkgver}.tar.gz::${url}/-/archive/v${pkgver}/cutecom-v${pkgver}.tar.gz
+fix_qpainterpath.patch)
+sha256sums=('4b2591daa983b31716091bd1602988b5a06a19c1a3402150826fc36233edbedd'
+            '9ac6861c60b7e68cc0daa58ff745fffbf5a99214b584d00e54574db41e4e7eca')
+
+prepare() {
+    cd "${srcdir}/cutecom-v${pkgver}"
+
+    patch -Np0 -i "${srcdir}/fix_qpainterpath.patch"
+}
 
 build() {
-  cd ${srcdir}/cutecom-v${pkgver}
+    cd "${srcdir}/cutecom-v${pkgver}"
 
-  cmake .
-  make || return 1
+    mkdir build
+    cd build
+
+    cmake ..
+    make
 }
 
 package() {
-  cd ${srcdir}/cutecom-v${pkgver}
-  install -D -m 644 cutecom.desktop ${pkgdir}/usr/share/applications/cutecom.desktop
-  install -D -m 644 images/cutecom.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/cutecom.svg
-  install -D -m 755 cutecom ${pkgdir}/usr/bin/cutecom
-  install -D -m 644 cutecom.1 ${pkgdir}/usr/share/man/man1/cutecom.1
-}
+    cd "${srcdir}/cutecom-v${pkgver}"
 
-md5sums=('bcc5d13ab5c70f1e343ad32b57c9618c')
+    install -Dm644 cutecom.desktop "${pkgdir}/usr/share/applications/cutecom.desktop"
+    install -Dm644 images/cutecom.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/cutecom.svg"
+    install -Dm755 build/cutecom "${pkgdir}/usr/bin/cutecom"
+    install -Dm644 cutecom.1 "${pkgdir}/usr/share/man/man1/cutecom.1"
+}
diff --git a/fix_qpainterpath.patch b/fix_qpainterpath.patch
new file mode 100644
index 000000000000..1d3a8e2f90d9
--- /dev/null
+++ b/fix_qpainterpath.patch
@@ -0,0 +1,14 @@
+--- ctrlcharacterspopup.cpp	2018-09-01 14:46:58.000000000 +0300
++++ ctrlcharacterspopup.cpp	2020-07-06 17:22:57.636027139 +0300
+@@ -21,10 +21,11 @@
+ 
+ #include "ctrlcharacterspopup.h"
+ #include <QApplication>
+ #include <QKeyEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPoint>
+ #include <QPushButton>
+ #include <QSignalMapper>
+ #include <QString>
+ #include <QTimer>