Package: blhc
Version: 0.13-2
Followup-For: Bug #1019521
X-Debbugs-Cc: rvandegr...@debian.org
Hello,
I also ran into this- moc is now at /usr/lib/qt6/libexec/moc. I think the
attached patch should address this.
Thanks,
Ross
-- System Information:
Debian Release: bookworm/sid
APT prefers testing
APT policy: (500, 'testing'), (40, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 6.0.0-4-amd64 (SMP w/16 CPU threads; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages blhc depends on:
ii libdpkg-perl 1.21.9
blhc recommends no packages.
blhc suggests no packages.
-- no debconf information
From a6efb36f50164e3a6099e9e2b09ae598413d68fa Mon Sep 17 00:00:00 2001
From: Ross Vandegrift <r...@kallisti.us>
Date: Tue, 20 Dec 2022 22:39:29 -0800
Subject: [PATCH] update moc handling to be aware of Qt6
moc is now at /usr/lib/qt6/libexec/moc in qt6.
---
bin/blhc | 2 +-
t/logs/qt4 | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/bin/blhc b/bin/blhc
index e3c14b4..6199967 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|lib/qt6/libexec)/moc(?:-qt[45])?
\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
--
2.35.1
