diff --git a/media-gfx/freecad/files/freecad-1.1.1-qt-6.11.patch b/media-gfx/freecad/files/freecad-1.1.1-qt-6.11.patch new file mode 100644 index 0000000000000..a513e8ba2b2a7 --- /dev/null +++ b/media-gfx/freecad/files/freecad-1.1.1-qt-6.11.patch @@ -0,0 +1,25 @@ +https://github.com/FreeCAD/FreeCAD/pull/29905 +https://bugs.gentoo.org/977409 +diff --git a/cMake/FreeCAD_Helpers/SetupQt.cmake b/cMake/FreeCAD_Helpers/SetupQt.cmake +index 8a7ba9bdeb37..7654ef39e9fc 100644 +--- a/cMake/FreeCAD_Helpers/SetupQt.cmake ++++ b/cMake/FreeCAD_Helpers/SetupQt.cmake +@@ -29,8 +29,16 @@ endif () + + foreach(COMPONENT IN LISTS FREECAD_QT_COMPONENTS) + find_package(Qt${FREECAD_QT_MAJOR_VERSION} REQUIRED COMPONENTS ${COMPONENT}) +- set(Qt${COMPONENT}_LIBRARIES ${Qt${FREECAD_QT_MAJOR_VERSION}${COMPONENT}_LIBRARIES}) +- set(Qt${COMPONENT}_INCLUDE_DIRS ${Qt${FREECAD_QT_MAJOR_VERSION}${COMPONENT}_INCLUDE_DIRS}) ++ if(TARGET Qt${FREECAD_QT_MAJOR_VERSION}::${COMPONENT}) ++ set(Qt${COMPONENT}_LIBRARIES Qt${FREECAD_QT_MAJOR_VERSION}::${COMPONENT}) ++ get_target_property(Qt${COMPONENT}_INCLUDE_DIRS Qt${FREECAD_QT_MAJOR_VERSION}::${COMPONENT} INTERFACE_INCLUDE_DIRECTORIES) ++ if(NOT Qt${COMPONENT}_INCLUDE_DIRS) ++ set(Qt${COMPONENT}_INCLUDE_DIRS "") ++ endif() ++ else() ++ set(Qt${COMPONENT}_LIBRARIES ${Qt${FREECAD_QT_MAJOR_VERSION}${COMPONENT}_LIBRARIES}) ++ set(Qt${COMPONENT}_INCLUDE_DIRS ${Qt${FREECAD_QT_MAJOR_VERSION}${COMPONENT}_INCLUDE_DIRS}) ++ endif() + set(Qt${COMPONENT}_FOUND ${Qt${FREECAD_QT_MAJOR_VERSION}${COMPONENT}_FOUND}) + set(Qt${COMPONENT}_VERSION ${Qt${FREECAD_QT_MAJOR_VERSION}${COMPONENT}_VERSION}) + endforeach() diff --git a/media-gfx/freecad/freecad-1.1.1.ebuild b/media-gfx/freecad/freecad-1.1.1.ebuild index b72fe1b8fc6a1..86f11e51444c7 100644 --- a/media-gfx/freecad/freecad-1.1.1.ebuild +++ b/media-gfx/freecad/freecad-1.1.1.ebuild @@ -139,6 +139,7 @@ PATCHES=( "${FILESDIR}"/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch "${FILESDIR}"/${PN}-9999-Gentoo-specific-don-t-check-vcs.patch "${FILESDIR}"/${PN}-1.1.1-fix-sketcher-toolbars.patch + "${FILESDIR}"/${PN}-1.1.1-qt-6.11.patch "${FILESDIR}"/${PN}-1.0.2-pybind11-latent-slots-macro-conflicts-with-Qt.patch # fixed in pybind-3.0.1 )