7 files changed, 45 insertions, 4 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 46f14ee6739f..efa411a9a0d4 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 693524d0a989..92e8a2c742f9 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -5,9 +5,10 @@ AUX qtbase-6.6.3-gcc14-avx512fp16.patch 470 BLAKE2B 616b4fdcee6819a0ca4de1220f75
 AUX qtbase-6.8.0-qcontiguouscache.patch 526 BLAKE2B b701f92d8365e8408a2ff79c812c397ac0042aa6b6316cf167a7877d48044ffaa0d2683fa27ffcbe80c8e74f8ff0c8af220b927889e83340c6b5325b1fbf16ab SHA512 19f33f2dd856c8328b9175458250929f3da34cde179d5f52ec1982e5e5f1772412f2541e146763a6258ce3377e0b624f07926fe4af56de7364c34835151b8995
 AUX qtbase-6.8.2-QTBUG-133500.patch 1800 BLAKE2B cc5af9a4d2a6956589bab2d1e9f669a4fd8e33f76c0ca713ed1309870fc35155c4b447feb4e9708d723aff18947ac2245913eccb726631c2b210751a719fb3ab SHA512 ed68106db666693f48215e3053ba3b40d78713661e081aaa23e6e0cd380b8d13374f92fb22df049a04e21b6265781c44160758e4613114f645275e5e388ead4a
 AUX qtbase-6.8.2-QTBUG-133808.patch 321 BLAKE2B d2821e62ae8cb14160def02c3b8bdcf881afc8a78330f2c7c4195ba5e063e9435592307c50f2270bcf2a34b111f60c4aaafd1374e8aba53e32f12e579029136f SHA512 8db39eee8ed1e1a16626744a93d08abc8597142ead2289792c4713937d6815e23355c7ea0851afe2b709f073d52015da16b43159880a90bc6220e8243195e934
+AUX qtbase-6.8.2-cross.patch 1697 BLAKE2B 1f26d46608bba11b1a9aae50501957801aa3e394f53c2f0ee6d2523d66ca43756b649ee73e920cbf90d339156421cad73ac911d18adcb524f2b8f5da824c2633 SHA512 8c00564a61be5aef1a9a3c462df104f6965e56db18492bb9810a56394e472ca9848b2fb2858f3bd58d2e8c9efd358ead0c015b5fb048c861e4781a458849fa25
 DIST qtbase-everywhere-src-6.8.2.tar.xz 48264736 BLAKE2B 3c4a71a0c515d7433eda3a6155a0499ea43ce708fb25614843499bf8a7a71ef06ba93dad9e7dd04a28b86a88eea00151ad3500d06bd09b9b37a4e070774e2684 SHA512 4a074aca1c8bcca536fd428c969c0119f5131d0d52b67028edbb75a81dc6e0c15394f69e29cef513e6d8c6e93384cedc38dd03b0eed6ab1bbafbe2b5bbc85799
-EBUILD qtbase-6.8.2-r2.ebuild 10742 BLAKE2B 2b870441c980245a6424e95f318426736e2070955dade204965188a18c2ada0fe90cfc0c4decca290cad1fb57416d30591cd15b8c555237ef2f19b0209c5cbf2 SHA512 cc40690e9d81f8185b227eada3981fb7f3e8d567f982ffeb09cba113ca86aeadc0b22956ee3359049fd58461ab5f3f85e147d13e38e15992f2b962d24a03a459
-EBUILD qtbase-6.8.9999.ebuild 10670 BLAKE2B 12e92ffbc770715f5d28b4664eb1c64139a83de3fb217ef031969fc388b47ca3d42bd383fda7eac11d753ea920909f076a6537dc2e88c84026d1798e5354637c SHA512 a6277c0a7f003ee9a2d6e7a3f759728baa7ff39a6b25a79bf084f53d5f5b6c0a1cf0c5ec1a94bee4a4ed2cbfcc94cc9f45952c1577e279ffce17ae3296d44b7f
-EBUILD qtbase-6.9.9999.ebuild 10666 BLAKE2B fbd5f6a55f2edba9c72745289a53e151d10e741763850c3e421da894ed96610c8dab1dc002dc70335b301618a12490137913fc10dd080ba4467651a14409fdff SHA512 699329866a1cc86b575ff542d0a13c13d27f6c9260c626a36aa7bdb05c4d15cd37680c462924e1bcc74bc73ab94b44f231cb8559a996346ed23c61fd906fc9f5
-EBUILD qtbase-6.9999.ebuild 10666 BLAKE2B fbd5f6a55f2edba9c72745289a53e151d10e741763850c3e421da894ed96610c8dab1dc002dc70335b301618a12490137913fc10dd080ba4467651a14409fdff SHA512 699329866a1cc86b575ff542d0a13c13d27f6c9260c626a36aa7bdb05c4d15cd37680c462924e1bcc74bc73ab94b44f231cb8559a996346ed23c61fd906fc9f5
+EBUILD qtbase-6.8.2-r2.ebuild 10781 BLAKE2B 8c5ace434e203820ab0a1718d6f1a10feb700e8359d4bfdac44bed48ebcb34f5b3aa7ab74687a8ab9aa66371ec38eeb407e588387c8e2afe63876fabe32bbc52 SHA512 05006a3c5c61dc04a96b122e0bdaf3c7d0ac26c5a8d63c03c94b0341eea0082d29e3a3b4d3165914e18ba5b37662844067831facdf042f4916d7a4423417340a
+EBUILD qtbase-6.8.9999.ebuild 10709 BLAKE2B 3378a6a1563693652a4de955bee4d58e475facfc88a2cc8d53d9807527fe11304918f64b62d0cf9b41d43079b1f55bfcd1187218c0bb8b6de8dd744002b8b551 SHA512 3c27e77f19a77d01fadb34d34713fe6350f21143af1e8c40258c388636f10540f338884f49508388673fafb9bbca3f18aeae12001357dbe6c7e6f25256d88726
+EBUILD qtbase-6.9.9999.ebuild 10705 BLAKE2B 8449a3f533ca08a321e8f059f2defe2bd135ae8240eee4f43a1d47e51f4c1e70d161cac4507fcf235b0bb93d77e24168b57b429860b87b99ef1fffc6e80e8a87 SHA512 f1cdcc40bf4d9f67fb775e1c4b84d94658941e7cad56f74f125d8e251552a6f0c62f3c276795f78ea03f39253ac0ba773a45796d52624b1713f91c19da6c1067
+EBUILD qtbase-6.9999.ebuild 10705 BLAKE2B 8449a3f533ca08a321e8f059f2defe2bd135ae8240eee4f43a1d47e51f4c1e70d161cac4507fcf235b0bb93d77e24168b57b429860b87b99ef1fffc6e80e8a87 SHA512 f1cdcc40bf4d9f67fb775e1c4b84d94658941e7cad56f74f125d8e251552a6f0c62f3c276795f78ea03f39253ac0ba773a45796d52624b1713f91c19da6c1067
 MISC metadata.xml 1965 BLAKE2B e91aa3bc2379fa587766cfc7c4053b382a8894c0092d075543b2a5d466dfa001105bb0f564008fab8e71d4517954e527618896de41069c6bafb4258f6201cdbe SHA512 a71f6fe0fb01e60716aa6632605a423f765983f41da2c8ca761afca548cd061bd52bc328f7441fa831e890d75bcfc2820112c946802588dab1de706fbb7ac531
