From 92a634bff98b8cf11ce06e34dbf175a965757519 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 20 Sep 2018 13:17:20 +0000
Subject: [PATCH] librecad: fix build (#3100)

---
 .../librecad/patches/librecad-2.1.3.patchset  | 74 +++++++++++++------
 1 file changed, 53 insertions(+), 21 deletions(-)

diff --git a/media-gfx/librecad/patches/librecad-2.1.3.patchset b/media-gfx/librecad/patches/librecad-2.1.3.patchset
index 2513a4a66..e8c5de36d 100644
--- a/media-gfx/librecad/patches/librecad-2.1.3.patchset
+++ b/media-gfx/librecad/patches/librecad-2.1.3.patchset
@@ -1,4 +1,4 @@
-From 0bfb7d8ca97500685c836ab263dcec85032855c7 Mon Sep 17 00:00:00 2001
+From 21afc11719f7946ddb1da9fac06de61be6b9448c Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 27 Apr 2015 18:44:16 +1000
 Subject: Add resource file for Haiku
@@ -73,42 +73,38 @@ index 0000000..fe99be0
 +	$"023F9FE80000000000003F9FE84300004300000A010106023F9FE80000000000"
 +	$"003F9FE8430000430000"
 +};
---
-2.2.2
+-- 
+2.16.4
 
-From 73e89d28e0bd77735e45fd16ff695c02f36447d4 Mon Sep 17 00:00:00 2001
+
+From 130c764358d2e39203bb6212fb6e062cbee7df45 Mon Sep 17 00:00:00 2001
 From: Scott McCreary <scottmc2@gmail.com>
 Date: Thu, 2 Feb 2017 17:50:07 -0800
-Subject: [PATCH 1/2] Fix haiku build
+Subject: Fix haiku build
 
----
- librecad/src/boost.pri | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/librecad/src/boost.pri b/librecad/src/boost.pri
 index a2eb747..b8fa39c 100644
 --- a/librecad/src/boost.pri
 +++ b/librecad/src/boost.pri
 @@ -7,7 +7,7 @@ exists( custom.pri ):include( custom.pri )
-
+ 
  BOOST_LIBS =
-
+ 
 -unix {
 +unix:!haiku {
      defineTest( checkBoostIncDir ) {
-
+ 
          boostIncDir = $${1}
---
-2.7.0
+-- 
+2.16.4
 
-From 9a92c1e75127e00d9be46ac3c4f382345bf2ad3e Mon Sep 17 00:00:00 2001
+
+From 5908b5c6dbfc0f1cf64da98b061885e007be8ba7 Mon Sep 17 00:00:00 2001
 From: Scott McCreary <scottmc2@gmail.com>
 Date: Thu, 2 Feb 2017 17:54:43 -0800
-Subject: [PATCH 2/2] Fix haiku build
+Subject: Fix haiku build
 
----
- librecad/src/lib/generators/lc_makercamsvg.cpp | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
 
 diff --git a/librecad/src/lib/generators/lc_makercamsvg.cpp b/librecad/src/lib/generators/lc_makercamsvg.cpp
 index 6364e34..eae733e 100644
@@ -117,7 +113,7 @@ index 6364e34..eae733e 100644
 @@ -56,6 +56,22 @@
  #include "rs_math.h"
  #include "rs_debug.h"
-
+ 
 +#ifdef __HAIKU__
 +
 +#include <string>
@@ -137,5 +133,41 @@ index 6364e34..eae733e 100644
  namespace {
  const std::string NAMESPACE_URI_SVG = "http://www.w3.org/2000/svg";
  const std::string NAMESPACE_URI_LC = "http://www.librecad.org";
---
-2.7.0
+-- 
+2.16.4
+
+
+From d5b6c87860b6dce8676a1bd3333315f069fdca25 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Thu, 20 Sep 2018 09:07:09 +0000
+Subject: include partial fix from upstream
+
+
+diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp b/librecad/src/ui/forms/qg_commandwidget.cpp
+index 7cd6939..894d5db 100644
+--- a/librecad/src/ui/forms/qg_commandwidget.cpp
++++ b/librecad/src/ui/forms/qg_commandwidget.cpp
+@@ -27,6 +27,7 @@
+ #include <QKeyEvent>
+ #include <algorithm>
+ 
++#include <QAction>
+ #include "qg_actionhandler.h"
+ #include "rs_commands.h"
+ #include "rs_commandevent.h"
+diff --git a/librecad/src/ui/generic/widgetcreator.cpp b/librecad/src/ui/generic/widgetcreator.cpp
+index ca89ab1..260d9af 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>
+-- 
+2.16.4
+