CVS commit: pkgsrc/editors/qtcreator

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/editors/qtcreator
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Fri, 9 May 2025 05:57:08 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri May  9 05:57:08 UTC 2025

Added Files:
        pkgsrc/editors/qtcreator: PLIST.Darwin
        pkgsrc/editors/qtcreator/patches: patch-bin_CMakeLists.txt
            patch-cmake_QtCreatorAPI.cmake
            patch-cmake_QtCreatorAPIInternal.cmake patch-src_CMakeLists.txt
            patch-src_app_CMakeLists.txt patch-src_libs_CMakeLists.txt
            patch-src_libs_sqlite_CMakeLists.txt
            patch-src_plugins_qmldesigner_CMakeLists.txt
            patch-src_shared_CMakeLists.txt

Log Message:
qtcreator: add new files


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/qtcreator/PLIST.Darwin
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/editors/qtcreator/patches/patch-bin_CMakeLists.txt \
    pkgsrc/editors/qtcreator/patches/patch-cmake_QtCreatorAPI.cmake \
    pkgsrc/editors/qtcreator/patches/patch-cmake_QtCreatorAPIInternal.cmake \
    pkgsrc/editors/qtcreator/patches/patch-src_CMakeLists.txt \
    pkgsrc/editors/qtcreator/patches/patch-src_app_CMakeLists.txt \
    pkgsrc/editors/qtcreator/patches/patch-src_libs_CMakeLists.txt \
    pkgsrc/editors/qtcreator/patches/patch-src_libs_sqlite_CMakeLists.txt \
    pkgsrc/editors/qtcreator/patches/patch-src_plugins_qmldesigner_CMakeLists.txt \
    pkgsrc/editors/qtcreator/patches/patch-src_shared_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: pkgsrc/editors/qtcreator/PLIST.Darwin
diff -u /dev/null pkgsrc/editors/qtcreator/PLIST.Darwin:1.1
--- /dev/null   Fri May  9 05:57:08 2025
+++ pkgsrc/editors/qtcreator/PLIST.Darwin       Fri May  9 05:57:08 2025
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2025/05/09 05:57:08 adam Exp $
+libexec/qtcreator/disclaim
+libexec/qtcreator/ios/iostool
+share/qtcreator/externaltools/vi_mac.xml

