Accepting request 616224 from graphics
OBS-URL: https://build.opensuse.org/request/show/616224 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/librecad?expand=0&rev=21
This commit is contained in:
@@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 11 09:02:23 UTC 2018 - jslaby@suse.com
|
||||
|
||||
- add fix-build-with-Qt-5.11.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 1 13:09:28 UTC 2017 - adam.majer@suse.de
|
||||
|
||||
|
||||
+2
-1
@@ -35,6 +35,7 @@ Source4: http://wiki.librecad.org/images/9/9d/Electrical1-LCAD.zip
|
||||
Source10: ttf2lff.1
|
||||
Source20: %name-rpmlintrc
|
||||
Patch0: ensured-all-objects-are-shown-when-a-layer-is-toggle.patch
|
||||
Patch1: fix-build-with-Qt-5.11.patch
|
||||
Patch2: librecad-no-date.diff
|
||||
Patch3: librecad-use-system-libdxfrw.patch
|
||||
Patch4: librecad-install.diff
|
||||
@@ -92,7 +93,7 @@ CAD drawings.
|
||||
|
||||
%prep
|
||||
%setup -qn LibreCAD-%version -a 2 -a 3 -a 4
|
||||
%patch -P 0 -P 2 -P 3 -P 4 -P 5 -p1
|
||||
%patch -P 0 -P 1 -P 2 -P 3 -P 4 -P 5 -p1
|
||||
%if 0%{?suse_version} >= 1321
|
||||
%patch -P 6 -p1
|
||||
%endif
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
From 6c392e903e162b9283e88f53006e929663f2e883 Mon Sep 17 00:00:00 2001
|
||||
From: Jiri Slaby <jslaby@suse.cz>
|
||||
Date: Mon, 11 Jun 2018 10:44:00 +0200
|
||||
Subject: [PATCH] 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@suse.cz>
|
||||
---
|
||||
librecad/src/ui/forms/qg_commandwidget.cpp | 1 +
|
||||
librecad/src/ui/generic/widgetcreator.cpp | 2 ++
|
||||
2 files changed, 3 insertions(+)
|
||||
|
||||
--- a/librecad/src/ui/forms/qg_commandwidget.cpp
|
||||
+++ b/librecad/src/ui/forms/qg_commandwidget.cpp
|
||||
@@ -24,6 +24,7 @@
|
||||
**
|
||||
**********************************************************************/
|
||||
#include "qg_commandwidget.h"
|
||||
+#include <QAction>
|
||||
#include <QKeyEvent>
|
||||
#include <algorithm>
|
||||
|
||||
--- 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>
|
||||
Reference in New Issue
Block a user