pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

qt6-qtbase: don't install cmake generated files



Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBD.org@localhost>
Pushed By:	nros
Date:		Mon Oct 11 20:30:13 2021 +0000
Changeset:	d74b7a3596d8f54754239a603847505e3ce02aaa

Modified Files:
	qt6-qtbase/distinfo
Added Files:
	qt6-qtbase/patches/patch-cmake_QtBaseGlobalTargets.cmake

Log Message:
qt6-qtbase: don't install cmake generated files

Make sure no generated files are installed when installing qt6-qtbase

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d74b7a3596d8f54754239a603847505e3ce02aaa

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

diffstat:
 qt6-qtbase/distinfo                                      |  1 +
 qt6-qtbase/patches/patch-cmake_QtBaseGlobalTargets.cmake | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diffs:
diff --git a/qt6-qtbase/distinfo b/qt6-qtbase/distinfo
index 7bae1ddd13..743a4f86de 100644
--- a/qt6-qtbase/distinfo
+++ b/qt6-qtbase/distinfo
@@ -4,6 +4,7 @@ RMD160 (qtbase-everywhere-src-6.2.0.tar.xz) = f4e1f9f76ee4b0a8479d88d062b2fc6e2a
 SHA512 (qtbase-everywhere-src-6.2.0.tar.xz) = 3ed301a531633e1e72da7833d1eea47edaf7e5474678a16ec29080e34de1d0def7000b68aa96fa18779880e3aa7b1a9b7c0cf699de2b4cba2c7de84442722fda
 Size (qtbase-everywhere-src-6.2.0.tar.xz) = 46638880 bytes
 SHA1 (patch-cmake_FindGSSAPI.cmake) = bb6a10dda1686312d48d09d3ba5fe132b1c60c6e
+SHA1 (patch-cmake_QtBaseGlobalTargets.cmake) = cb9122c93a3b2e50bb8a3c9702b27a4a79d0ba62
 SHA1 (patch-cmake_QtFeature.cmake) = 14f2f760c1e603b80fa14699e91240e8fcd699d3
 SHA1 (patch-cmake_QtProcessConfigureArgs.cmake) = 25833479d9394338f995aa8d2701fdaae1e547b9
 SHA1 (patch-mkspecs_features_qt__module.prf) = a04c4b1fe80250b6b3591f5486ac0fd3b5056c26
diff --git a/qt6-qtbase/patches/patch-cmake_QtBaseGlobalTargets.cmake b/qt6-qtbase/patches/patch-cmake_QtBaseGlobalTargets.cmake
new file mode 100644
index 0000000000..7a712b45b9
--- /dev/null
+++ b/qt6-qtbase/patches/patch-cmake_QtBaseGlobalTargets.cmake
@@ -0,0 +1,15 @@
+$NetBSD$
+
+* only install non-generated files, this is needed since use in source build
+
+--- cmake/QtBaseGlobalTargets.cmake.orig	2021-10-10 21:32:13.849657000 +0000
++++ cmake/QtBaseGlobalTargets.cmake
+@@ -267,6 +267,8 @@ qt_copy_or_install(FILES
+ qt_copy_or_install(DIRECTORY
+     "config.tests/static_link_order"
+     DESTINATION "${__GlobalConfig_install_dir}/config.tests"
++    FILES_MATCHING PATTERN "*.cpp"
++    PATTERN "CMakeLists.txt"
+ )
+ 
+ # Install public CMake files.


Home | Main Index | Thread Index | Old Index