From: Ross Vandegrift <ross@kallisti.us>
Date: Wed, 21 Dec 2022 06:39:29 +0000 (-0800)
Subject: Update moc handling to be aware of Qt6
X-Git-Tag: 0.14~18
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=018466d7ddd9c78f1e1efbafbb7be2f969e1bbd1;p=blhc%2Fblhc.git

Update moc handling to be aware of Qt6

moc is now at /usr/lib/qt6/libexec/moc in qt6.

[sr: Modified regex slightly to make it more readable.]
---

diff --git a/NEWS b/NEWS
index 2b693b0..fba56fe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,13 @@
 NEWS
 ====
 
+Version 0.XX
+------------
+
+- Update moc handling for Qt6; reported by Ben Westover, patch from Ross
+  Vandegrift (Debian bug #1019521).
+
+
 Version 0.13
 ------------
 
diff --git a/bin/blhc b/bin/blhc
index e3c14b4..c4fac96 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -1076,7 +1076,7 @@ foreach my $file (@ARGV) {
             # C++ files. No hardening flags are relevant during this step,
             # thus ignore `moc-qt*` lines. The resulting files will be
             # compiled in a separate step (and therefore checked).
-            next if $line =~ m{^\S+/bin/moc(?:-qt[45])?
+            next if $line =~ m{^\S+(?:/bin/moc(?:-qt[45])?|/lib/qt6/libexec/moc)
                                \s.+\s
                                -I\S+/mkspecs/[a-z]+-g\++(?:-64)?
                                \s}x;
diff --git a/t/logs/qt4 b/t/logs/qt4
index e816ce1..57b89b8 100644
--- a/t/logs/qt4
+++ b/t/logs/qt4
@@ -18,3 +18,7 @@ dpkg-buildpackage: source package test
 # From qtcreator (2.7.0-1), uses different paths.
 /usr/lib/arm-linux-gnueabi/qt4/bin/moc -DQT_WEBKIT -DIDE_LIBRARY_BASENAME=\"lib/arm-linux-gnueabi\" -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_USE_FAST_OPERATOR_PLUS -DQT_USE_FAST_CONCATENATION -DQTCREATOR_UTILS_LIB -DQT_NO_DEBUG -DQT_SCRIPT_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED -I/usr/share/qt4/mkspecs/linux-g++ -I../../../../src/libs/utils -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtScript -I/usr/include/qt4 -I../../../src -I../../../../src/libs -I/«PKGBUILDDIR»/tools -I../../../../src/plugins -I../../../../src/libs/utils -I.moc/release-shared -I.uic -I. ../../../../src/libs/utils/environmentmodel.h -o .moc/release-shared/moc_environmentmodel.cpp
 /usr/lib/arm-linux-gnueabi/qt4/bin/moc -DQT_WEBKIT -DIDE_LIBRARY_BASENAME=\"lib/arm-linux-gnueabi\" -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_USE_FAST_OPERATOR_PLUS -DQT_USE_FAST_CONCATENATION -DQTCREATOR_UTILS_LIB -DQT_NO_DEBUG -DQT_SCRIPT_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED -I/usr/share/qt4/mkspecs/linux-g++ -I../../../../src/libs/utils -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtScript -I/usr/include/qt4 -I../../../src -I../../../../src/libs -I/«PKGBUILDDIR»/tools -I../../../../src/plugins -I../../../../src/libs/utils -I.moc/release-shared -I.uic -I. ../../../../src/libs/utils/qtcprocess.h -o .moc/release-shared/moc_qtcprocess.cpp
+
+# test to check that moc from qt6 is handled
+
+/usr/lib/qt6/libexec/moc -DEXTERN_QUAZIP -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_NETWORK_LIB -DQT_NO_DEBUG -DQT_SQL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -I/builds/rvandegrift/mediaelch/debian/output/source_dir/obj-x86_64-linux-gnu -I/builds/rvandegrift/mediaelch/debian/output/source_dir -I/builds/rvandegrift/mediaelch/debian/output/source_dir/src -I/usr/include/x86_64-linux-gnu/qt6/QtSql -I/usr/include/x86_64-linux-gnu/qt6 -I/usr/include/x86_64-linux-gnu/qt6/QtCore -I/usr/lib/x86_64-linux-gnu/qt6/mkspecs/linux-g++ -I/usr/include/x86_64-linux-gnu/qt6/QtWidgets -I/usr/include/x86_64-linux-gnu/qt6/QtGui -I/usr/include/x86_64-linux-gnu/qt6/QtMultimedia -I/usr/include/x86_64-linux-gnu/qt6/QtNetwork -I/usr/include/x86_64-linux-gnu/qt6/QtXml -I/usr/include -I/usr/include/c++/12 -I/usr/include/x86_64-linux-gnu/c++/12 -I/usr/include/c++/12/backward -I/usr/lib/gcc/x86_64-linux-gnu/12/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu --include /builds/rvandegrift/mediaelch/debian/output/source_dir/obj-x86_64-linux-gnu/src/scrapers/tv_show/tmdb/mediaelch_scraper_tv_tmdb_autogen/moc_predefs.h --output-dep-file -o /builds/rvandegrift/mediaelch/debian/output/source_dir/obj-x86_64-linux-gnu/src/scrapers/tv_show/tmdb/mediaelch_scraper_tv_tmdb_autogen/EWIEGA46WW/moc_TmdbTvShowSearchJob.cpp /builds/rvandegrift/mediaelch/debian/output/source_dir/src/scrapers/tv_show/tmdb/TmdbTvShowSearchJob.h