diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/patches/freecad-boost-serialization.patch | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
| download | guix-1a5302435ff0d2822b823f5a6fe01faa7a85c629.tar.gz | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in: gnu/local.mk gnu/packages/databases.scm gnu/packages/glib.scm gnu/packages/gnome.scm gnu/packages/gnupg.scm gnu/packages/gnuzilla.scm gnu/packages/graphics.scm gnu/packages/gstreamer.scm gnu/packages/gtk.scm gnu/packages/linux.scm gnu/packages/machine-learning.scm gnu/packages/networking.scm gnu/packages/polkit.scm gnu/packages/pulseaudio.scm gnu/packages/rpc.scm gnu/packages/rust.scm gnu/packages/version-control.scm gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/patches/freecad-boost-serialization.patch')
| -rw-r--r-- | gnu/packages/patches/freecad-boost-serialization.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/gnu/packages/patches/freecad-boost-serialization.patch b/gnu/packages/patches/freecad-boost-serialization.patch new file mode 100644 index 0000000000..374eabc966 --- /dev/null +++ b/gnu/packages/patches/freecad-boost-serialization.patch @@ -0,0 +1,27 @@ +Taken from: https://github.com/archlinux/svntogit-community/blob/packages/freecad/trunk/freecad-boost.patch. + +Index: FreeCAD-0.19.2/CMakeLists.txt +=================================================================== +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,6 +46,7 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LI + SetupPCL() + SetupPybind11() + SetupBoost() ++ set(Boost_LIBRARIES_App ${Boost_LIBRARIES}) + SetupXercesC() + find_package(ZLIB REQUIRED) + find_package(PyCXX REQUIRED) +Index: FreeCAD-0.19.2/src/App/CMakeLists.txt +=================================================================== +--- a/src/App/CMakeLists.txt ++++ b/src/App/CMakeLists.txt +@@ -59,7 +59,7 @@ include_directories( + + set(FreeCADApp_LIBS + FreeCADBase +- ${Boost_LIBRARIES} ++ ${Boost_LIBRARIES_App} + ) + + if (BUILD_QT5) |