head 1.3; access; symbols pkgsrc-2025Q3:1.2.0.24 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.22 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.20 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.18 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.16 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.14 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.12 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.10 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.8 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.6 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.4 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.2 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.1.0.20 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.18 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.16 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.14 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.12 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.10 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.8 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.6 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.4 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.2 pkgsrc-2020Q2-base:1.1; locks; strict; comment @# @; 1.3 date 2025.11.10.13.56.05; author wiz; state dead; branches; next 1.2; commitid j42UXg5EkF6BP0iG; 1.2 date 2022.09.29.00.17.01; author markd; state Exp; branches; next 1.1; commitid whEX7nQwmaRjRGVD; 1.1 date 2020.06.14.07.35.58; author ryoon; state Exp; branches; next ; commitid tK6rbC0OYt5gdacC; desc @@ 1.3 log @scribus-qt5: remove, replaced by scribus @ text @$NetBSD: patch-CMakeLists__Dependencies.cmake,v 1.2 2022/09/29 00:17:01 markd Exp $ * Find Qt5 * CMAKE_MODULE_PATH is not a single value, it can be a list. --- CMakeLists_Dependencies.cmake.orig 2022-01-23 16:16:42.000000000 +0000 +++ CMakeLists_Dependencies.cmake @@@@ -10,31 +10,31 @@@@ if (NOT WANT_QT6) message(STATUS "Qt5 Requested") set(QT_MIN_VERSION "5.14.0") add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050E00) - find_package(Qt5Core ${QT_MIN_VERSION} REQUIRED) + find_package(Qt5 COMPONENTS Core REQUIRED) if(NOT Qt5Core_FOUND) message(FATAL_ERROR "ERROR: No QT 5 found") endif() - find_package(Qt5Widgets ${QT_MIN_VERSION} REQUIRED) + find_package(Qt5 COMPONENTS Widgets REQUIRED) if(NOT Qt5Widgets_FOUND) message(FATAL_ERROR "ERROR: No QT Widgets found") endif() - find_package(Qt5Gui ${QT_MIN_VERSION} REQUIRED) + find_package(Qt5 COMPONENTS Gui REQUIRED) if(NOT Qt5Gui_FOUND) message(FATAL_ERROR "ERROR: No Qt5Gui found") endif() - find_package(Qt5Xml ${QT_MIN_VERSION} REQUIRED) + find_package(Qt5 COMPONENTS Xml REQUIRED) if(NOT Qt5Xml_FOUND) message(FATAL_ERROR "ERROR: No QT 5 XML found") endif() - find_package(Qt5Network ${QT_MIN_VERSION} REQUIRED) + find_package(Qt5 COMPONENTS Network REQUIRED) if(NOT Qt5Network_FOUND) message(FATAL_ERROR "ERROR: No Qt5Network found") endif() - find_package(Qt5OpenGL ${QT_MIN_VERSION} REQUIRED) + find_package(Qt5 COMPONENTS OpenGL REQUIRED) if(NOT Qt5OpenGL_FOUND) message(FATAL_ERROR "ERROR: No Qt5OpenGL found") endif() - find_package(Qt5LinguistTools ${QT_MIN_VERSION} REQUIRED) + find_package(Qt5 COMPONENTS LinguistTools REQUIRED) if(NOT Qt5LinguistTools_FOUND) message(FATAL_ERROR "ERROR: No Qt5LinguistTools found") endif() @@@@ -44,7 +44,7 @@@@ if (NOT WANT_QT6) #else() # message(FATAL_ERROR "ERROR: No Qt5Quick found") #endif() - find_package(Qt5PrintSupport ${QT_MIN_VERSION} REQUIRED) + find_package(Qt5 COMPONENTS PrintSupport REQUIRED) if(NOT Qt5PrintSupport_FOUND) message(FATAL_ERROR "ERROR: No Qt5PrintSupport found") endif() @@@@ -108,8 +108,8 @@@@ if (WIN32) # On win32 we can use Qt's zlib and libpng, so we use some # custom cmake includes. This permits us to honour the # USE_QT_ZLIB_PNGLIB flag if passed. - set(PNG_DIR ${CMAKE_MODULE_PATH}) - set(ZLIB_DIR ${CMAKE_MODULE_PATH}) + set(PNG_DIR "${CMAKE_SOURCE_DIR}/cmake/modules") + set(ZLIB_DIR "${CMAKE_SOURCE_DIR}/cmake/modules") endif() find_package(ZLIB REQUIRED) if (ZLIB_FOUND) @@@@ -193,6 +193,7 @@@@ endif() #>> FreeType2 set(cairo_DIR ${CMAKE_MODULE_PATH}) +set(cairo_DIR "${CMAKE_SOURCE_DIR}/cmake/modules") find_package(cairo REQUIRED) if(cairo_FOUND) set(HAVE_CAIRO ON) @@@@ -224,7 +225,7 @@@@ endif() #>>LibXML2 #<