diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-09-12 17:27:45 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-09-12 17:27:45 +0000 |
| commit | d2a5aafc7f3d743e85362e020ea4fabe5fe31c64 (patch) | |
| tree | 5bd472d5944809f69414eac74b2a53df7784a55f /user/labplot/really-disable-liborigin.patch | |
| parent | 2831d2d8d69525161b8150a084f5eb66dc9e964f (diff) | |
| download | packages-d2a5aafc7f3d743e85362e020ea4fabe5fe31c64.tar.gz packages-d2a5aafc7f3d743e85362e020ea4fabe5fe31c64.tar.bz2 packages-d2a5aafc7f3d743e85362e020ea4fabe5fe31c64.tar.xz packages-d2a5aafc7f3d743e85362e020ea4fabe5fe31c64.zip | |
user/labplot: Bump to 2.5.0
Diffstat (limited to 'user/labplot/really-disable-liborigin.patch')
| -rw-r--r-- | user/labplot/really-disable-liborigin.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/user/labplot/really-disable-liborigin.patch b/user/labplot/really-disable-liborigin.patch new file mode 100644 index 000000000..c97a30ed7 --- /dev/null +++ b/user/labplot/really-disable-liborigin.patch @@ -0,0 +1,32 @@ +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 + |