From 4b7e75e38bf04b5b29c7ec7937b34b67b5c776ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Sat, 15 Nov 2025 18:50:23 +0100 Subject: [PATCH] labplot: update to 2.12.1 --- .../003-fix-build-with-qxlsx.patch | 11 ----- .../005-fix-find-qtadvanceddocking.patch | 46 ------------------- mingw-w64-labplot/PKGBUILD | 16 +++---- 3 files changed, 8 insertions(+), 65 deletions(-) delete mode 100644 mingw-w64-labplot/003-fix-build-with-qxlsx.patch delete mode 100644 mingw-w64-labplot/005-fix-find-qtadvanceddocking.patch diff --git a/mingw-w64-labplot/003-fix-build-with-qxlsx.patch b/mingw-w64-labplot/003-fix-build-with-qxlsx.patch deleted file mode 100644 index 1fcd055c3e..0000000000 --- a/mingw-w64-labplot/003-fix-build-with-qxlsx.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/3rdparty/CMakeLists.txt -+++ b/src/3rdparty/CMakeLists.txt -@@ -60,6 +60,8 @@ if(BUILD_QXLSX) - - get_target_property(QXLSX_VERSION QXlsx VERSION) - message(STATUS "QXlsx VERSION ${QXLSX_VERSION}") -+endif() -+if(BUILD_QXLSX OR QXLSX_FOUND) - target_compile_definitions(labplotlib PRIVATE QXLSX_VERSION_STRING=\"${QXLSX_VERSION}\") - endif() - diff --git a/mingw-w64-labplot/005-fix-find-qtadvanceddocking.patch b/mingw-w64-labplot/005-fix-find-qtadvanceddocking.patch deleted file mode 100644 index 9a7855255a..0000000000 --- a/mingw-w64-labplot/005-fix-find-qtadvanceddocking.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -705,8 +705,8 @@ else() - endif() - - # Qt Advanced Docking System (required) ##################### --find_package(qt${QT_VERSION_MAJOR}advanceddocking CONFIG QUIET) --if(NOT qt${QT_VERSION_MAJOR}advanceddocking_FOUND) -+find_package(qtadvanceddocking-qt${QT_VERSION_MAJOR} CONFIG QUIET) -+if(NOT qtadvanceddocking-qt${QT_VERSION_MAJOR}_FOUND) - option(LOCAL_QT_ADVANCED_DOCK_DOWNLOAD "Use local build of qt advanced dock downloaded directly from the git repository" OFF) - option(LOCAL_QT_ADVANCED_DOCK_COPY "Use local build of qt advanced dock copied into the Qt-Advanced-Docking-System subfolder" ON) - if(TARGET Qt${QT_VERSION_MAJOR}::GuiPrivate) ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -547,9 +547,9 @@ target_include_directories(labplotbackendlib PUBLIC ${FRONTEND_DIR}/widgets) # s - target_include_directories(labplotlib PUBLIC ${FRONTEND_DIR}/widgets) # so that the MOC finds numberSpinbox.h - - # add system QADS include path --if(qt${QT_VERSION_MAJOR}advanceddocking_FOUND) -- get_target_property(QADS_INCLUDES ads::qt${QT_VERSION_MAJOR}advanceddocking INTERFACE_INCLUDE_DIRECTORIES) -- get_target_property(QADS_LIBRARIES ads::qt${QT_VERSION_MAJOR}advanceddocking INTERFACE_LINK_LIBRARIES) -+if(qtadvanceddocking-qt${QT_VERSION_MAJOR}_FOUND) -+ get_target_property(QADS_INCLUDES ads::qtadvanceddocking-qt${QT_VERSION_MAJOR} INTERFACE_INCLUDE_DIRECTORIES) -+ get_target_property(QADS_LIBRARIES ads::qtadvanceddocking-qt${QT_VERSION_MAJOR} INTERFACE_LINK_LIBRARIES) - message(STATUS "QADS Found: ${QADS_LIBRARIES}, ${QADS_INCLUDES}") - target_include_directories(labplotbackendlib PUBLIC ${QADS_INCLUDES}) - target_include_directories(labplotlib PUBLIC ${QADS_INCLUDES}) -@@ -605,7 +605,7 @@ target_link_libraries(labplotbackendlib - ${LIBCERF_LIBRARIES} - ${MATIO_LIBRARIES} - ${READSTAT_LIBRARIES} -- ads::qt${QT_VERSION_MAJOR}advanceddocking -+ ads::qtadvanceddocking-qt${QT_VERSION_MAJOR} - ) - target_link_libraries(labplotlib - Qt${QT_MAJOR_VERSION}::Sql -@@ -624,7 +624,7 @@ target_link_libraries(labplotlib - KF${KF_MAJOR_VERSION}::Archive # KFilterDev - KF${KF_MAJOR_VERSION}::TextWidgets # KTextEdit - ${Poppler_LIBRARIES} -- ads::qt${QT_VERSION_MAJOR}advanceddocking -+ ads::qtadvanceddocking-qt${QT_VERSION_MAJOR} - ) - - if(Qt${QT_MAJOR_VERSION}SerialPort_FOUND) diff --git a/mingw-w64-labplot/PKGBUILD b/mingw-w64-labplot/PKGBUILD index 7ccb5deb62..760599ff28 100644 --- a/mingw-w64-labplot/PKGBUILD +++ b/mingw-w64-labplot/PKGBUILD @@ -3,7 +3,7 @@ _realname=labplot pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=2.12.0 +pkgver=2.12.1 pkgrel=1 pkgdesc="FREE, open source and cross-platform Data Visualization and Analysis software accessible to everyone. (mingw-w64)" arch=('any') @@ -67,12 +67,12 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-shared-mime-info") source=("https://download.kde.org/stable/labplot/labplot-${pkgver}.tar.xz" "001-fix-linking-with-lld.patch" - "003-fix-build-with-qxlsx.patch" - "005-fix-find-qtadvanceddocking.patch") -sha256sums=('25f1751261ec2d11312f0179049ea1f16db33b3a89800dc572d68ad8d267afe7' + "002-fix-build-with-qt6-6.10.patch::https://invent.kde.org/education/labplot/-/commit/c2db2ec2.patch" + "003-fix-detect-eigen3-5.patch::https://invent.kde.org/education/labplot/-/commit/c70e8e89.patch") +sha256sums=('e28155bfddf40e5b6f7c4791313556d1e48138044f216f210d515b9f6d6c106a' '89df5a4a7996b7b9cc4fe65c85b89f46f1ee82c8058a71d9ddf065233122bcbb' - 'f5230ece1292bf0d400f1271034111936952e00ae1fd7ed817fd4e89a7af1ae3' - '97c5e4e5f6de529d63448232aa0ed982e21868b9359357dba230bc2a0bb976a8') + '09082b162b3bbfcafa5fa5db51ddde4ba667749cb0d790524f4330f1140e7797' + '634603afc31c628b9e67f03412290f897eedee0ddbaf2a3a35b00e9226d76a67') apply_patch_with_msg() { for _patch in "$@" @@ -87,8 +87,8 @@ prepare() { apply_patch_with_msg \ 001-fix-linking-with-lld.patch \ - 003-fix-build-with-qxlsx.patch \ - 005-fix-find-qtadvanceddocking.patch + 002-fix-build-with-qt6-6.10.patch \ + 003-fix-detect-eigen3-5.patch # remove conflict with breeze package rm data/color-schemes/BreezeDark.colors