Date: Friday, May 5, 2023 @ 23:08:37 Author: arojas Revision: 1458912
upgpkg: labplot 2.10.0-4: Use bundled liborigin, latest stable version is not supported Added: labplot/trunk/qxlsx-include-dir.patch Modified: labplot/trunk/PKGBUILD -------------------------+ PKGBUILD | 11 ++++++---- qxlsx-include-dir.patch | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-05-05 22:39:15 UTC (rev 1458911) +++ PKGBUILD 2023-05-05 23:08:37 UTC (rev 1458912) @@ -2,21 +2,24 @@ pkgname=labplot pkgver=2.10.0 -pkgrel=3 +pkgrel=4 arch=(x86_64) pkgdesc='KDE Application for interactive graphing and analysis of scientific data' url='https://labplot.kde.org/' license=(GPL2) depends=(cantor netcdf cfitsio fftw gsl qt5-serialport libcerf qt5-mqtt kuserfeedback - discount libmatio liborigin readstat qxlsx-qt5 vector-blf) + discount libmatio readstat qxlsx-qt5 vector-blf) # liborigin - 3.0.1 not supported makedepends=(extra-cmake-modules kdoctools dbc-parser-cpp) source=(https://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz - find-qxlsx.patch) + find-qxlsx.patch + qxlsx-include-dir.patch) sha256sums=('5dfc674310904a43875d69e3e260a1fedd968e6c1b1ecdaba755ab1aa38cba90' - '3a7f08e6f2c2092628294a5b2c9f137ae04a43d04f7e342f860b04ebcd7af21c') + '3a7f08e6f2c2092628294a5b2c9f137ae04a43d04f7e342f860b04ebcd7af21c' + '1cc4ffdaabc2260b9720d6463bf7018599ea0359490f85b7eace95587b82e0cc') prepare() { patch -d $pkgname-$pkgver -p1 < find-qxlsx.patch + patch -d $pkgname-$pkgver -p1 < qxlsx-include-dir.patch } build() { Added: qxlsx-include-dir.patch =================================================================== --- qxlsx-include-dir.patch (rev 0) +++ qxlsx-include-dir.patch 2023-05-05 23:08:37 UTC (rev 1458912) @@ -0,0 +1,49 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 74ba18b38..bebc39c6c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -582,9 +582,14 @@ ENDIF () + IF (ENABLE_EXCEL) + # build before use + IF (BUILD_EXCEL) ++ target_include_directories( labplot2lib PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/QXlsx/header" ) + add_dependencies( labplot2lib QXlsx ) + ENDIF () + ++ IF (QXLSX_FOUND) ++ target_include_directories( labplot2lib PRIVATE ${QXLSX_INCLUDE_DIR} ) ++ ENDIF () ++ + IF (QXLSX_FOUND OR BUILD_EXCEL) + target_link_libraries( labplot2lib QXlsx ) + ENDIF () +diff --git a/src/backend/datasources/filters/ExcelFilter.h b/src/backend/datasources/filters/ExcelFilter.h +index 8d93a0733..ac26a3854 100644 +--- a/src/backend/datasources/filters/ExcelFilter.h ++++ b/src/backend/datasources/filters/ExcelFilter.h +@@ -16,9 +16,9 @@ + #include <QObject> + + #ifdef HAVE_EXCEL +-#include "3rdparty/QXlsx/header/xlsxcellrange.h" +-#include "3rdparty/QXlsx/header/xlsxcellreference.h" +-#include "3rdparty/QXlsx/header/xlsxdocument.h" ++#include "xlsxcellrange.h" ++#include "xlsxcellreference.h" ++#include "xlsxdocument.h" + #endif + + class ExcelFilterPrivate; +diff --git a/src/kdefrontend/datasources/ExcelOptionsWidget.cpp b/src/kdefrontend/datasources/ExcelOptionsWidget.cpp +index c6542e456..2afac3a8d 100644 +--- a/src/kdefrontend/datasources/ExcelOptionsWidget.cpp ++++ b/src/kdefrontend/datasources/ExcelOptionsWidget.cpp +@@ -14,7 +14,7 @@ + #include "src/kdefrontend/datasources/ImportFileWidget.h" + + #ifdef HAVE_EXCEL +-#include "3rdparty/QXlsx/header/xlsxcellrange.h" ++#include "xlsxcellrange.h" + #endif + + #include <QAbstractItemModel>
