[MacPorts] #61726: cmake +gui +qt5: patch phase failure

[MacPorts]

#61726: cmake +gui +qt5: patch phase failure
-------------------------+-----------------------
  Reporter:  mouse07410  |      Owner:  michaelld
      Type:  defect      |     Status:  assigned
  Priority:  Normal      |  Milestone:
 Component:  ports       |    Version:
Resolution:              |   Keywords:
      Port:  cmake       |
-------------------------+-----------------------

Comment (by mouse07410):

 Here are the specifics, aka, the contents of the four {{{.rej}}} files
 that are responsible for the failure in the patch phase:
 {{{
 $ fd .rej$
 Modules/BasicConfigVersion-AnyNewerVersion.cmake.in.rej
 Modules/BasicConfigVersion-ExactVersion.cmake.in.rej
 Modules/BasicConfigVersion-SameMajorVersion.cmake.in.rej
 Modules/BasicConfigVersion-SameMinorVersion.cmake.in.rej
 Source/QtDialog/CMakeLists.txt.rej
 $ cat Modules/BasicConfigVersion-SameMajorVersion.cmake.in.rej
 ***************
 *** 44,58 ****
   if("@CVF_ARCH_INDEPENDENT@")
     return()
   endif()
 -
 - # if the installed or the using project don't have CMAKE_SIZEOF_VOID_P
 set, ignore it:
 - if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@"
 STREQUAL "")
 -   return()
 - endif()
 -
 - # check that the installed version has the same 32/64bit-ness as the one
 which is currently searching:
 - if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
 -   math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
 -   set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
 -   set(PACKAGE_VERSION_UNSUITABLE TRUE)
 - endif()
 --- 44,46 ----
   if("@CVF_ARCH_INDEPENDENT@")
     return()
   endif()
 $ cat Modules/BasicConfigVersion-SameMinorVersion.cmake.in.rej
 ***************
 *** 48,62 ****
   if("@CVF_ARCH_INDEPENDENT@")
     return()
   endif()
 -
 - # if the installed or the using project don't have CMAKE_SIZEOF_VOID_P
 set, ignore it:
 - if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@"
 STREQUAL "")
 -   return()
 - endif()
 -
 - # check that the installed version has the same 32/64bit-ness as the one
 which is currently searching:
 - if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
 -   math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
 -   set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
 -   set(PACKAGE_VERSION_UNSUITABLE TRUE)
 - endif()
 --- 48,50 ----
   if("@CVF_ARCH_INDEPENDENT@")
     return()
   endif()
 $ cat Modules/BasicConfigVersion-AnyNewerVersion.cmake.in.rej
 ***************
 *** 34,48 ****
   if("@CVF_ARCH_INDEPENDENT@")
     return()
   endif()
 -
 - # if the installed or the using project don't have CMAKE_SIZEOF_VOID_P
 set, ignore it:
 - if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@"
 STREQUAL "")
 -   return()
 - endif()
 -
 - # check that the installed version has the same 32/64bit-ness as the one
 which is currently searching:
 - if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
 -   math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
 -   set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
 -   set(PACKAGE_VERSION_UNSUITABLE TRUE)
 - endif()
 --- 34,36 ----
   if("@CVF_ARCH_INDEPENDENT@")
     return()
   endif()
 $ cat Source/QtDialog/CMakeLists.txt.rej
 ***************
 *** 4,10 ****
   project(QtDialog)
   CMake_OPTIONAL_COMPONENT(cmake-gui)
   find_package(Qt5Widgets QUIET)
 - if (Qt5Widgets_FOUND)
     include_directories(${Qt5Widgets_INCLUDE_DIRS})
     add_definitions(${Qt5Widgets_DEFINITONS})
     macro(qt4_wrap_ui)
 --- 4,12 ----
   project(QtDialog)
   CMake_OPTIONAL_COMPONENT(cmake-gui)
   find_package(Qt5Widgets QUIET)
 + if(NOT Qt5Widgets_FOUND)
 +   message(FATAL_ERROR "Qt5 required but not found")
 + endif()
     include_directories(${Qt5Widgets_INCLUDE_DIRS})
     add_definitions(${Qt5Widgets_DEFINITONS})
     macro(qt4_wrap_ui)
 ***************
 *** 96,114 ****
         get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
       endif()
     endif()
 - else()
 -   set(QT_MIN_VERSION "4.4.0")
 -   find_package(Qt4 REQUIRED)
 -   if(NOT QT4_FOUND)
 -     message(SEND_ERROR "Failed to find Qt 4.4 or greater.")
 -     return()
 -   endif()
 -
 -   include(${QT_USE_FILE})
 -
 -   set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
 -
 - endif()

   set(SRCS
     AddCacheEntry.cxx
 --- 98,103 ----
         get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
       endif()
     endif()

   set(SRCS
     AddCacheEntry.cxx
 ***************
 *** 154,160 ****
   if(WIN32)
     set(SRCS ${SRCS} CMakeSetup.rc)
   endif()
 - if(APPLE)
     set(SRCS ${SRCS} CMakeSetup.icns)
     set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
     set_source_files_properties(CMakeSetup.icns PROPERTIES
 --- 143,149 ----
   if(WIN32)
     set(SRCS ${SRCS} CMakeSetup.rc)
   endif()
 + if(APPLEBUNDLE)
     set(SRCS ${SRCS} CMakeSetup.icns)
     set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
     set_source_files_properties(CMakeSetup.icns PROPERTIES
 ***************
 *** 171,177 ****

   set(CMAKE_INCLUDE_CURRENT_DIR ON)

 - add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE})
   target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY}
 ${CMake_QT_LIBRARIES})

   if(WIN32)
 --- 160,166 ----

   set(CMAKE_INCLUDE_CURRENT_DIR ON)

 + add_executable(cmake-gui WIN32 ${SRCS} ${MANIFEST_FILE})
   target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY}
 ${CMake_QT_LIBRARIES})

   if(WIN32)
 $
 }}}

-- 
Ticket URL: <https://trac.macports.org/ticket/61726#comment:4>
MacPorts <https://www.macports.org/>
Ports system for macOS