Date: Friday, May 5, 2023 @ 23:08:52
Author: arojas
Revision: 1458913
archrelease: copy trunk to community-x86_64
Added:
labplot/repos/community-x86_64/PKGBUILD
(from rev 1458912, labplot/trunk/PKGBUILD)
labplot/repos/community-x86_64/find-qxlsx.patch
(from rev 1458912, labplot/trunk/find-qxlsx.patch)
labplot/repos/community-x86_64/qxlsx-include-dir.patch
(from rev 1458912, labplot/trunk/qxlsx-include-dir.patch)
Deleted:
labplot/repos/community-x86_64/PKGBUILD
labplot/repos/community-x86_64/find-qxlsx.patch
-------------------------+
PKGBUILD | 67 ++++++++++++++++++++++++----------------------
find-qxlsx.patch | 32 ++++++++++-----------
qxlsx-include-dir.patch | 49 +++++++++++++++++++++++++++++++++
3 files changed, 100 insertions(+), 48 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-05-05 23:08:37 UTC (rev 1458912)
+++ PKGBUILD 2023-05-05 23:08:52 UTC (rev 1458913)
@@ -1,32 +0,0 @@
-# Maintainer: Antonio Rojas <aro...@archlinux.org>
-
-pkgname=labplot
-pkgver=2.10.0
-pkgrel=2
-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)
-makedepends=(extra-cmake-modules kdoctools dbc-parser-cpp)
-source=(https://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz
- find-qxlsx.patch)
-sha256sums=('5dfc674310904a43875d69e3e260a1fedd968e6c1b1ecdaba755ab1aa38cba90'
- '3a7f08e6f2c2092628294a5b2c9f137ae04a43d04f7e342f860b04ebcd7af21c')
-
-prepare() {
- patch -d $pkgname-$pkgver -p1 < find-qxlsx.patch
-}
-
-build() {
- cmake -B build -S $pkgname-$pkgver \
- -DENABLE_TESTS=OFF \
- -DLOCAL_DBC_PARSER=OFF \
- -DLOCAL_VECTOR_BLF=OFF
- cmake --build build
-}
-
-package(){
- DESTDIR="$pkgdir" cmake --install build
-}
Copied: labplot/repos/community-x86_64/PKGBUILD (from rev 1458912,
labplot/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-05-05 23:08:52 UTC (rev 1458913)
@@ -0,0 +1,35 @@
+# Maintainer: Antonio Rojas <aro...@archlinux.org>
+
+pkgname=labplot
+pkgver=2.10.0
+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 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
+ qxlsx-include-dir.patch)
+sha256sums=('5dfc674310904a43875d69e3e260a1fedd968e6c1b1ecdaba755ab1aa38cba90'
+ '3a7f08e6f2c2092628294a5b2c9f137ae04a43d04f7e342f860b04ebcd7af21c'
+ '1cc4ffdaabc2260b9720d6463bf7018599ea0359490f85b7eace95587b82e0cc')
+
+prepare() {
+ patch -d $pkgname-$pkgver -p1 < find-qxlsx.patch
+ patch -d $pkgname-$pkgver -p1 < qxlsx-include-dir.patch
+}
+
+build() {
+ cmake -B build -S $pkgname-$pkgver \
+ -DENABLE_TESTS=OFF \
+ -DLOCAL_DBC_PARSER=OFF \
+ -DLOCAL_VECTOR_BLF=OFF
+ cmake --build build
+}
+
+package(){
+ DESTDIR="$pkgdir" cmake --install build
+}
Deleted: find-qxlsx.patch
===================================================================
--- find-qxlsx.patch 2023-05-05 23:08:37 UTC (rev 1458912)
+++ find-qxlsx.patch 2023-05-05 23:08:52 UTC (rev 1458913)
@@ -1,16 +0,0 @@
-diff --git a/cmake/FindQXlsx.cmake b/cmake/FindQXlsx.cmake
-index f041ef537..1954b7d38 100644
---- a/cmake/FindQXlsx.cmake
-+++ b/cmake/FindQXlsx.cmake
-@@ -4,9 +4,9 @@
- # SPDX-License-Identifier: BSD-3-Clause
- #=============================================================================
-
--find_library(QXLSX_LIBRARIES NAMES QXlsx)
-+find_library(QXLSX_LIBRARIES NAMES QXlsx QXlsxQt5)
-
--find_path(QXLSX_INCLUDE_DIR xlsxdocument.h)
-+find_path(QXLSX_INCLUDE_DIR xlsxdocument.h PATH_SUFFIXES QXlsx QXlsxQt5)
-
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(QXlsx
Copied: labplot/repos/community-x86_64/find-qxlsx.patch (from rev 1458912,
labplot/trunk/find-qxlsx.patch)
===================================================================
--- find-qxlsx.patch (rev 0)
+++ find-qxlsx.patch 2023-05-05 23:08:52 UTC (rev 1458913)
@@ -0,0 +1,16 @@
+diff --git a/cmake/FindQXlsx.cmake b/cmake/FindQXlsx.cmake
+index f041ef537..1954b7d38 100644
+--- a/cmake/FindQXlsx.cmake
++++ b/cmake/FindQXlsx.cmake
+@@ -4,9 +4,9 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ #=============================================================================
+
+-find_library(QXLSX_LIBRARIES NAMES QXlsx)
++find_library(QXLSX_LIBRARIES NAMES QXlsx QXlsxQt5)
+
+-find_path(QXLSX_INCLUDE_DIR xlsxdocument.h)
++find_path(QXLSX_INCLUDE_DIR xlsxdocument.h PATH_SUFFIXES QXlsx QXlsxQt5)
+
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(QXlsx
Copied: labplot/repos/community-x86_64/qxlsx-include-dir.patch (from rev
1458912, labplot/trunk/qxlsx-include-dir.patch)
===================================================================
--- qxlsx-include-dir.patch (rev 0)
+++ qxlsx-include-dir.patch 2023-05-05 23:08:52 UTC (rev 1458913)
@@ -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>
