Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package labplot-kf5 for openSUSE:Factory checked in at 2023-09-02 22:07:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/labplot-kf5 (Old) and /work/SRC/openSUSE:Factory/.labplot-kf5.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "labplot-kf5" Sat Sep 2 22:07:42 2023 rev:18 rq:1108509 version:2.10.1 Changes: -------- --- /work/SRC/openSUSE:Factory/labplot-kf5/labplot-kf5.changes 2023-08-03 17:28:08.575167793 +0200 +++ /work/SRC/openSUSE:Factory/.labplot-kf5.new.1766/labplot-kf5.changes 2023-09-02 22:08:23.588850452 +0200 @@ -1,0 +2,6 @@ +Fri Sep 1 13:12:49 UTC 2023 - Wolfgang Bauer <wbauer@tmo.at> + +- Add Fix-finding-liborigin-header-in-project-import-test.patch to + fix build with the latest liborigin + +------------------------------------------------------------------- New: ---- Fix-finding-liborigin-header-in-project-import-test.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ labplot-kf5.spec ++++++ --- /var/tmp/diff_new_pack.K5lRfw/_old 2023-09-02 22:08:24.672889188 +0200 +++ /var/tmp/diff_new_pack.K5lRfw/_new 2023-09-02 22:08:24.676889331 +0200 @@ -28,6 +28,8 @@ Group: Productivity/Scientific/Other URL: https://labplot.kde.org/ Source: https://download.kde.org/stable/labplot/labplot-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: Fix-finding-liborigin-header-in-project-import-test.patch BuildRequires: bison BuildRequires: cantor-devel BuildRequires: extra-cmake-modules @@ -87,7 +89,7 @@ This version is based on KDE Frameworks 5 %prep -%setup -q -n labplot-%{version} +%autosetup -p1 -n labplot-%{version} %build %cmake_kf5 -d build -- -DENABLE_READSTAT:BOOL=OFF -DENABLE_VECTOR_BLF:BOOL=OFF -DENABLE_REPRODUCIBLE:BOOL=ON ++++++ Fix-finding-liborigin-header-in-project-import-test.patch ++++++ From 94deef1dde74953aae53e69e61b0d9aaba6814d6 Mon Sep 17 00:00:00 2001 From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de> Date: Mon, 28 Aug 2023 00:24:42 +0200 Subject: [PATCH] Fix finding liborigin header in project import test --- tests/import_export/Project/CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/import_export/Project/CMakeLists.txt b/tests/import_export/Project/CMakeLists.txt index a812a91362..04be96c357 100644 --- a/tests/import_export/Project/CMakeLists.txt +++ b/tests/import_export/Project/CMakeLists.txt @@ -1,5 +1,13 @@ add_executable (ProjectImportTest ProjectImportTest.cpp) +IF (ENABLE_LIBORIGIN) + IF (LIBORIGIN_FOUND) + # if system headers are missing: use the provided + target_include_directories( ProjectImportTest PRIVATE ${LIBORIGIN_INCLUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/liborigin" ) + ELSE () # own version + target_include_directories( ProjectImportTest PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/liborigin" ) + ENDIF() +ENDIF () target_link_libraries(ProjectImportTest labplot2lib labplot2test) add_test(NAME ProjectImportTest COMMAND ProjectImportTest) -- GitLab