openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Unbreak with qtadvanceddocking 4.4.0

Browse Source
This commit is contained in:
rsadowski
2025-08-03 10:20:02 +00:00
parent aa5a1fb356
commit 5bb10d1f7f
3 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
math/labplot/Makefile
+3 -3
View File
@@ -29,7 +29,7 @@ WANTLIB += KF6WidgetsAddons KF6XmlGui QXlsxQt6 Qt6Core Qt6DBus
WANTLIB += Qt6Gui Qt6Network Qt6PrintSupport Qt6SerialPort Qt6Sql
WANTLIB += Qt6Svg Qt6Widgets Qt6Xml c cantorlibs cerf cfitsio
WANTLIB += fftw3 gsl gslcblas hdf5 lz4 m markdown matio netcdf
WANTLIB += poppler poppler-qt6 qt6advanceddocking spectre xcb
WANTLIB += poppler poppler-qt6 qtadvanceddocking-qt6 spectre xcb
WANTLIB += z zstd
SITES = https://download.kde.org/stable/labplot/
@@ -87,7 +87,7 @@ LIB_DEPENDS = archivers/lz4 \
x11/kde-applications/cantor \
x11/qt6/qtserialport \
x11/qt6/qtsvg \
x11/qtadvanceddocking
x11/qtadvanceddocking>=4.4.0
# OPTIONAL packages
LIB_DEPENDS += devel/kf6/syntax-highlighting \
@@ -124,6 +124,6 @@ TEST_IS_INTERACTIVE = X11
pre-configure:
# use system dependencies
rm -rf ${WRKSRC}/src/3rdparty/{cmake,kdmactouchbar,liborigin,QXlsx}
rm -rf ${WRKSRC}/src/3rdparty/{Qt-Advanced-Docking-System,cmake,kdmactouchbar,liborigin,QXlsx}
.include <bsd.port.mk>
math/labplot/patches/patch-CMakeLists_txt
+11
View File
@@ -10,3 +10,14 @@ Index: CMakeLists.txt
set (GENERIC_GNU_LINK_FLAGS "-Wl,--gc-sections -Wl,--as-needed -Wl,--no-undefined")
endif()
set (GENERIC_C_FLAGS "${GENERIC_FLAGS} -fno-exceptions")
@@ -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)
math/labplot/patches/patch-src_CMakeLists_txt
+31
View File
@@ -1,6 +1,19 @@
Index: src/CMakeLists.txt
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
@@ -547,9 +547,9 @@ target_include_directories(labplotbackendlib PUBLIC ${
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})
@@ -566,7 +566,7 @@ endif()
if(NOT ICONV_LIBRARIES)
set(ICONV_LIBRARIES "")
@@ -10,6 +23,24 @@ Index: src/CMakeLists.txt
set(TURN_OFF_AS_NEEDED "-Wl,--no-as-needed")
set(TURN_ON_AS_NEEDED "-Wl,--as-needed")
endif()
@@ -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)
@@ -688,6 +688,7 @@ if(ENABLE_XLSX)
if(QXLSX_FOUND)
target_include_directories(labplotbackendlib PUBLIC ${QXLSX_INCLUDE_DIR})