From 93aab2cdacd879ecb8ae34fa0f6f6793d7c03536 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Sun, 30 Oct 2022 14:29:42 +0100 Subject: [PATCH 4/8] gnu: qtbase-5: Apply qtbase-tbd-frameworks.patch. * gnu/packages/qt.scm (qtbase-5)[source]: Apply qtbase-tbd-frameworks.patch. * gnu/local.mk: Add patch. * gnu/packages/patches/qtbase-tbd-frameworks.patch: New file. diff --git a/gnu/local.mk b/gnu/local.mk index 9a5b4643a3..9ddf179143 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1752,6 +1752,7 @@ dist_patch_DATA = \ %D%/packages/patches/qtbase-absolute-runpath.patch \ %D%/packages/patches/qtbase-assert.patch \ %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \ + %D%/packages/patches/qtbase-tbd-frameworks.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtbase-xcursor.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ diff --git a/gnu/packages/patches/qtbase-tbd-frameworks.patch b/gnu/packages/patches/qtbase-tbd-frameworks.patch new file mode 100644 index 0000000000..ba25d90747 --- /dev/null +++ b/gnu/packages/patches/qtbase-tbd-frameworks.patch @@ -0,0 +1,16 @@ +diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in +index 84dbbfebd4..615bfed124 100644 +--- a/src/gui/Qt5GuiConfigExtras.cmake.in ++++ b/src/gui/Qt5GuiConfigExtras.cmake.in +@@ -119,6 +119,10 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs) + if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") + set(Qt5Gui_${_cmake_lib_name}_LIBRARY) + endif() ++ set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}.tbd") ++ if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") ++ set(Qt5Gui_${_cmake_lib_name}_LIBRARY) ++ endif() + !!ENDIF + if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY) + # The above find_library call doesn\'t work for finding + diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index e4d8803655..957500aeb2 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -299,6 +299,7 @@ (define-public qtbase-5 ;; Use TZDIR to avoid depending on package "tzdata". (patches (search-patches "qtbase-use-TZDIR.patch" "qtbase-assert.patch" + "qtbase-tbd-frameworks.patch" "qtbase-xcursor.patch" "qtbase-moc-ignore-gcc-macro.patch" "qtbase-absolute-runpath.patch")) -- 2.37.2