Source: qt6-remoteobjects
Version: 6.4.2-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

qt6-remoteobjects recently gained that common -DQT_HOST_PATH flag.
Thanks for adding it without having me file a patch for it.

This is one of the cases where that change is necessary and
insufficient. We also need a native repc here. We need another
dependency and some cmake flags to get that working. I'm a attaching a
patch for your convenience.

Note that this kind of change also somewhat is a pattern, but it is less
mechanical and less frequent than the -DQT_HOST_PATH one. Therefore, I
see no need for you to proactively do this for me in other packages.

Helmut
diff --minimal -Nru qt6-remoteobjects-6.4.2/debian/changelog 
qt6-remoteobjects-6.4.2/debian/changelog
--- qt6-remoteobjects-6.4.2/debian/changelog    2023-06-22 00:06:36.000000000 
+0200
+++ qt6-remoteobjects-6.4.2/debian/changelog    2023-07-08 12:08:13.000000000 
+0200
@@ -1,3 +1,10 @@
+qt6-remoteobjects (6.4.2-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Use the build repc and also build it for host. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Sat, 08 Jul 2023 12:08:13 +0200
+
 qt6-remoteobjects (6.4.2-2) unstable; urgency=medium
 
   [ Patrick Franz ]
diff --minimal -Nru qt6-remoteobjects-6.4.2/debian/control 
qt6-remoteobjects-6.4.2/debian/control
--- qt6-remoteobjects-6.4.2/debian/control      2022-12-30 16:46:01.000000000 
+0100
+++ qt6-remoteobjects-6.4.2/debian/control      2023-07-08 12:08:12.000000000 
+0200
@@ -18,6 +18,7 @@
                qt6-base-private-dev (>= 6.4.2+dfsg~),
                qt6-declarative-dev (>= 6.4.2+dfsg~),
                qt6-declarative-private-dev (>= 6.4.2+dfsg~),
+               qt6-remoteobjects-dev:native <cross>,
                xauth <!nocheck>,
                xvfb <!nocheck>,
 Standards-Version: 4.6.2
diff --minimal -Nru qt6-remoteobjects-6.4.2/debian/rules 
qt6-remoteobjects-6.4.2/debian/rules
--- qt6-remoteobjects-6.4.2/debian/rules        2023-06-22 00:05:50.000000000 
+0200
+++ qt6-remoteobjects-6.4.2/debian/rules        2023-07-08 12:08:13.000000000 
+0200
@@ -6,7 +6,10 @@
 
 # QT_HOST_PATH isn't passed in cross-builds
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-       extra_cmake_args += -DQT_HOST_PATH=/usr
+       extra_cmake_args += \
+               -DQT_HOST_PATH=/usr \
+               -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/$(DEB_BUILD_MULTIARCH)/cmake \
+               -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON
 endif
 
 %:

Reply via email to