head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.4 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.2 pkgsrc-2025Q4-base:1.2; locks; strict; comment @# @; 1.2 date 2025.11.24.07.36.55; author wiz; state Exp; branches; next 1.1; commitid ruMvNWJLEMgGhMjG; 1.1 date 2025.11.10.13.54.53; author wiz; state Exp; branches; next ; commitid hyzMB6cB0jFgP0iG; desc @@ 1.2 log @scribus: fix build with qt6 6.10 @ text @$NetBSD: patch-scribus_third__party_Qt-Advanced-Docking-System_src_CMakeLists.txt,v 1.1 2025/11/10 13:54:53 wiz Exp $ Don't install qt advanced docking system. From gentoo https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/scribus/files/scribus-1.7.0-dont-install-qtadvanceddocking.patch --- scribus/third_party/Qt-Advanced-Docking-System/src/CMakeLists.txt.orig 2025-01-25 21:57:22.000000000 +0000 +++ scribus/third_party/Qt-Advanced-Docking-System/src/CMakeLists.txt @@@@ -6,7 +6,7 @@@@ if (${QT_VERSION_MAJOR}) else() find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) endif() -find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Widgets REQUIRED) +find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui GuiPrivate Widgets REQUIRED) if (UNIX AND NOT APPLE) include_directories(${Qt${QT_VERSION_MAJOR}Gui_PRIVATE_INCLUDE_DIRS}) endif() @@@@ -71,18 +71,19 @@@@ if (UNIX AND NOT APPLE) endif() set(library_name "qt${QT_VERSION_MAJOR}advanceddocking") -if(BUILD_STATIC) +#if(BUILD_STATIC) add_library(${library_name} STATIC ${ads_SRCS} ${ads_HEADERS}) target_compile_definitions( ${library_name} PUBLIC ADS_STATIC) -else() - add_library( ${library_name} SHARED ${ads_SRCS} ${ads_HEADERS}) - target_compile_definitions( ${library_name} PRIVATE ADS_SHARED_EXPORT) -endif() +#else() +# add_library( ${library_name} SHARED ${ads_SRCS} ${ads_HEADERS}) +# target_compile_definitions( ${library_name} PRIVATE ADS_SHARED_EXPORT) +#endif() add_library(ads::${library_name} ALIAS ${library_name}) target_link_libraries(${library_name} PUBLIC Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui + Qt${QT_VERSION_MAJOR}::GuiPrivate Qt${QT_VERSION_MAJOR}::Widgets) if (UNIX AND NOT APPLE) if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") @@@@ -119,35 +120,35 @@@@ write_basic_package_version_file( VERSION ${VERSION_SHORT} COMPATIBILITY SameMajorVersion ) -install(FILES ${ads_HEADERS} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${library_name} - COMPONENT headers -) -install(FILES - "${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE" - "${CMAKE_CURRENT_SOURCE_DIR}/../gnu-lgpl-v2.1.md" - DESTINATION license/ads - COMPONENT license -) -install(TARGETS ${library_name} - EXPORT adsTargets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${library_name} -) - -install(EXPORT adsTargets - FILE adsTargets.cmake - NAMESPACE ads:: - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${library_name} -) -install(FILES qtadvanceddockingConfig.cmake RENAME ${library_name}Config.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${library_name} -) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${library_name}ConfigVersion.cmake" - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${library_name} -) +#install(FILES ${ads_HEADERS} +# DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${library_name} +# COMPONENT headers +#) +#install(FILES +# "${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE" +# "${CMAKE_CURRENT_SOURCE_DIR}/../gnu-lgpl-v2.1.md" +# DESTINATION license/ads +# COMPONENT license +#) +#install(TARGETS ${library_name} +# EXPORT adsTargets +# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +# ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +# INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${library_name} +#) +# +#install(EXPORT adsTargets +# FILE adsTargets.cmake +# NAMESPACE ads:: +# DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${library_name} +#) +#install(FILES qtadvanceddockingConfig.cmake RENAME ${library_name}Config.cmake +# DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${library_name} +#) +#install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${library_name}ConfigVersion.cmake" +# DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${library_name} +#) target_include_directories(${library_name} PUBLIC $ @ 1.1 log @print/scribus: import scribus-1.7.0 This is the qt6 version of scribus, previously in scribus-qt5. Scribus is a publishing layout program for X using the QT interface. It can be used to create stationery, small posters and brochures and to layout newsletters and other documents. It can export in Postscript and PDF formats; and the data is saved in XML format. Scribus aims to be similar to Adobe PageMaker and Quark XPress. It can do typical tasks like kerning text and placing and rotating text and images. @ text @d1 1 a1 1 $NetBSD$ d9 10 a18 1 @@@@ -71,13 +71,13 @@@@ if (UNIX AND NOT APPLE) d37 7 a43 1 @@@@ -119,35 +119,35 @@@@ write_basic_package_version_file( @