diff options
Diffstat (limited to 'user/labplot/really-disable-liborigin.patch')
| -rw-r--r-- | user/labplot/really-disable-liborigin.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/user/labplot/really-disable-liborigin.patch b/user/labplot/really-disable-liborigin.patch deleted file mode 100644 index c97a30ed7..000000000 --- a/user/labplot/really-disable-liborigin.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 75408146f9e26521dff825acc2bfb270dc4f6179 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Wed, 12 Sep 2018 11:56:17 -0500 -Subject: [PATCH] datasources: Only include Origin header if enabled - -ImportProjectDialog was still #including the OriginProjectParser header, -which caused a build error if -DENABLE_LIBORIGIN=OFF. - -Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com> -Fixes: d67faf643b2e69c017c21e9d9aaa1fe2d3de6b0e ---- - src/kdefrontend/datasources/ImportProjectDialog.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/kdefrontend/datasources/ImportProjectDialog.cpp b/src/kdefrontend/datasources/ImportProjectDialog.cpp -index 52161277..9fac9389 100644 ---- a/src/kdefrontend/datasources/ImportProjectDialog.cpp -+++ b/src/kdefrontend/datasources/ImportProjectDialog.cpp -@@ -30,7 +30,9 @@ - #include "backend/core/AspectTreeModel.h" - #include "backend/core/Project.h" - #include "backend/datasources/projects/LabPlotProjectParser.h" --#include "backend/datasources/projects/OriginProjectParser.h" -+#ifdef HAVE_LIBORIGIN -+# include "backend/datasources/projects/OriginProjectParser.h" -+#endif - #include "kdefrontend/MainWin.h" - #include "commonfrontend/widgets/TreeViewComboBox.h" - --- -2.18.0 - |