pkgsrc-WIP-changes archive

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

qt6-qttools: update rtti patch



Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By:	nros
Date:		Sat Feb 6 15:11:59 2021 +0000
Changeset:	6d7457994433f4aa9ef4f38ae8275c5ca82b0822

Modified Files:
	qt6-qttools/distinfo
	qt6-qttools/patches/patch-src_linguist_lupdate_CMakeLists.txt

Log Message:
qt6-qttools: update rtti patch

update patch that fixes rtti problem since only two source files are affected
and not the whole target

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

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

diffstat:
 qt6-qttools/distinfo                                          | 2 +-
 qt6-qttools/patches/patch-src_linguist_lupdate_CMakeLists.txt | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs:
diff --git a/qt6-qttools/distinfo b/qt6-qttools/distinfo
index f2fad0d7b0..d88a185499 100644
--- a/qt6-qttools/distinfo
+++ b/qt6-qttools/distinfo
@@ -4,4 +4,4 @@ SHA1 (qttools-everywhere-src-6.0.1.tar.xz) = dee5e27261ad77388043256c55f0077791a
 RMD160 (qttools-everywhere-src-6.0.1.tar.xz) = 6cffa21c7439ba2a6f5ab9555cc11d53b836821a
 SHA512 (qttools-everywhere-src-6.0.1.tar.xz) = 6ab06290b877b5eba14475f639aa1101e6fabfaa0e1af25042f00749136dca5756b20dbe6dd3514a3bde5fd7ea21f1ec6c44fd7b656b7898937566e6528cb3ba
 Size (qttools-everywhere-src-6.0.1.tar.xz) = 8387408 bytes
-SHA1 (patch-src_linguist_lupdate_CMakeLists.txt) = 4199be2a6d87cf9e1abd4e0f9c8983e4cf604804
+SHA1 (patch-src_linguist_lupdate_CMakeLists.txt) = 040034f45e8246403c28fe9738bd8f2c8c05872e
diff --git a/qt6-qttools/patches/patch-src_linguist_lupdate_CMakeLists.txt b/qt6-qttools/patches/patch-src_linguist_lupdate_CMakeLists.txt
index 16e5b2a6b5..836b6553b5 100644
--- a/qt6-qttools/patches/patch-src_linguist_lupdate_CMakeLists.txt
+++ b/qt6-qttools/patches/patch-src_linguist_lupdate_CMakeLists.txt
@@ -1,17 +1,18 @@
 $NetBSD$
 
 Clang is compiled without rtti so when compiling with gcc turn of rtti
-this fixes problems with undefined reference to
-"typeinfo for clang::ASTConsumer"  
+this fixes problems with undefined reference to things such as
+"typeinfo for clang::ASTConsumer" 
 
 --- src/linguist/lupdate/CMakeLists.txt.orig	2021-01-28 00:04:44.000000000 +0000
 +++ src/linguist/lupdate/CMakeLists.txt
-@@ -99,6 +99,9 @@ qt_internal_extend_target(${target_name}
+@@ -99,6 +99,10 @@ qt_internal_extend_target(${target_name}
  # special case begin
  if(QT_FEATURE_clangcpp)
      set_property(SOURCE clangtoolastreader.cpp PROPERTY SKIP_AUTOMOC ON)
 +    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-+        target_compile_options(${target_name} PRIVATE -fno-rtti)
++        set_source_files_properties(cpp_clang.cpp lupdatepreprocessoraction.cpp
++                                    PROPERTIES COMPILE_OPTIONS "-fno-rtti")
 +    endif()
  endif()
  # special case end


Home | Main Index | Thread Index | Old Index