[arch-commits] Commit in librecad/trunk (0001-fix-build-with-Qt-5.11.patch PKGBUILD)

[Christian Hesse]

    Date: Thursday, November 8, 2018 @ 09:31:01
  Author: eworm
Revision: 403222

upgpkg: librecad 2.1.3-4

rebuild old package

Added:
  librecad/trunk/0001-fix-build-with-Qt-5.11.patch
Modified:
  librecad/trunk/PKGBUILD

-----------------------------------+
 0001-fix-build-with-Qt-5.11.patch |   43 ++++++++++++++++++++++++++++++++++++
 PKGBUILD                          |   15 ++++++++++--
 2 files changed, 55 insertions(+), 3 deletions(-)

Added: 0001-fix-build-with-Qt-5.11.patch
===================================================================
--- 0001-fix-build-with-Qt-5.11.patch	                        (rev 0)
+++ 0001-fix-build-with-Qt-5.11.patch	2018-11-08 09:31:01 UTC (rev 403222)
@@ -0,0 +1,43 @@
+From 5bd5d5b1ea6781fcbc3c9c61b2059703647dc5d2 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jslaby at suse.cz>
+Date: Mon, 11 Jun 2018 10:44:00 +0200
+Subject: [PATCH 1/1] fix build with Qt 5.11
+
+The new Qt removed some implicit inclusions of headers. To avoid build
+errors, add explicit includes of those we use in the sources.
+
+Signed-off-by: Jiri Slaby <jslaby at suse.cz>
+
+(cherry picked from commit 6c392e903e162b9283e88f53006e929663f2e883)
+Signed-off-by: Christian Hesse <mail at eworm.de>
+---
+ librecad/src/ui/forms/qg_commandwidget.cpp | 2 ++
+ librecad/src/ui/generic/widgetcreator.cpp  | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp b/librecad/src/ui/forms/qg_commandwidget.cpp
+index 7cd69398..2b90d671 100644
+--- a/librecad/src/ui/forms/qg_commandwidget.cpp
++++ b/librecad/src/ui/forms/qg_commandwidget.cpp
+@@ -24,6 +24,8 @@
+ **
+ **********************************************************************/
+ #include "qg_commandwidget.h"
++
++#include <QAction>
+ #include <QKeyEvent>
+ #include <algorithm>
+ 
+diff --git a/librecad/src/ui/generic/widgetcreator.cpp b/librecad/src/ui/generic/widgetcreator.cpp
+index ca89ab13..260d9afd 100644
+--- a/librecad/src/ui/generic/widgetcreator.cpp
++++ b/librecad/src/ui/generic/widgetcreator.cpp
+@@ -27,6 +27,8 @@
+ #include "widgetcreator.h"
+ #include "ui_widgetcreator.h"
+ 
++#include <QAction>
++#include <QActionGroup>
+ #include <QSettings>
+ #include <QLineEdit>
+ #include <QPushButton>

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-08 09:01:40 UTC (rev 403221)
+++ PKGBUILD	2018-11-08 09:31:01 UTC (rev 403222)
@@ -5,7 +5,7 @@
 
 pkgname=librecad
 pkgver=2.1.3
-pkgrel=3
+pkgrel=4
 pkgdesc='A 2D CAD drawing tool based on the community edition of QCad'
 arch=('x86_64')
 url='https://www.librecad.org/'
@@ -14,9 +14,18 @@
 makedepends=('qt5-tools' 'boost' 'imagemagick' 'librsvg')
 conflicts=('librecad-git')
 replaces=('librecad-svn' 'caduntu' 'caduntu-svn')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LibreCAD/LibreCAD/archive/${pkgver}.tar.gz")
-sha256sums=('74c4ede409b13d0365c65c0cd52dba04f1049530f6df706dc905443d5e60db06')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LibreCAD/LibreCAD/archive/${pkgver}.tar.gz"
+        '0001-fix-build-with-Qt-5.11.patch')
+sha256sums=('74c4ede409b13d0365c65c0cd52dba04f1049530f6df706dc905443d5e60db06'
+            '7590015c964888673844b1342e684e417b8bd2a5baacecebfbdc2f9aa0749360')
 
+prepare() {
+	cd "${srcdir}/LibreCAD-${pkgver}"
+
+	# fix build with Qt 5.11
+	patch -Np1 < ../0001-fix-build-with-Qt-5.11.patch
+}
+
 build() {
 	cd "${srcdir}/LibreCAD-${pkgver}"