diff --git a/dev-qt/qtbase/files/qtbase-6.8.2-cross.patch b/dev-qt/qtbase/files/qtbase-6.8.2-cross.patch
new file mode 100644
index 000000000000..b597aa38d107
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.8.2-cross.patch
@@ -0,0 +1,36 @@
+When cross-compiling, CMake needs to find the build host's Qt6CoreTools. It
+therefore prepends QT_HOST_PATH, which is /usr, to CMAKE_FIND_ROOT_PATH. The
+problem is that CMAKE_FIND_ROOT_PATH is only a hint, not a definitive
+location. Just below, CMake's find_package is usually told to look in
+/usr/${CHOST}/usr/lib/cmake and /usr/lib/cmake when cross-compiling. Since
+both of these are under /usr, it chooses the former instead of the latter.
+It then ends up trying to execute non-native Qt binaries.
+
+We can avoid this problem by setting CMAKE_FIND_ROOT_PATH to a more precise
+location. All the Qt6 modules are installed under /usr/lib/cmake, represented
+by the __qt_find_package_host_qt_path variable, so we can point it there.
+
+find_package has two modes, module mode and config mode. No mode is
+explicitly chosen in this case, so it tries both. In module mode, it would
+use a module called FindQt6*.cmake, but no such module exists. It is
+therefore safe to assume config mode, which involves the files under
+/usr/lib/cmake.
+
+See the isSameDirectoryOrSubDirectory() call in CMake's
+cmFindCommon::RerootPaths() function for exactly where this goes wrong.
+
+Chewi
+
+https://bugs.gentoo.org/950314
+
+--- a/cmake/QtConfig.cmake.in
++++ b/cmake/QtConfig.cmake.in
+@@ -131,7 +131,7 @@
+         set(__qt_backup_cmake_find_root_path "${CMAKE_FIND_ROOT_PATH}")
+         list(PREPEND CMAKE_PREFIX_PATH "${__qt_find_package_host_qt_path}"
+             ${_qt_additional_host_packages_prefix_paths})
+-        list(PREPEND CMAKE_FIND_ROOT_PATH "${QT_HOST_PATH}"
++        list(PREPEND CMAKE_FIND_ROOT_PATH "${__qt_find_package_host_qt_path}"
+             ${_qt_additional_host_packages_root_paths})
+     endif()
+ 
diff --git a/dev-qt/qtbase/qtbase-6.8.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.8.2-r2.ebuild
index 08f1610075ec..fd2849534194 100644
--- a/dev-qt/qtbase/qtbase-6.8.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.2-r2.ebuild
@@ -146,6 +146,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
 	"${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
 	"${FILESDIR}"/${PN}-6.8.0-qcontiguouscache.patch
+	"${FILESDIR}"/${PN}-6.8.2-cross.patch
 	"${FILESDIR}"/${P}-QTBUG-133500.patch
 	"${FILESDIR}"/${P}-QTBUG-133808.patch
 )
diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
index 6eeb224df3dd..48ee516e8b4b 100644
--- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
@@ -146,6 +146,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
 	"${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
 	"${FILESDIR}"/${PN}-6.8.0-qcontiguouscache.patch
+	"${FILESDIR}"/${PN}-6.8.2-cross.patch
 )
 
 src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.9.9999.ebuild b/dev-qt/qtbase/qtbase-6.9.9999.ebuild
index b27a756c0106..58e3064e4a82 100644
--- a/dev-qt/qtbase/qtbase-6.9.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9.9999.ebuild
@@ -145,6 +145,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
 	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
 	"${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
+	"${FILESDIR}"/${PN}-6.8.2-cross.patch
 )
 
 src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index b27a756c0106..58e3064e4a82 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -145,6 +145,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
 	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
 	"${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
+	"${FILESDIR}"/${PN}-6.8.2-cross.patch
 )
 
 src_prepare() {