Index: pkgsrc/editors/qtcreator/patches/patch-bin_CMakeLists.txt
diff -u /dev/null pkgsrc/editors/qtcreator/patches/patch-bin_CMakeLists.txt:1.1
--- /dev/null   Fri May  9 05:57:08 2025
+++ pkgsrc/editors/qtcreator/patches/patch-bin_CMakeLists.txt   Fri May  9 05:57:08 2025
@@ -0,0 +1,9 @@
+$NetBSD: patch-bin_CMakeLists.txt,v 1.1 2025/05/09 05:57:08 adam Exp $
+
+--- bin/CMakeLists.txt.orig    2025-04-04 11:08:24.626998674 +0000
++++ bin/CMakeLists.txt
+@@ -1,3 +1,3 @@
+-if (NOT APPLE)
++if (TRUE)
+   install(PROGRAMS qtcreator.sh DESTINATION bin)
+ endif()
Index: pkgsrc/editors/qtcreator/patches/patch-cmake_QtCreatorAPI.cmake
diff -u /dev/null pkgsrc/editors/qtcreator/patches/patch-cmake_QtCreatorAPI.cmake:1.1
--- /dev/null   Fri May  9 05:57:08 2025
+++ pkgsrc/editors/qtcreator/patches/patch-cmake_QtCreatorAPI.cmake     Fri May  9 05:57:08 2025
@@ -0,0 +1,41 @@
+$NetBSD: patch-cmake_QtCreatorAPI.cmake,v 1.1 2025/05/09 05:57:08 adam Exp $
+
+Use correct install name on Darwin.
+Disable application bundle.
+
+--- cmake/QtCreatorAPI.cmake.orig      2025-03-11 12:27:32.000000000 +0000
++++ cmake/QtCreatorAPI.cmake
+@@ -264,6 +264,7 @@ function(add_qtc_library name)
+     VISIBILITY_INLINES_HIDDEN ON
+     BUILD_RPATH "${_LIB_RPATH};${CMAKE_BUILD_RPATH}"
+     INSTALL_RPATH "${_LIB_RPATH};${CMAKE_INSTALL_RPATH}"
++    INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${IDE_LIBRARY_PATH}"
+     RUNTIME_OUTPUT_DIRECTORY "${_output_binary_dir}/${_DESTINATION}"
+     LIBRARY_OUTPUT_DIRECTORY "${_output_binary_dir}/${IDE_LIBRARY_PATH}"
+     ARCHIVE_OUTPUT_DIRECTORY "${_output_binary_dir}/${IDE_LIBRARY_ARCHIVE_PATH}"
+@@ -595,6 +596,7 @@ function(add_qtc_plugin target_name)
+     QTC_PLUGIN_VERSION "${_arg_VERSION}"
+     BUILD_RPATH "${_PLUGIN_RPATH};${CMAKE_BUILD_RPATH}"
+     INSTALL_RPATH "${_PLUGIN_RPATH};${CMAKE_INSTALL_RPATH}"
++    INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${plugin_dir}"
+     LIBRARY_OUTPUT_DIRECTORY "${_output_binary_dir}/${plugin_dir}"
+     ARCHIVE_OUTPUT_DIRECTORY "${_output_binary_dir}/${plugin_dir}"
+     RUNTIME_OUTPUT_DIRECTORY "${_output_binary_dir}/${plugin_dir}"
+@@ -737,7 +739,7 @@ function(add_qtc_executable name)
+   endif()
+ 
+   set(_EXECUTABLE_PATH "${_DESTINATION}")
+-  if (APPLE)
++  if (FALSE)
+     # path of executable might be inside app bundle instead of DESTINATION directly
+     cmake_parse_arguments(_prop "" "MACOSX_BUNDLE;OUTPUT_NAME" "" "${_arg_PROPERTIES}")
+     if (_prop_MACOSX_BUNDLE)
+@@ -822,7 +824,7 @@ function(add_qtc_executable name)
+     # when installing app bundles, which copies things that it should not
+     # like static libraries, executables with SKIP_INSTALL, clang resources
+     # and dSYM directories
+-    if (APPLE AND _EXECUTABLE_FILE_PATH AND _BUNDLE_INFO_PLIST)
++    if (FALSE AND _EXECUTABLE_FILE_PATH AND _BUNDLE_INFO_PLIST)
+       install(
+         PROGRAMS "${_output_binary_dir}/${_EXECUTABLE_FILE_PATH}"
+         DESTINATION "${_EXECUTABLE_PATH}"
Index: pkgsrc/editors/qtcreator/patches/patch-cmake_QtCreatorAPIInternal.cmake
diff -u /dev/null pkgsrc/editors/qtcreator/patches/patch-cmake_QtCreatorAPIInternal.cmake:1.1
--- /dev/null   Fri May  9 05:57:08 2025
+++ pkgsrc/editors/qtcreator/patches/patch-cmake_QtCreatorAPIInternal.cmake     Fri May  9 05:57:08 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-cmake_QtCreatorAPIInternal.cmake,v 1.1 2025/05/09 05:57:08 adam Exp $
+
+Disable application bundle.
+
+--- cmake/QtCreatorAPIInternal.cmake.orig      2025-03-11 12:27:32.000000000 +0000
++++ cmake/QtCreatorAPIInternal.cmake
+@@ -43,7 +43,7 @@ endif()
+ # Setup path handling
+ #
+ 
+-if (APPLE)
++if (FALSE)
+   set(_IDE_APP_PATH ".")
+   set(_IDE_APP_TARGET "${IDE_DISPLAY_NAME}")
+ 
+@@ -197,7 +197,7 @@ endfunction()
+ 
+ function(qtc_add_link_flags_no_undefined target)
+   # needs CheckLinkerFlags
+-  if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.18 AND NOT MSVC AND NOT APPLE)
++  if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.18 AND NOT MSVC)
+     set(no_undefined_flag "-Wl,--no-undefined")
+     check_linker_flag(CXX ${no_undefined_flag} QTC_LINKER_SUPPORTS_NO_UNDEFINED)
+     if (NOT QTC_LINKER_SUPPORTS_NO_UNDEFINED)
Index: pkgsrc/editors/qtcreator/patches/patch-src_CMakeLists.txt
diff -u /dev/null pkgsrc/editors/qtcreator/patches/patch-src_CMakeLists.txt:1.1
--- /dev/null   Fri May  9 05:57:08 2025
+++ pkgsrc/editors/qtcreator/patches/patch-src_CMakeLists.txt   Fri May  9 05:57:08 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_CMakeLists.txt,v 1.1 2025/05/09 05:57:08 adam Exp $
+
+Disable application bundle.
+
+--- src/CMakeLists.txt.orig    2022-11-15 19:13:54.000000000 +0000
++++ src/CMakeLists.txt
+@@ -41,7 +41,7 @@ list(APPEND CMAKE_MODULE_PATH \${CMAKE_C
+ 
+ \# force plugins to same path naming conventions as Qt Creator
+ \# otherwise plugins will not be found
+-if(UNIX AND NOT APPLE)
++if(UNIX)
+   include(GNUInstallDirs)
+   set(CMAKE_INSTALL_BINDIR ${CMAKE_INSTALL_BINDIR})
+   set(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR})
Index: pkgsrc/editors/qtcreator/patches/patch-src_app_CMakeLists.txt
diff -u /dev/null pkgsrc/editors/qtcreator/patches/patch-src_app_CMakeLists.txt:1.1
--- /dev/null   Fri May  9 05:57:08 2025
+++ pkgsrc/editors/qtcreator/patches/patch-src_app_CMakeLists.txt       Fri May  9 05:57:08 2025
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_app_CMakeLists.txt,v 1.1 2025/05/09 05:57:08 adam Exp $
+
+Disable application bundle.
+
+--- src/app/CMakeLists.txt.orig        2025-03-11 12:27:32.000000000 +0000
++++ src/app/CMakeLists.txt
+@@ -20,7 +20,6 @@ add_qtc_executable(qtcreator
+     ../tools/qtcreatorcrashhandler/crashhandlersetup.cpp ../tools/qtcreatorcrashhandler/crashhandlersetup.h
+   PROPERTIES
+     WIN32_EXECUTABLE ON
+-    MACOSX_BUNDLE ON
+     OUTPUT_NAME "${IDE_APP_TARGET}"
+   DESTINATION "${IDE_APP_PATH}"
+   QTC_RUNNABLE
+@@ -98,7 +97,7 @@ if (WIN32)
+   target_sources(qtcreator PRIVATE qtcreator.rc)
+ endif()
+ 
+-if (APPLE)
++if (FALSE)
+   if (CMAKE_OSX_DEPLOYMENT_TARGET)
+     set(MACOSX_DEPLOYMENT_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET})
+   endif()
+@@ -157,7 +156,7 @@ if(BUILD_WITH_CRASHPAD)
+   )
+ endif()
+ 
+-if ((NOT WIN32) AND (NOT APPLE))
++if (NOT WIN32)
+   # install logo
+   foreach(size 16 24 32 48 64 128 256 512)
+     install(
Index: pkgsrc/editors/qtcreator/patches/patch-src_libs_CMakeLists.txt
diff -u /dev/null pkgsrc/editors/qtcreator/patches/patch-src_libs_CMakeLists.txt:1.1
--- /dev/null   Fri May  9 05:57:08 2025
+++ pkgsrc/editors/qtcreator/patches/patch-src_libs_CMakeLists.txt      Fri May  9 05:57:08 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_libs_CMakeLists.txt,v 1.1 2025/05/09 05:57:08 adam Exp $
+
+Use correct install name on Darwin.
+
+--- src/libs/CMakeLists.txt.orig       2025-04-04 09:19:35.077748562 +0000
++++ src/libs/CMakeLists.txt
+@@ -56,6 +56,7 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/ql
+     set_target_properties(qlitehtml PROPERTIES
+       BUILD_RPATH "${_LIB_RPATH};${CMAKE_BUILD_RPATH}"
+       INSTALL_RPATH "${_LIB_RPATH};${CMAKE_INSTALL_RPATH}"
++      INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${IDE_LIBRARY_PATH}"
+       RUNTIME_OUTPUT_DIRECTORY "${_output_binary_dir}/${IDE_BIN_PATH}"
+       LIBRARY_OUTPUT_DIRECTORY "${_output_binary_dir}/${IDE_LIBRARY_PATH}"
+       ARCHIVE_OUTPUT_DIRECTORY "${_output_binary_dir}/${IDE_LIBRARY_ARCHIVE_PATH}"
Index: pkgsrc/editors/qtcreator/patches/patch-src_libs_sqlite_CMakeLists.txt
diff -u /dev/null pkgsrc/editors/qtcreator/patches/patch-src_libs_sqlite_CMakeLists.txt:1.1
--- /dev/null   Fri May  9 05:57:08 2025
+++ pkgsrc/editors/qtcreator/patches/patch-src_libs_sqlite_CMakeLists.txt       Fri May  9 05:57:08 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libs_sqlite_CMakeLists.txt,v 1.1 2025/05/09 05:57:08 adam Exp $
+
+Fix build on BSD.
+
+--- src/libs/sqlite/CMakeLists.txt.orig        2025-03-11 12:27:35.000000000 +0000
++++ src/libs/sqlite/CMakeLists.txt
+@@ -23,7 +23,7 @@ extend_qtc_library(SqliteInternal
+   PRIVATE_COMPILE_OPTIONS $<IF:$<CXX_COMPILER_ID:MSVC>,/FIsqlite_static_config.h,-includesqlite_static_config.h>
+ )
+ 
+-if (APPLE)
++if (APPLE OR BSD)
+   extend_qtc_library(SqliteInternal DEFINES _BSD_SOURCE)
+ elseif (UNIX)
+   extend_qtc_library(SqliteInternal DEFINES _POSIX_C_SOURCE=200809L _GNU_SOURCE _DEFAULT_SOURCE)
Index: pkgsrc/editors/qtcreator/patches/patch-src_plugins_qmldesigner_CMakeLists.txt
diff -u /dev/null pkgsrc/editors/qtcreator/patches/patch-src_plugins_qmldesigner_CMakeLists.txt:1.1
--- /dev/null   Fri May  9 05:57:08 2025
+++ pkgsrc/editors/qtcreator/patches/patch-src_plugins_qmldesigner_CMakeLists.txt       Fri May  9 05:57:08 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_plugins_qmldesigner_CMakeLists.txt,v 1.1 2025/05/09 05:57:08 adam Exp $
+
+Disable application bundle.
+
+--- src/plugins/qmldesigner/CMakeLists.txt.orig        2025-04-04 11:12:13.658791198 +0000
++++ src/plugins/qmldesigner/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ #only if the plugin is requested by qtc_plugin_enabled continue if not stop as early as possible
+ 
+ set(QmlDesignerPluginInstallPrefix "${IDE_PLUGIN_PATH}/qmldesigner")
+-if (APPLE)
++if (FALSE)
+   set(QmlDesignerPluginInstallPrefix "${IDE_PLUGIN_PATH}/QmlDesigner")
+ endif()
+ 
Index: pkgsrc/editors/qtcreator/patches/patch-src_shared_CMakeLists.txt
diff -u /dev/null pkgsrc/editors/qtcreator/patches/patch-src_shared_CMakeLists.txt:1.1
--- /dev/null   Fri May  9 05:57:08 2025
+++ pkgsrc/editors/qtcreator/patches/patch-src_shared_CMakeLists.txt    Fri May  9 05:57:08 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_shared_CMakeLists.txt,v 1.1 2025/05/09 05:57:08 adam Exp $
+
+Disable application bundle.
+
+--- src/shared/CMakeLists.txt.orig     2025-04-04 10:39:25.857786345 +0000
++++ src/shared/CMakeLists.txt
+@@ -19,7 +19,7 @@ if (BUILD_QBS)
+   set(QBS_LIB_INSTALL_DIR "${IDE_LIBRARY_PATH}" CACHE STRING "" FORCE)
+   set(QBS_DLL_INSTALL_DIR "${IDE_BIN_PATH}" CACHE STRING "" FORCE)
+   set(QBS_LIBEXEC_INSTALL_DIR "${IDE_LIBEXEC_PATH}" CACHE STRING "" FORCE)
+-  if (APPLE)
++  if (FALSE)
+     set(QBS_PLUGINS_INSTALL_BASE "${IDE_PLUGIN_PATH}/../" CACHE STRING "" FORCE)
+   else()
+     set(QBS_PLUGINS_INSTALL_BASE "${_IDE_LIBRARY_BASE_PATH}/" CACHE STRING "" FORCE)

Prev by Date: CVS commit: pkgsrc/editors/qtcreator
Next by Date: CVS commit: pkgsrc/parallel/spirv-headers
Previous by Thread: CVS commit: pkgsrc/editors/qtcreator
Next by Thread: CVS commit: pkgsrc/parallel/spirv-headers
Indexes:

Home | Main Index | Thread Index | Old Index